oops forgot 2 files

SVN-Revision: 2984

diff --git a/src/object/bullet.cpp b/src/object/bullet.cpp
index 94b20a1..de7012a 100644 (file)
--- a/src/object/bullet.cpp
+++ b/src/object/bullet.cpp
@@ -28,7 +28,7 @@
 #include "badguy/badguy.hpp"
 #include "main.hpp"
 
-static const float BULLET_XM = 300;
+static const float BULLET_XM = 600;
 static const float BULLET_STARTING_YM = 0;
 
 Bullet::Bullet(const Vector& pos, float xm, int dir, int kind_)
@@ -43,9 +43,9 @@ Bullet::Bullet(const Vector& pos, float xm, int dir, int kind_)
 
   if (kind == ICE_BULLET) {
     life_count = 6; //ice-bullets get "extra lives" for bumping off walls
-    sprite = sprite_manager->create("icebullet");
+    sprite = sprite_manager->create("images/objects/bullets/icebullet.sprite");
   } else if(kind == FIRE_BULLET) {
-    sprite = sprite_manager->create("firebullet");
+    sprite = sprite_manager->create("images/objects/bullets/firebullet.sprite");
   }
 }
 

diff --git a/src/object/particles.cpp b/src/object/particles.cpp
new file mode 100644 (file)
index 0000000..86cf466
--- /dev/null
+++ b/src/object/particles.cpp
@@ -0,0 +1,105 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2000 Bill Kendrick <bill@newbreedsoftware.com>
+//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+//  02111-1307, USA.
+#include <config.h>
+
+#include <math.h>
+
+#include "particles.hpp"
+#include "sector.hpp"
+#include "camera.hpp"
+#include "main.hpp"
+
+Particles::Particles(const Vector& epicenter, int min_angle, int max_angle,
+        const Vector& initial_velocity, const Vector& acceleration, int number,
+        Color color_, int size_, float life_time, int drawing_layer_)
+  : accel(acceleration), color(color_), size(size_), drawing_layer(drawing_layer_)
+{
+  if(life_time == 0) {
+    live_forever = true;
+  } else {
+    live_forever = false;
+    timer.start(life_time);
+  }
+
+  // create particles
+  for(int p = 0; p < number; p++)
+    {
+    Particle* particle = new Particle;
+    particle->pos = epicenter;
+
+    float angle = ((rand() % (max_angle-min_angle))+min_angle)
+                      * (M_PI / 180);  // convert to radius
+    particle->vel.x = /*fabs*/(sin(angle)) * initial_velocity.x;
+//    if(angle >= M_PI && angle < M_PI*2)
+//      particle->vel.x *= -1;  // work around to fix signal
+    particle->vel.y = /*fabs*/(cos(angle)) * initial_velocity.y;
+//    if(angle >= M_PI_2 && angle < 3*M_PI_2)
+//      particle->vel.y *= -1;
+
+    particles.push_back(particle);
+    }
+}
+
+Particles::~Particles()
+{
+  // free particles
+  for(std::vector<Particle*>::iterator i = particles.begin();
+      i < particles.end(); i++)
+    delete (*i);
+}
+
+void
+Particles::update(float elapsed_time)
+{
+  Vector camera = Sector::current()->camera->get_translation();
+
+  // update particles
+  for(std::vector<Particle*>::iterator i = particles.begin();
+      i != particles.end(); ) {
+    (*i)->pos.x += (*i)->vel.x * elapsed_time;
+    (*i)->pos.y += (*i)->vel.y * elapsed_time;
+
+    (*i)->vel.x += accel.x * elapsed_time;
+    (*i)->vel.y += accel.y * elapsed_time;
+
+    if((*i)->pos.x < camera.x || (*i)->pos.x > SCREEN_WIDTH + camera.x ||
+       (*i)->pos.y < camera.y || (*i)->pos.y > SCREEN_HEIGHT + camera.y) {
+      delete (*i);
+      i = particles.erase(i);
+    } else {
+      ++i;
+    }
+  }
+
+  if((timer.check() && !live_forever) || particles.size() == 0)
+    remove_me();
+}
+
+void
+Particles::draw(DrawingContext& context)
+{
+  // draw particles
+  for(std::vector<Particle*>::iterator i = particles.begin();
+      i != particles.end(); i++) {
+    context.draw_filled_rect((*i)->pos, Vector(size,size), color,drawing_layer);
+  }
+}
+

diff --git a/src/object/particles.hpp b/src/object/particles.hpp
new file mode 100644 (file)
index 0000000..cc3738e
--- /dev/null
+++ b/src/object/particles.hpp
@@ -0,0 +1,57 @@
+//  $Id: gameobjs.hpp 2806 2005-10-03 15:29:22Z matzebraun $
+// 
+//  SuperTux
+//  Copyright (C) 2000 Bill Kendrick <bill@newbreedsoftware.com>
+//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+//  02111-1307, USA.
+#ifndef SUPERTUX_PARTICLES_HPP
+#define SUPERTUX_PARTICLES_HPP
+
+#include "math/vector.hpp"
+#include "game_object.hpp"
+#include "timer.hpp"
+#include "video/color.hpp"
+
+class Particles : public GameObject
+{
+public:
+  Particles(const Vector& epicenter, int min_angle, int max_angle,
+            const Vector& initial_velocity, const Vector& acceleration,
+            int number, Color color, int size, float life_time,
+            int drawing_layer);
+  ~Particles();
+  
+  virtual void update(float elapsed_time);
+  virtual void draw(DrawingContext& context);
+
+private:
+  Vector accel;
+  Timer timer;
+  bool live_forever;
+
+  Color color;
+  float size;
+  int drawing_layer;
+
+  struct Particle {
+    Vector pos, vel;
+//     float angle;
+    };
+  std::vector <Particle*> particles;
+};
+
+#endif