[Super-tux-commit] supertux/src badguy.cpp,1.42,1.43 player.cpp,1.53,1.54 player.h,1.34,1.35 resources.cpp,1.15,1.16

[Ingo R. <gr...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27263

Modified Files:
	badguy.cpp player.cpp player.h resources.cpp 
Log Message:
- synced walk speed of walking enemies
- added standing tux

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- player.cpp	22 Apr 2004 13:24:15 -0000	1.53
+++ player.cpp	22 Apr 2004 16:25:24 -0000	1.54
@@ -38,6 +38,8 @@
 Sprite*  smalltux_gameover;
 Sprite*  smalltux_skid_left;
 Sprite*  smalltux_skid_right;
+Sprite*  largetux_stand_left;
+Sprite*  largetux_stand_right;
 
 Sprite* bigtux_right;
 Sprite* bigtux_left;
@@ -598,10 +600,20 @@
                         {
                           if (physic.get_velocity_y() == 0)
                             {
-                              if (dir == RIGHT)
-                                bigtux_right->draw(base.x - scroll_x, base.y);
-                              else
-                                bigtux_left->draw(base.x - scroll_x, base.y);
+                              if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
+                                {
+                                  if (dir == RIGHT)
+                                    largetux_stand_right->draw(base.x - scroll_x, base.y);
+                                  else
+                                    largetux_stand_left->draw(base.x - scroll_x, base.y);
+                                }
+                              else // walking
+                                {
+                                  if (dir == RIGHT)
+                                    bigtux_right->draw(base.x - scroll_x, base.y);
+                                  else
+                                    bigtux_left->draw(base.x - scroll_x, base.y);
+                                }
                             }
                           else
                             {

Index: player.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- player.h	22 Apr 2004 00:13:33 -0000	1.34
+++ player.h	22 Apr 2004 16:25:32 -0000	1.35
@@ -84,6 +84,8 @@
 extern Sprite*  smalltux_skid_left;
 extern Sprite*  smalltux_skid_right;
 extern Sprite*  smalltux_gameover;
+extern Sprite*  largetux_stand_left;
+extern Sprite*  largetux_stand_right;
 extern Sprite* bigtux_right;
 extern Sprite* bigtux_left;
 extern Sprite* bigtux_right_jump;

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- badguy.cpp	22 Apr 2004 15:52:47 -0000	1.42
+++ badguy.cpp	22 Apr 2004 16:25:23 -0000	1.43
@@ -70,6 +70,8 @@
 Sprite* img_snowball_squished_left;
 Sprite* img_snowball_squished_right;
 
+#define BADGUY_WALK_SPEED .8f
+
 BadGuyKind  badguykind_from_string(const std::string& str)
 {
   if (str == "money")
@@ -166,13 +168,13 @@
   timer.init(true);
 
   if(kind == BAD_BSOD) {
-    physic.set_velocity(-1.3, 0);
+    physic.set_velocity(-BADGUY_WALK_SPEED, 0);
     set_sprite(img_bsod_left, img_bsod_right);
   } else if(kind == BAD_MRBOMB) {
-    physic.set_velocity(-1.3, 0);
+    physic.set_velocity(-BADGUY_WALK_SPEED, 0);
     set_sprite(img_mrbomb_left, img_mrbomb_right);
   } else if (kind == BAD_LAPTOP) {
-    physic.set_velocity(-.8, 0);
+    physic.set_velocity(-BADGUY_WALK_SPEED, 0);
     set_sprite(img_laptop_left, img_laptop_right);
   } else if(kind == BAD_MONEY) {
     set_sprite(img_jumpy_left_up, img_jumpy_left_up);
@@ -185,7 +187,7 @@
     physic.enable_gravity(false);
     set_sprite(img_flame, img_flame);
   } else if(kind == BAD_BOUNCINGSNOWBALL) {
-    physic.set_velocity(-1.3, 0);
+    physic.set_velocity(-BADGUY_WALK_SPEED, 0);
     set_sprite(img_bouncingsnowball_left, img_bouncingsnowball_right);
   } else if(kind == BAD_STALACTITE) {
     physic.enable_gravity(false);
@@ -197,10 +199,10 @@
     set_sprite(img_flyingsnowball, img_flyingsnowball);
     physic.enable_gravity(false);
   } else if(kind == BAD_SPIKY) {
-    physic.set_velocity(-1.3, 0);
+    physic.set_velocity(-BADGUY_WALK_SPEED, 0);
     set_sprite(img_spiky_left, img_spiky_right);
   } else if(kind == BAD_SNOWBALL) {
-    physic.set_velocity(-1.3, 0);
+    physic.set_velocity(-BADGUY_WALK_SPEED, 0);
     set_sprite(img_snowball_left, img_snowball_right);
   }
 

Index: resources.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- resources.cpp	22 Apr 2004 11:17:34 -0000	1.15
+++ resources.cpp	22 Apr 2004 16:25:32 -0000	1.16
@@ -48,6 +48,9 @@
   sprite_manager = new SpriteManager(datadir + "/supertux.strf");
 
   /* Tuxes: */
+  largetux_stand_left  = sprite_manager->load("largetux-stand-left");
+  largetux_stand_right = sprite_manager->load("largetux-stand-right");
+
   smalltux_gameover = sprite_manager->load("smalltux-gameover");
 
   smalltux_skid_left  = sprite_manager->load("smalltux-skid-left");