projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix
[supertux.git]
/
src
/
badguy
/
nolok_01.cpp
diff --git
a/src/badguy/nolok_01.cpp
b/src/badguy/nolok_01.cpp
index
045a507
..
5888039
100644
(file)
--- a/
src/badguy/nolok_01.cpp
+++ b/
src/badguy/nolok_01.cpp
@@
-20,9
+20,9
@@
#include <config.h>
#include <config.h>
-#include "nolok_01.h"
-#include "badguy/
bouncing_snowball.h
"
-#include "trigger/door.h"
+#include "nolok_01.h
pp
"
+#include "badguy/
snowsnail.hpp
"
+#include "trigger/door.h
pp
"
#define WALK_TIME 2.5
#define SHOOT_TIME 0.4
#define WALK_TIME 2.5
#define SHOOT_TIME 0.4
@@
-38,7
+38,8
@@
Nolok_01::Nolok_01(const lisp::Lisp& reader)
reader.get("x", start_position.x);
reader.get("y", start_position.y);
bbox.set_size(31.8, 63.8);
reader.get("x", start_position.x);
reader.get("y", start_position.y);
bbox.set_size(31.8, 63.8);
- sprite = sprite_manager->create("dummyguy");
+ sprite = sprite_manager->create("nolok");
+ countMe = false;
}
Nolok_01::Nolok_01(float pos_x, float pos_y)
}
Nolok_01::Nolok_01(float pos_x, float pos_y)
@@
-46,7
+47,8
@@
Nolok_01::Nolok_01(float pos_x, float pos_y)
start_position.x = pos_x;
start_position.y = pos_y;
bbox.set_size(31.8, 63.8);
start_position.x = pos_x;
start_position.y = pos_y;
bbox.set_size(31.8, 63.8);
- sprite = sprite_manager->create("dummyguy");
+ sprite = sprite_manager->create("nolok");
+ countMe = false;
}
void
}
void
@@
-72,7
+74,7
@@
Nolok_01::activate()
}
void
}
void
-Nolok_01::active_
action
(float elapsed_time)
+Nolok_01::active_
update
(float elapsed_time)
{
if (action_timer.check()) {
switch (action) {
{
if (action_timer.check()) {
switch (action) {
@@
-93,8
+95,8
@@
Nolok_01::active_action(float elapsed_time)
}
case SHOOTING:
{
}
case SHOOTING:
{
- Sector::current()->add_object(new
BouncingSnowbal
l(get_pos().x - 64, get_pos().y, LEFT));
- Sector::current()->add_object(new
BouncingSnowbal
l(get_pos().x + 64, get_pos().y, RIGHT));
+ Sector::current()->add_object(new
SnowSnai
l(get_pos().x - 64, get_pos().y, LEFT));
+ Sector::current()->add_object(new
SnowSnai
l(get_pos().x + 64, get_pos().y, RIGHT));
physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
sprite->set_action(dir == LEFT ? "left" : "right");
action = WALKING;
physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
sprite->set_action(dir == LEFT ? "left" : "right");
action = WALKING;
@@
-145,7
+147,7
@@
Nolok_01::kill_fall()
bullet_hitpoints--;
if (bullet_hitpoints <= 0) {
hitpoints = 0;
bullet_hitpoints--;
if (bullet_hitpoints <= 0) {
hitpoints = 0;
- sound_manager->play
_sound("fall
", this,
+ sound_manager->play
("sounds/fall.wav
", this,
Sector::current()->player->get_pos());
physic.set_velocity_y(0);
physic.enable_gravity(true);
Sector::current()->player->get_pos());
physic.set_velocity_y(0);
physic.enable_gravity(true);