[Super-tux-commit] supertux/src gameobjs.cpp,1.45,1.46 gameobjs.h,1.32,1.33

[Ricardo C. <rm...@us...>]

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

Modified Files:
	gameobjs.cpp gameobjs.h 
Log Message:
Removed trampoline sprites hack.

Index: gameobjs.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- gameobjs.cpp	5 Aug 2004 13:49:20 -0000	1.45
+++ gameobjs.cpp	14 Aug 2004 11:33:52 -0000	1.46
@@ -137,7 +137,7 @@
 
 /* Trampoline */
 
-Sprite *img_trampoline[TRAMPOLINE_FRAMES];
+Sprite *img_trampoline;
 
 Trampoline::Trampoline(LispReader& reader)
 {
@@ -181,7 +181,8 @@
 void
 Trampoline::draw(DrawingContext& context)
 {
-  img_trampoline[frame]->draw(context, base, LAYER_OBJECTS);
+  img_trampoline->set_frame(frame);
+  img_trampoline->draw(context, base, LAYER_OBJECTS);
   frame = 0;
 }
 
@@ -438,15 +439,7 @@
 
 void load_object_gfx()
 {
-  char sprite_name[16];
-
-  for (int i = 0; i < TRAMPOLINE_FRAMES; i++)
-  {
-    sprintf(sprite_name, "trampoline-%i", i+1);
-    img_trampoline[i] = sprite_manager->load(sprite_name);
-  }
-
+  img_trampoline = sprite_manager->load("trampoline");
   img_flying_platform = sprite_manager->load("flying_platform");
-
   img_smoke_cloud = sprite_manager->load("stomp");
 }

Index: gameobjs.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameobjs.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- gameobjs.h	5 Aug 2004 10:10:19 -0000	1.32
+++ gameobjs.h	14 Aug 2004 11:33:53 -0000	1.33
@@ -105,8 +105,7 @@
   Timer timer;  
 };
 
-#define TRAMPOLINE_FRAMES 4
-extern Sprite *img_trampoline[TRAMPOLINE_FRAMES];
+extern Sprite *img_trampoline;
 
 class Trampoline : public MovingObject, public Serializable
 {