[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.10,1.11 convey
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.10,1.11 conveyor_belt.cxx,1.20,1.21 entrance.cxx,1.8,1.9 exit.cxx,1.7,1.8 fake_exit.cxx,1.12,1.13 guillotine.cxx,1.7,1.8 hammer.cxx,1.11,1.12 hotspot.cxx,1.5,1.6 ice_block.cxx,1.20,1.21 info_box.cxx,1.18,1.19 laser_exit.cxx,1.10,1.11 liquid.cxx,1.6,1.7 rain_generator.cxx,1.8,1.9 smasher.cxx,1.17,1.18 spike.cxx,1.8,1.9 starfield_background_stars.cxx,1.5,1.6 surface_background.cxx,1.6,1.7 switch_door.cxx,1.22,1.23 teleporter.cxx,1.15,1.16 thunderstorm_background.cxx,1.4,1.5 worldobj_group.cxx,1.5,1.6 |
Date: |
19 Feb 2003 09:50:39 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/worldobjs
In directory dark:/tmp/cvs-serv22817/worldobjs
Modified Files:
bumper.cxx conveyor_belt.cxx entrance.cxx exit.cxx
fake_exit.cxx guillotine.cxx hammer.cxx hotspot.cxx
ice_block.cxx info_box.cxx laser_exit.cxx liquid.cxx
rain_generator.cxx smasher.cxx spike.cxx
starfield_background_stars.cxx surface_background.cxx
switch_door.cxx teleporter.cxx thunderstorm_background.cxx
worldobj_group.cxx
Log Message:
moved a whole bunch of files around
Index: bumper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/bumper.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- bumper.cxx 4 Oct 2002 13:46:56 -0000 1.10
+++ bumper.cxx 19 Feb 2003 09:50:36 -0000 1.11
@@ -20,7 +20,7 @@
#include <iostream>
#include <ClanLib/Display/Display/surfaceprovider.h>
#include "../col_map.hxx"
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../pingu.hxx"
#include "../pingu_holder.hxx"
#include "../pingus_resource.hxx"
Index: conveyor_belt.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/conveyor_belt.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- conveyor_belt.cxx 4 Oct 2002 13:46:56 -0000 1.20
+++ conveyor_belt.cxx 19 Feb 2003 09:50:36 -0000 1.21
@@ -18,7 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "../col_map.hxx"
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../pingu.hxx"
#include "../pingu_holder.hxx"
#include "../pingus_resource.hxx"
Index: entrance.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/entrance.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- entrance.cxx 3 Nov 2002 13:29:09 -0000 1.8
+++ entrance.cxx 19 Feb 2003 09:50:36 -0000 1.9
@@ -18,7 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../world.hxx"
#include "../pingu_holder.hxx"
#include "../globals.hxx"
Index: exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/exit.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- exit.cxx 13 Oct 2002 20:25:00 -0000 1.7
+++ exit.cxx 19 Feb 2003 09:50:36 -0000 1.8
@@ -18,7 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../col_map.hxx"
#include "../world.hxx"
#include "../globals.hxx"
Index: fake_exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/fake_exit.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- fake_exit.cxx 20 Oct 2002 18:28:49 -0000 1.12
+++ fake_exit.cxx 19 Feb 2003 09:50:36 -0000 1.13
@@ -17,7 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../pingu.hxx"
#include "../pingu_holder.hxx"
#include "../world.hxx"
Index: guillotine.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/guillotine.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- guillotine.cxx 4 Oct 2002 13:46:56 -0000 1.7
+++ guillotine.cxx 19 Feb 2003 09:50:36 -0000 1.8
@@ -17,7 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../pingu.hxx"
#include "../pingu_holder.hxx"
#include "../world.hxx"
Index: hammer.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/hammer.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- hammer.cxx 13 Oct 2002 20:25:00 -0000 1.11
+++ hammer.cxx 19 Feb 2003 09:50:36 -0000 1.12
@@ -17,7 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../pingu.hxx"
#include "../pingu_holder.hxx"
#include "../world.hxx"
Index: hotspot.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/hotspot.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hotspot.cxx 2 Oct 2002 19:20:19 -0000 1.5
+++ hotspot.cxx 19 Feb 2003 09:50:36 -0000 1.6
@@ -20,7 +20,7 @@
#include <iostream>
#include "../worldobjsdata/hotspot_data.hxx"
#include "../globals.hxx"
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "hotspot.hxx"
namespace WorldObjs {
Index: ice_block.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ice_block.cxx 4 Oct 2002 13:46:56 -0000 1.20
+++ ice_block.cxx 19 Feb 2003 09:50:36 -0000 1.21
@@ -19,7 +19,7 @@
#include "../col_map.hxx"
#include "../game_time.hxx"
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../pingu.hxx"
#include "../pingu_holder.hxx"
#include "../pingu_map.hxx"
Index: info_box.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/info_box.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- info_box.cxx 4 Oct 2002 13:46:56 -0000 1.18
+++ info_box.cxx 19 Feb 2003 09:50:36 -0000 1.19
@@ -19,7 +19,7 @@
#include <ClanLib/Display/Font/font.h>
#include <ClanLib/Display/Display/display.h>
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../pingu.hxx"
#include "../pingu_holder.hxx"
#include "../fonts.hxx"
Index: laser_exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/laser_exit.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- laser_exit.cxx 13 Oct 2002 20:25:00 -0000 1.10
+++ laser_exit.cxx 19 Feb 2003 09:50:37 -0000 1.11
@@ -17,7 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../pingu.hxx"
#include "../pingu_holder.hxx"
#include "../world.hxx"
Index: liquid.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/liquid.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- liquid.cxx 18 Feb 2003 17:04:13 -0000 1.6
+++ liquid.cxx 19 Feb 2003 09:50:37 -0000 1.7
@@ -19,7 +19,7 @@
#include <iostream>
#include "../col_map.hxx"
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../pingus_resource.hxx"
#include "../world.hxx"
#include "../worldobjsdata/liquid_data.hxx"
Index: rain_generator.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/rain_generator.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rain_generator.cxx 18 Feb 2003 15:04:47 -0000 1.8
+++ rain_generator.cxx 19 Feb 2003 09:50:37 -0000 1.9
@@ -22,7 +22,7 @@
#include "../particles/rain_particle_holder.hxx"
#include "../sound/sound.hxx"
#include "../world.hxx"
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "rain_generator.hxx"
namespace WorldObjs {
Index: smasher.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/smasher.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- smasher.cxx 18 Feb 2003 15:04:47 -0000 1.17
+++ smasher.cxx 19 Feb 2003 09:50:37 -0000 1.18
@@ -18,9 +18,9 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
-#include "../algo.hxx"
+#include "../math.hxx"
#include "../col_map.hxx"
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../particles/smoke_particle_holder.hxx"
#include "../pingu.hxx"
#include "../pingu_holder.hxx"
@@ -72,9 +72,10 @@
for(int i=0; i < 20; ++i)
{
-
world->get_smoke_particle_holder()->add_particle(static_cast<int>(data->pos.x +
20 + rand() % 260),
-
static_cast<int>(data->pos.y + 180),
-
frand()-0.5f, frand()-0.5f);
+ world->get_smoke_particle_holder()->
+ add_particle(static_cast<int>(data->pos.x + 20
+ rand() % 260),
+ static_cast<int>(data->pos.y +
180),
+ Math::frand()-0.5f,
Math::frand()-0.5f);
}
for (PinguIter pingu = holder->begin (); pingu !=
holder->end (); ++pingu)
Index: spike.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/spike.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- spike.cxx 18 Feb 2003 01:23:52 -0000 1.8
+++ spike.cxx 19 Feb 2003 09:50:37 -0000 1.9
@@ -17,7 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../pingu.hxx"
#include "../pingu_holder.hxx"
#include "../world.hxx"
Index: starfield_background_stars.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjs/starfield_background_stars.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- starfield_background_stars.cxx 27 Jan 2003 22:14:52 -0000 1.5
+++ starfield_background_stars.cxx 19 Feb 2003 09:50:37 -0000 1.6
@@ -17,7 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../world.hxx"
#include "../pingus_resource.hxx"
#include "starfield_background_stars.hxx"
Index: surface_background.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/surface_background.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- surface_background.cxx 18 Feb 2003 17:04:13 -0000 1.6
+++ surface_background.cxx 19 Feb 2003 09:50:37 -0000 1.7
@@ -20,7 +20,7 @@
#include <iostream>
#include <ClanLib/Display/SurfaceProviders/canvas.h>
#include <ClanLib/Display/Display/display.h>
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../world.hxx"
#include "../timer.hxx"
#include "../pingus_resource.hxx"
Index: switch_door.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/switch_door.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- switch_door.cxx 4 Oct 2002 13:46:56 -0000 1.22
+++ switch_door.cxx 19 Feb 2003 09:50:37 -0000 1.23
@@ -18,7 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "../col_map.hxx"
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../pingu.hxx"
#include "../pingu_holder.hxx"
#include "../world.hxx"
Index: teleporter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/teleporter.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- teleporter.cxx 7 Oct 2002 23:04:06 -0000 1.15
+++ teleporter.cxx 19 Feb 2003 09:50:37 -0000 1.16
@@ -18,7 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "../pingu.hxx"
#include "../pingu_holder.hxx"
#include "../world.hxx"
Index: thunderstorm_background.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjs/thunderstorm_background.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- thunderstorm_background.cxx 27 Nov 2002 20:05:42 -0000 1.4
+++ thunderstorm_background.cxx 19 Feb 2003 09:50:37 -0000 1.5
@@ -19,7 +19,7 @@
#include "../pingus_resource.hxx"
#include "../worldobjsdata/thunderstorm_background_data.hxx"
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "thunderstorm_background.hxx"
namespace WorldObjs {
Index: worldobj_group.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/worldobj_group.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- worldobj_group.cxx 1 Oct 2002 19:53:46 -0000 1.5
+++ worldobj_group.cxx 19 Feb 2003 09:50:37 -0000 1.6
@@ -17,7 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "../graphic_context.hxx"
+#include "../gui/graphic_context.hxx"
#include "worldobj_group.hxx"
namespace WorldObjs {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.10,1.11 conveyor_belt.cxx,1.20,1.21 entrance.cxx,1.8,1.9 exit.cxx,1.7,1.8 fake_exit.cxx,1.12,1.13 guillotine.cxx,1.7,1.8 hammer.cxx,1.11,1.12 hotspot.cxx,1.5,1.6 ice_block.cxx,1.20,1.21 info_box.cxx,1.18,1.19 laser_exit.cxx,1.10,1.11 liquid.cxx,1.6,1.7 rain_generator.cxx,1.8,1.9 smasher.cxx,1.17,1.18 spike.cxx,1.8,1.9 starfield_background_stars.cxx,1.5,1.6 surface_background.cxx,1.6,1.7 switch_door.cxx,1.22,1.23 teleporter.cxx,1.15,1.16 thunderstorm_background.cxx,1.4,1.5 worldobj_group.cxx,1.5,1.6,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/gui Makefile.am,1.2,1.3 gui_manager.cxx,1.18,1.19
- Next 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
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/gui Makefile.am,1.2,1.3 gui_manager.cxx,1.18,1.19
- Next 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
- Index(es):