Ooops, forgot to upload the actual Statistics implementation.

[supertux.git] / src / gameobjs.cpp

diff --git a/src/gameobjs.cpp b/src/gameobjs.cpp
index 95e544a..39d4eb6 100644 (file)
--- a/src/gameobjs.cpp
+++ b/src/gameobjs.cpp
@@ -32,6 +32,7 @@
 #include "resources.h"
 #include "sector.h"
 #include "tilemap.h"
+#include "video/drawing_context.h"
 
 BouncyDistro::BouncyDistro(const Vector& pos)
   : position(pos)
@@ -137,7 +138,7 @@ FloatingScore::draw(DrawingContext& context)
 
 /* Trampoline */
 
-Sprite *img_trampoline[TRAMPOLINE_FRAMES];
+Sprite *img_trampoline;
 
 Trampoline::Trampoline(LispReader& reader)
 {
@@ -181,7 +182,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;
 }
 
@@ -436,17 +438,60 @@ SmokeCloud::draw(DrawingContext& context)
   img_smoke_cloud->draw(context, position, LAYER_OBJECTS+1);
 }
 
-void load_object_gfx()
+Particles::Particles(const Vector& epicenter, const Vector& velocity, const Vector& acceleration, int number, Color color_, int size_, int life_time)
+  : color(color_), size(size_), vel(velocity), accel(acceleration)
 {
-  char sprite_name[16];
+  timer.start(life_time);
 
-  for (int i = 0; i < TRAMPOLINE_FRAMES; i++)
-  {
-    sprintf(sprite_name, "trampoline-%i", i+1);
-    img_trampoline[i] = sprite_manager->load(sprite_name);
-  }
+  // create particles
+  for(int p = 0; p < number; p++)
+    {
+    Particle* particle = new Particle;
+    particle->pos = epicenter;
+    particle->angle = (rand() % 360) * (M_PI / 180);  // in radius
 
-  img_flying_platform = sprite_manager->load("flying_platform");
+    particles.push_back(particle);
+    }
+}
 
+Particles::~Particles()
+{
+  // free particles
+  for(std::vector<Particle*>::iterator i = particles.begin(); i < particles.end(); i++)
+    delete (*i);
+}
+
+void
+Particles::action(float elapsed_time)
+{
+  vel.x += accel.x * elapsed_time;
+  vel.y += accel.y * elapsed_time;
+
+  // update particles
+  for(int p = 0; p < particles.size(); p++)
+    {
+    particles[p]->pos.x += sin(particles[p]->angle) * vel.x * elapsed_time;
+    particles[p]->pos.y += cos(particles[p]->angle) * vel.y * elapsed_time;
+    }
+
+  if(!timer.check())
+    remove_me();
+}
+
+void
+Particles::draw(DrawingContext& context)
+{
+  // draw particles
+  for(int p = 0; p < particles.size(); p++)
+    {
+    context.draw_filled_rect(particles[p]->pos, Vector(size,size), color, LAYER_OBJECTS+10);
+    }
+}
+
+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");
 }