projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed MrTree. He uses activate() to change direction which is now working again.
[supertux.git]
/
src
/
badguy
/
nolok_01.cpp
diff --git
a/src/badguy/nolok_01.cpp
b/src/badguy/nolok_01.cpp
index
aa07791
..
b1e7c77
100644
(file)
--- a/
src/badguy/nolok_01.cpp
+++ b/
src/badguy/nolok_01.cpp
@@
-20,7
+20,7
@@
#include <config.h>
#include "nolok_01.hpp"
#include <config.h>
#include "nolok_01.hpp"
-#include "badguy/sn
owsn
ail.hpp"
+#include "badguy/snail.hpp"
#include "trigger/door.hpp"
#define WALK_TIME 2.5
#include "trigger/door.hpp"
#define WALK_TIME 2.5
@@
-33,20
+33,14
@@
static const float WALKSPEED = 90;
//TODO: Create sprite, limit max number of snowballs
Nolok_01::Nolok_01(const lisp::Lisp& reader)
//TODO: Create sprite, limit max number of snowballs
Nolok_01::Nolok_01(const lisp::Lisp& reader)
+ : BadGuy(reader, "images/creatures/nolok/nolok.sprite")
{
{
- reader.get("x", start_position.x);
- reader.get("y", start_position.y);
- bbox.set_size(31.8, 63.8);
- sprite = sprite_manager->create("images/creatures/nolok/nolok.sprite");
countMe = false;
}
countMe = false;
}
-Nolok_01::Nolok_01(float pos_x, float pos_y)
+Nolok_01::Nolok_01(const Vector& pos)
+ : BadGuy(pos, "images/creatures/nolok/nolok.sprite")
{
{
- start_position.x = pos_x;
- start_position.y = pos_y;
- bbox.set_size(31.8, 63.8);
- sprite = sprite_manager->create("images/creatures/nolok/nolok.sprite");
countMe = false;
}
countMe = false;
}
@@
-80,7
+74,7
@@
Nolok_01::active_update(float elapsed_time)
case WALKING:
{
sprite->set_action("jump");
case WALKING:
{
sprite->set_action("jump");
- physic.set_velocity_y(700);
+ physic.set_velocity_y(
-
700);
action = JUMPING;
action_timer.start(JUMP_TIME);
break;
action = JUMPING;
action_timer.start(JUMP_TIME);
break;
@@
-94,8
+88,8
@@
Nolok_01::active_update(float elapsed_time)
}
case SHOOTING:
{
}
case SHOOTING:
{
- Sector::current()->add_object(new Sn
owSnail(get_pos().x - 64, get_pos().y
, LEFT));
- Sector::current()->add_object(new Sn
owSnail(get_pos().x + 64, get_pos().y
, RIGHT));
+ Sector::current()->add_object(new Sn
ail(Vector(get_pos().x - 64, get_pos().y)
, LEFT));
+ Sector::current()->add_object(new Sn
ail(Vector(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;