[Super-tux-commit] supertux/src player.cpp,1.59,1.60 player.h,1.38,1.39 resources.cpp,1.19,1.20

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

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

Modified Files:
	player.cpp player.h resources.cpp 
Log Message:
- new star tux, still rather pure, but useable

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- player.cpp	24 Apr 2004 12:45:34 -0000	1.59
+++ player.cpp	24 Apr 2004 13:12:12 -0000	1.60
@@ -44,6 +44,9 @@
 Sprite*  smalltux_grab_left;
 Sprite*  smalltux_grab_right;
 
+Sprite*  smalltux_star;
+Sprite*  largetux_star;
+
 Sprite*  largetux_kick_left;
 Sprite*  largetux_kick_right;
 Sprite*  largetux_grab_left;
@@ -72,8 +75,6 @@
 Surface* skidfiretux_left;
 Surface* cape_right[2];
 Surface* cape_left[2];
-Surface* bigcape_right[2];
-Surface* bigcape_left[2];
 
 PlayerKeymap keymap;
 
@@ -535,14 +536,6 @@
         {
           if (size == SMALL)
             {
-              if (invincible_timer.started())
-                {
-                  if (dir == RIGHT)
-                    cape_right[global_frame_counter % 2]->draw(base.x- scroll_x, base.y);
-                  else
-                    cape_left[global_frame_counter % 2]->draw(base.x- scroll_x, base.y);
-                }
-
               if (!skidding_timer.started())
                 {
                   if (physic.get_velocity_y() != 0)
@@ -585,22 +578,12 @@
                   else
                     smalltux_grab_left->draw(base.x - scroll_x, base.y);
                 }
+
+              if (invincible_timer.started())
+                smalltux_star->draw(base.x - scroll_x, base.y);
             }
           else // Large Tux
             {
-              if (invincible_timer.started())
-                {
-                  float capex = base.x + (base.width - bigcape_right[0]->w) / 2;
-                  capex -= scroll_x;
-                  float capey = base.y + (base.height - bigcape_right[0]->h) / 2;
-                
-                  /* Draw cape (just not in ducked mode since that looks silly): */
-                  if (dir == RIGHT)
-                    bigcape_right[global_frame_counter % 2]->draw(capex, capey);
-                  else
-                    bigcape_left[global_frame_counter % 2]->draw(capex, capey);
-                }
-
               if (!got_coffee)
                 {
                   if (!duck)
@@ -694,6 +677,9 @@
                   else
                     largetux_grab_left->draw(base.x - scroll_x, base.y);
                 }
+
+              if (invincible_timer.started())
+                largetux_star->draw(base.x - scroll_x, base.y);
             }
         }     
     }

Index: player.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- player.h	24 Apr 2004 12:30:21 -0000	1.38
+++ player.h	24 Apr 2004 13:12:12 -0000	1.39
@@ -91,6 +91,8 @@
 extern Sprite*  smalltux_kick_right;
 extern Sprite*  smalltux_grab_left;
 extern Sprite*  smalltux_grab_right;
+extern Sprite*  smalltux_star;
+extern Sprite*  largetux_star;
 
 extern Sprite*  largetux_kick_left;
 extern Sprite*  largetux_kick_right;

Index: resources.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- resources.cpp	24 Apr 2004 12:11:11 -0000	1.19
+++ resources.cpp	24 Apr 2004 13:12:12 -0000	1.20
@@ -46,6 +46,9 @@
   sprite_manager = new SpriteManager(datadir + "/supertux.strf");
 
   /* Tuxes: */
+  smalltux_star = sprite_manager->load("smalltux-star");
+  largetux_star = sprite_manager->load("largetux-star");
+
   smalltux_kick_left  = sprite_manager->load("smalltux-kick-left");
   smalltux_kick_right = sprite_manager->load("smalltux-kick-right");
   smalltux_grab_left  = sprite_manager->load("smalltux-grab-left");
@@ -117,18 +120,6 @@
   bigtux_left_jump  = sprite_manager->load("largetux-jump-left");
   bigtux_right_jump = sprite_manager->load("largetux-jump-right");
 
-  bigcape_right[0] = new Surface(datadir + "/images/shared/bigcape-right-0.png",
-               USE_ALPHA);
-
-  bigcape_right[1] = new Surface(datadir + "/images/shared/bigcape-right-1.png",
-               USE_ALPHA);
-
-  bigcape_left[0] = new Surface(datadir + "/images/shared/bigcape-left-0.png",
-               USE_ALPHA);
-
-  bigcape_left[1] = new Surface(datadir + "/images/shared/bigcape-left-1.png",
-               USE_ALPHA);
-
   bigfiretux_right[0] = new Surface(datadir + "/images/shared/bigfiretux-right-0.png",
                USE_ALPHA);
 
@@ -151,19 +142,6 @@
 
   bigfiretux_left_jump = new Surface(datadir + "/images/shared/bigfiretux-left-jump.png", USE_ALPHA);
 
-  bigcape_right[0] = new Surface(datadir + "/images/shared/bigcape-right-0.png",
-               USE_ALPHA);
-
-  bigcape_right[1] = new Surface(datadir + "/images/shared/bigcape-right-1.png",
-               USE_ALPHA);
-
-  bigcape_left[0] = new Surface(datadir + "/images/shared/bigcape-left-0.png",
-               USE_ALPHA);
-
-  bigcape_left[1] = new Surface(datadir + "/images/shared/bigcape-left-1.png",
-               USE_ALPHA);
-
-
   ducktux_left  = sprite_manager->load("largetux-duck-left");
   ducktux_right = sprite_manager->load("largetux-duck-right");
 
@@ -322,8 +300,6 @@
     {
       delete cape_right[i];
       delete cape_left[i];
-      delete bigcape_right[i];
-      delete bigcape_left[i];
     }
 
   delete ducktux_left;