projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made Mr_Tree graphic smaller, from 99 to 85 pixels.
[supertux.git]
/
src
/
badguy
/
yeti.cpp
diff --git
a/src/badguy/yeti.cpp
b/src/badguy/yeti.cpp
index
50aa888
..
10a33e0
100644
(file)
--- a/
src/badguy/yeti.cpp
+++ b/
src/badguy/yeti.cpp
@@
-43,7
+43,7
@@
Yeti::Yeti(const lisp::Lisp& reader)
reader.get("x", start_position.x);
reader.get("y", start_position.y);
bbox.set_size(80, 120);
reader.get("x", start_position.x);
reader.get("y", start_position.y);
bbox.set_size(80, 120);
- sprite = sprite_manager->create("
yeti
");
+ sprite = sprite_manager->create("
images/creatures/yeti/yeti.sprite
");
sprite->set_action("right");
state = INIT;
side = LEFT;
sprite->set_action("right");
state = INIT;
side = LEFT;
@@
-91,6
+91,10
@@
Yeti::active_update(float elapsed_time)
// jump
sound_manager->play("sounds/yeti_gna.wav");
physic.set_velocity_y(JUMP_VEL1);
// jump
sound_manager->play("sounds/yeti_gna.wav");
physic.set_velocity_y(JUMP_VEL1);
+ if (side == LEFT) // on the left, facing Tux who is on the right
+ sprite->set_action("jump-right");
+ else
+ sprite->set_action("jump-left");
}
break;
default:
}
break;
default:
@@
-104,6
+108,7
@@
void
Yeti::go_right()
{
// jump and move right
Yeti::go_right()
{
// jump and move right
+ sprite->set_action("right");
physic.set_velocity_y(JUMP_VEL1);
physic.set_velocity_x(RUN_SPEED);
state = GO_RIGHT;
physic.set_velocity_y(JUMP_VEL1);
physic.set_velocity_x(RUN_SPEED);
state = GO_RIGHT;
@@
-113,6
+118,7
@@
Yeti::go_right()
void
Yeti::go_left()
{
void
Yeti::go_left()
{
+ sprite->set_action("left");
physic.set_velocity_y(JUMP_VEL1);
physic.set_velocity_x(-RUN_SPEED);
state = GO_LEFT;
physic.set_velocity_y(JUMP_VEL1);
physic.set_velocity_x(-RUN_SPEED);
state = GO_LEFT;
@@
-166,8
+172,18
@@
Yeti::kill_fall()
}
void
}
void
-Yeti::write(lisp::Writer& )
+Yeti::write(lisp::Writer&
writer
)
{
{
+ writer.start_list("yeti");
+
+ writer.write_float("x", start_position.x);
+ writer.write_float("y", start_position.y);
+
+ if(dead_script != "") {
+ writer.write_string("dead-script", dead_script);
+ }
+
+ writer.end_list("yeti");
}
void
}
void
@@
-204,16
+220,20
@@
Yeti::collision_solid(GameObject& , const CollisionHit& hit)
} else if(state == GO_LEFT && !timer.started()) {
side = LEFT;
summon_snowball();
} else if(state == GO_LEFT && !timer.started()) {
side = LEFT;
summon_snowball();
- sprite->set_action("right");
+ sprite->set_action("
stand-
right");
angry_jumping();
} else if(state == GO_RIGHT && !timer.started()) {
side = RIGHT;
summon_snowball();
angry_jumping();
} else if(state == GO_RIGHT && !timer.started()) {
side = RIGHT;
summon_snowball();
- sprite->set_action("left");
+ sprite->set_action("
stand-
left");
angry_jumping();
} else if(state == ANGRY_JUMPING) {
if(!timer.started()) {
// we just landed
angry_jumping();
} else if(state == ANGRY_JUMPING) {
if(!timer.started()) {
// we just landed
+ if (side == LEFT) // standing on the left, facing Tux who is on the right
+ sprite->set_action("stand-right");
+ else
+ sprite->set_action("stand-left");
jumpcount++;
// make a stalactite falling down and shake camera a bit
Sector::current()->camera->shake(.1, 0, 10);
jumpcount++;
// make a stalactite falling down and shake camera a bit
Sector::current()->camera->shake(.1, 0, 10);