- Added images for ducking big Super Tux.

[supertux.git] / src / gameobjs.cpp

diff --git a/src/gameobjs.cpp b/src/gameobjs.cpp
index 2bde3cb..e8ea305 100644 (file)
--- a/src/gameobjs.cpp
+++ b/src/gameobjs.cpp
@@ -137,7 +137,7 @@ FloatingScore::draw(DrawingContext& context)
 
 /* Trampoline */
 
-Sprite *img_trampoline[TRAMPOLINE_FRAMES];
+Sprite *img_trampoline;
 
 Trampoline::Trampoline(LispReader& reader)
 {
@@ -181,7 +181,8 @@ Trampoline::write(LispWriter& writer)
 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;
 }
 
@@ -418,13 +419,13 @@ Sprite *img_smoke_cloud;
 SmokeCloud::SmokeCloud(const Vector& pos)
   : position(pos)
 {
-  timer.start(250);
+  timer.start(300);
 }
 
 void
 SmokeCloud::action(float elapsed_time)
 {
-  position.y -= 2 * elapsed_time;
+  position.y -= 1.2 * elapsed_time;
 
   if(!timer.check())
     remove_me();
@@ -438,15 +439,8 @@ SmokeCloud::draw(DrawingContext& context)
 
 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_trampoline->start_animation(0);
   img_flying_platform = sprite_manager->load("flying_platform");
-
   img_smoke_cloud = sprite_manager->load("stomp");
 }