- Added images for ducking big Super Tux.

[supertux.git] / src / gameobjs.cpp

diff --git a/src/gameobjs.cpp b/src/gameobjs.cpp
index 3d9c20e..e8ea305 100644 (file)
--- a/src/gameobjs.cpp
+++ b/src/gameobjs.cpp
@@ -23,10 +23,12 @@
 #include <iostream>
 #include <cmath>
 
+#include "app/globals.h"
 #include "tile.h"
+#include "tile_manager.h"
 #include "gameloop.h"
 #include "gameobjs.h"
-#include "sprite_manager.h"
+#include "special/sprite_manager.h"
 #include "resources.h"
 #include "sector.h"
 #include "tilemap.h"
@@ -80,9 +82,10 @@ BrokenBrick::draw(DrawingContext& context)
 }
 
 BouncyBrick::BouncyBrick(const Vector& pos)
-  : position(pos), offset(0), offset_m(-BOUNCY_BRICK_SPEED)
-{
-  shape = Sector::current()->solids->get_tile_id_at(pos);
+  : position(pos), offset(0), offset_m(-BOUNCY_BRICK_SPEED), 
+    shape(Sector::current()->solids->get_tile_id_at(pos))
+{ 
+  shape.hidden = true;
 }
 
 void
@@ -96,14 +99,17 @@ BouncyBrick::action(float elapsed_time)
 
   /* Stop bouncing? */
   if (offset >= 0)
-    remove_me();
+    {
+      shape.hidden = false;
+      remove_me();
+    }
 }
 
 void
 BouncyBrick::draw(DrawingContext& context)
 {
   TileManager::instance()->
-    draw_tile(context, shape, position + Vector(0, offset), LAYER_TILES+1);
+    draw_tile(context, shape.id, position + Vector(0, offset), LAYER_TILES+1);
 }
 
 FloatingScore::FloatingScore(const Vector& pos, int score)
@@ -131,8 +137,7 @@ FloatingScore::draw(DrawingContext& context)
 
 /* Trampoline */
 
-#define TRAMPOLINE_FRAMES 4
-Sprite *img_trampoline[TRAMPOLINE_FRAMES];
+Sprite *img_trampoline;
 
 Trampoline::Trampoline(LispReader& reader)
 {
@@ -148,6 +153,19 @@ Trampoline::Trampoline(LispReader& reader)
   physic.reset();
 }
 
+Trampoline::Trampoline(float x, float y)
+{
+  base.x = x;
+  base.y = y;
+  base.width = 32;
+  base.height = 32;
+  power = 7.5;
+
+  frame = 0;
+  mode = M_NORMAL;
+  physic.reset();
+}
+
 void
 Trampoline::write(LispWriter& writer)
 {
@@ -163,7 +181,8 @@ Trampoline::write(LispWriter& writer)
 void
 Trampoline::draw(DrawingContext& context)
 {
-  img_trampoline[frame]->draw(context, Vector(base.x, base.y), LAYER_OBJECTS);
+  img_trampoline->set_frame(frame);
+  img_trampoline->draw(context, base, LAYER_OBJECTS);
   frame = 0;
 }
 
@@ -214,7 +233,7 @@ Trampoline::action(float frame_ratio)
     }
   }
 
-  physic.apply(frame_ratio, base.x, base.y);
+  physic.apply(frame_ratio, base.x, base.y, Sector::current()->gravity);
   collision_swept_object_map(&old_base, &base);
 }
 
@@ -295,6 +314,14 @@ FlyingPlatform::FlyingPlatform(LispReader& reader)
   frame = 0;
 }
 
+FlyingPlatform::FlyingPlatform(int x, int y)
+{
+base.x = x;
+base.y = y;
+point = 0;
+move = false;
+}
+
 void
 FlyingPlatform::write(LispWriter& writer)
 {
@@ -310,7 +337,7 @@ FlyingPlatform::write(LispWriter& writer)
 void
 FlyingPlatform::draw(DrawingContext& context)
 {
-  img_flying_platform->draw(context, Vector(base.x, base.y), LAYER_OBJECTS);
+  img_flying_platform->draw(context, base, LAYER_OBJECTS);
 }
 
 void
@@ -387,15 +414,33 @@ FlyingPlatform::collision(void *p_c_object, int c_object, CollisionType type)
   }
 }
 
-void load_object_gfx()
+Sprite *img_smoke_cloud;
+
+SmokeCloud::SmokeCloud(const Vector& pos)
+  : position(pos)
 {
-  char sprite_name[16];
+  timer.start(300);
+}
 
-  for (int i = 0; i < TRAMPOLINE_FRAMES; i++)
-  {
-    sprintf(sprite_name, "trampoline-%i", i+1);
-    img_trampoline[i] = sprite_manager->load(sprite_name);
-  }
+void
+SmokeCloud::action(float elapsed_time)
+{
+  position.y -= 1.2 * elapsed_time;
 
+  if(!timer.check())
+    remove_me();
+}
+
+void
+SmokeCloud::draw(DrawingContext& context)
+{
+  img_smoke_cloud->draw(context, position, LAYER_OBJECTS+1);
+}
+
+void load_object_gfx()
+{
+  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");
 }