[Super-tux-commit] supertux/src badguy.cpp,1.125,1.126 player.cpp,1.188,1.189
Brought to you by:
wkendrick
From: Ricardo C. <rm...@us...> - 2004-10-18 21:09:37
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6183/src Modified Files: badguy.cpp player.cpp Log Message: Implemented mirror actions correctly. Bugfix: right direction of bad guys now working. Also fixed bomb exploding animation and also badguys being draw in top left of level. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.188 retrieving revision 1.189 diff -u -d -r1.188 -r1.189 --- player.cpp 9 Oct 2004 18:01:01 -0000 1.188 +++ player.cpp 18 Oct 2004 21:09:28 -0000 1.189 @@ -992,7 +992,7 @@ else if (safe_timer.started() && global_frame_counter%2) ; // don't draw Tux else - tux_body->draw(context, pos, layer, dir == LEFT ? HORIZONTAL_FLIP : NONE_EFFECT); + tux_body->draw(context, pos, layer); // Draw blinking star overlay if (invincible_timer.started() && Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.125 retrieving revision 1.126 diff -u -d -r1.125 -r1.126 --- badguy.cpp 18 Oct 2004 16:52:28 -0000 1.125 +++ badguy.cpp 18 Oct 2004 21:09:27 -0000 1.126 @@ -68,6 +68,8 @@ return BAD_WINGLING; else if (str == "walkingtree") return BAD_WALKINGTREE; + else if(str == "bomb") // not to be used as a real bad guys + return BAD_BOMB; else { return BAD_INVALID; @@ -116,6 +118,9 @@ break; case BAD_WALKINGTREE: return "walkingtree"; + case BAD_BOMB: // not to be used as a real bad guys + return "bomb"; + break; default: return "snowball"; } @@ -172,6 +177,8 @@ specs = badguyspecs_manager->load(badguykind_to_string(kind)); + set_action("hide", "hide"); + // if we're in a solid tile at start correct that now if(Sector::current()) { if(kind != BAD_FLAME && kind != BAD_FISH && kind != BAD_FLAMEFISH && collision_object_map(base)) @@ -965,6 +972,8 @@ action_left = left; action_right = right; +std::cerr << "set_action(" << left << ", " << right << ") of " << badguykind_to_string(kind) << std::endl; + #if 0 if (1) { |