[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/actions bomber.cxx,1.25,1.26 rocket_l
From: |
torangan |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/actions bomber.cxx,1.25,1.26 rocket_launcher.cxx,1.12,1.13 |
Date: |
28 Dec 2002 16:10:20 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/actions
In directory dark:/tmp/cvs-serv31100/actions
Modified Files:
bomber.cxx rocket_launcher.cxx
Log Message:
rewrite of particle system
Index: bomber.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/bomber.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- bomber.cxx 3 Nov 2002 17:32:25 -0000 1.25
+++ bomber.cxx 28 Dec 2002 16:10:17 -0000 1.26
@@ -28,7 +28,7 @@
#include "../pingus_resource.hxx"
#include "../string_converter.hxx"
#include "../world.hxx"
-#include "../particles/particle_holder.hxx"
+#include "../particles/pingu_particle_holder.hxx"
#include "bomber.hxx"
namespace Actions {
@@ -110,8 +110,8 @@
if (sprite.get_frame () > 12 && !particle_thrown)
{
particle_thrown = true;
-
WorldObj::get_world()->get_particle_holder()->add_pingu_explo(static_cast<int>(pingu->get_x()),
-
static_cast<int>(pingu->get_y()) - 5);
+
WorldObj::get_world()->get_pingu_particle_holder()->add_particle(static_cast<int>(pingu->get_x()),
+
static_cast<int>(pingu->get_y()) - 5);
}
@@ -120,11 +120,11 @@
colmap_exploded = true;
WorldObj::get_world()->get_colmap()->remove(bomber_radius,
- static_cast<int>(pingu->get_x
() - (bomber_radius.get_width()/2)),
- static_cast<int>(pingu->get_y
() - 16 - (bomber_radius.get_width()/2)));
+
static_cast<int>(pingu->get_x () - (bomber_radius.get_width()/2)),
+
static_cast<int>(pingu->get_y () - 16 - (bomber_radius.get_width()/2)));
WorldObj::get_world()->get_gfx_map()->remove(bomber_radius_gfx,
-
static_cast<int>(pingu->get_x () - (bomber_radius.get_width()/2)),
-
static_cast<int>(pingu->get_y () - 16 - (bomber_radius.get_width()/2)));
+
static_cast<int>(pingu->get_x () - (bomber_radius.get_width()/2)),
+
static_cast<int>(pingu->get_y () - 16 - (bomber_radius.get_width()/2)));
}
Index: rocket_launcher.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/rocket_launcher.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- rocket_launcher.cxx 13 Oct 2002 20:25:00 -0000 1.12
+++ rocket_launcher.cxx 28 Dec 2002 16:10:18 -0000 1.13
@@ -18,8 +18,8 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "../graphic_context.hxx"
-#include "../particles/particle_holder.hxx"
-#include "../particles/explosive_particle.hxx"
+//#include "../particles/particle_holder.hxx"
+//#include "../particles/explosive_particle.hxx"
#include "../world.hxx"
#include "../string_converter.hxx"
#include "../pingus_resource.hxx"
@@ -35,12 +35,13 @@
launched(false)
{
sprite.set_align_center_bottom();
-
+/* Explosive Particles not supported right now
WorldObj::get_world()->get_particle_holder()->add_particle
(new ExplosiveParticle (static_cast<int>(pingu->get_x()),
static_cast<int>(pingu->get_y()) - 12,
pingu->direction.is_left() ? -400.0f : 400.0f,
0.0f));
+*/
}
void
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/actions bomber.cxx,1.25,1.26 rocket_launcher.cxx,1.12,1.13,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs rain_generator.cxx,1.6,1.7 smasher.cxx,1.14,1.15 snow_generator.cxx,1.4,1.5
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/particles pingu_particle_holder.cxx,NONE,1.1 pingu_particle_holder.hxx,NONE,1.1 rain_particle_holder.cxx,NONE,1.1 rain_particle_holder.hxx,NONE,1.1 smoke_particle_holder.cxx,NONE,1.1smoke_particle_holder.hxx,NONE,1.1 snow_particle_holder.cxx,NONE,1.1 snow_particle_holder.hxx,NONE,1.1 Makefile.am,1.8,1.9 explosive_particle.cxx,1.4,1.5 explosive_particle.hxx,1.4,1.5 ground_particle.cxx,1.2,1.3 ground_particle.hxx,1.4,1.5 particle.cxx,1.4,NONE particle.hxx,1.7,NONE particle_cache.cxx,1.4,NONE particle_cache.hxx,1.5,NONE particle_holder.cxx,1.7,NONE particle_holder.hxx,1.6,NONE pingu_particle.cxx,1.4,NONE pingu_particle.hxx,1.6,NONE rain_particle.cxx,1.5,NONE rain_particle.hxx,1.5,NONE smoke_particle.cxx,1.4,NONE smoke_particle.hxx,1.5,NONE snow_particle.cxx,1.6,NONE snow_particle.hxx,1.4,NONE
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs rain_generator.cxx,1.6,1.7 smasher.cxx,1.14,1.15 snow_generator.cxx,1.4,1.5
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/particles pingu_particle_holder.cxx,NONE,1.1 pingu_particle_holder.hxx,NONE,1.1 rain_particle_holder.cxx,NONE,1.1 rain_particle_holder.hxx,NONE,1.1 smoke_particle_holder.cxx,NONE,1.1smoke_particle_holder.hxx,NONE,1.1 snow_particle_holder.cxx,NONE,1.1 snow_particle_holder.hxx,NONE,1.1 Makefile.am,1.8,1.9 explosive_particle.cxx,1.4,1.5 explosive_particle.hxx,1.4,1.5 ground_particle.cxx,1.2,1.3 ground_particle.hxx,1.4,1.5 particle.cxx,1.4,NONE particle.hxx,1.7,NONE particle_cache.cxx,1.4,NONE particle_cache.hxx,1.5,NONE particle_holder.cxx,1.7,NONE particle_holder.hxx,1.6,NONE pingu_particle.cxx,1.4,NONE pingu_particle.hxx,1.6,NONE rain_particle.cxx,1.5,NONE rain_particle.hxx,1.5,NONE smoke_particle.cxx,1.4,NONE smoke_particle.hxx,1.5,NONE snow_particle.cxx,1.6,NONE snow_particle.hxx,1.4,NONE
- Index(es):