[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/particles pingu_particle_holder.cxx,
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/particles pingu_particle_holder.cxx,1.3,1.4 rain_particle_holder.cxx,1.3,1.4 smoke_particle_holder.cxx,1.2,1.3 snow_particle_holder.cxx,1.5,1.6 |
Date: |
19 Feb 2003 09:50:39 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/particles
In directory dark:/tmp/cvs-serv22817/particles
Modified Files:
pingu_particle_holder.cxx rain_particle_holder.cxx
smoke_particle_holder.cxx snow_particle_holder.cxx
Log Message:
moved a whole bunch of files around
Index: pingu_particle_holder.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/particles/pingu_particle_holder.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pingu_particle_holder.cxx 25 Jan 2003 11:03:58 -0000 1.3
+++ pingu_particle_holder.cxx 19 Feb 2003 09:50:36 -0000 1.4
@@ -17,9 +17,9 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "../algo.hxx"
+#include "../gui/graphic_context.hxx"
+#include "../math.hxx"
#include "../col_map.hxx"
-#include "../graphic_context.hxx"
#include "../pingus_resource.hxx"
#include "../world.hxx"
#include "pingu_particle_holder.hxx"
@@ -36,7 +36,7 @@
: livetime(50 + (rand() % 50)),
use_frame2((rand() % 5) == 0),
pos(Vector(x, y)),
- velocity(Vector(frand() * 7 - 3.5, frand() * -7))
+ velocity(Vector(Math::frand() * 7 - 3.5, Math::frand() * -7))
{
}
Index: rain_particle_holder.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/particles/rain_particle_holder.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rain_particle_holder.cxx 25 Jan 2003 11:03:58 -0000 1.3
+++ rain_particle_holder.cxx 19 Feb 2003 09:50:36 -0000 1.4
@@ -17,10 +17,10 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "../algo.hxx"
+#include "../gui/graphic_context.hxx"
+#include "../math.hxx"
#include "../col_map.hxx"
#include "../globals.hxx"
-#include "../graphic_context.hxx"
#include "../pingus_resource.hxx"
#include "../world.hxx"
#include "rain_particle_holder.hxx"
@@ -31,7 +31,7 @@
: alive(true), splash(false), use_rain2_surf(false), splash_counter(0),
splash_frame(0), pos(Vector(x, y))
{
use_rain2_surf = ((rand() % 3) == 0);
- pos.z = 1.0 + frand() * 3.0;
+ pos.z = 1.0 + Math::frand() * 3.0;
}
Index: smoke_particle_holder.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/particles/smoke_particle_holder.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- smoke_particle_holder.cxx 25 Jan 2003 11:03:58 -0000 1.2
+++ smoke_particle_holder.cxx 19 Feb 2003 09:50:36 -0000 1.3
@@ -18,7 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "../globals.hxx"
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../pingus_resource.hxx"
#include "smoke_particle_holder.hxx"
Index: snow_particle_holder.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/particles/snow_particle_holder.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- snow_particle_holder.cxx 28 Jan 2003 16:45:12 -0000 1.5
+++ snow_particle_holder.cxx 19 Feb 2003 09:50:36 -0000 1.6
@@ -18,9 +18,9 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <assert.h>
-#include "../algo.hxx"
+#include "../math.hxx"
#include "../col_map.hxx"
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../pingu_map.hxx"
#include "../pingus_resource.hxx"
#include "../world.hxx"
@@ -32,7 +32,7 @@
: alive(true),
colliding(colliding_),
pos(Vector(x,y)),
- velocity(Vector(0.0f, 1 + (frand() * 3.5f)))
+ velocity(Vector(0.0f, 1 + (Math::frand() * 3.5f)))
{
switch (rand() % 10)
{
@@ -100,7 +100,7 @@
continue;
}
- it->velocity.x += (frand() - 0.5f) / 10;
+ it->velocity.x += (Math::frand() - 0.5f) / 10;
if (it->colliding)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/particles pingu_particle_holder.cxx,1.3,1.4 rain_particle_holder.cxx,1.3,1.4 smoke_particle_holder.cxx,1.2,1.3 snow_particle_holder.cxx,1.5,1.6,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.45,1.46 editor.hxx,1.23,1.24 editor_event.cxx,1.47,1.48 surface_selector.cxx,1.6,1.7
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs/entrances woodthing.cxx,1.5,1.6
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.45,1.46 editor.hxx,1.23,1.24 editor_event.cxx,1.47,1.48 surface_selector.cxx,1.6,1.7
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs/entrances woodthing.cxx,1.5,1.6
- Index(es):