[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata bumper_data.cxx,1.8,1.9
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata bumper_data.cxx,1.8,1.9 bumper_data.hxx,1.4,1.5 conveyor_belt_data.cxx,1.8,1.9 conveyor_belt_data.hxx,1.5,1.6 entrance_data.cxx,1.5,1.6 entrance_data.hxx,1.2,1.3 exit_data.cxx,1.5,1.6 exit_data.hxx,1.2,1.3 fake_exit_data.cxx,1.8,1.9 fake_exit_data.hxx,1.4,1.5 groundpiece_data.cxx,1.13,1.14 groundpiece_data.hxx,1.4,1.5 guillotine_data.cxx,1.8,1.9 guillotine_data.hxx,1.4,1.5 hammer_data.cxx,1.9,1.10 hammer_data.hxx,1.5,1.6 hotspot_data.cxx,1.4,1.5 hotspot_data.hxx,1.4,1.5 ice_block_data.cxx,1.7,1.8 ice_block_data.hxx,1.4,1.5 info_box_data.cxx,1.9,1.10 info_box_data.hxx,1.4,1.5 laser_exit_data.cxx,1.8,1.9 laser_exit_data.hxx,1.4,1.5 liquid_data.cxx,1.8,1.9 liquid_data.hxx,1.4,1.5 prefab_obj_data.cxx,1.6,1.7 prefab_obj_data.hxx,1.4,1.5 rain_generator_data.cxx,1.3,1.4 rain_generator_data.hxx,1.3,1.4 smasher_data.cxx,1.8,1.9 smasher_data.hxx,1.4,1.5 snow_generator_data.cxx,1.5,1.6 snow_generator_data.hxx,1.6,1.7solid_color_background_data.cxx,1.4,1.5 solid_color_background_data.hxx,1.3,1.4 spike_data.cxx,1.8,1.9 spike_data.hxx,1.5,1.6 starfield_background_data.cxx,1.6,1.7 starfield_background_data.hxx,1.2,1.3surface_background_data.cxx,1.8,1.9 surface_background_data.hxx,1.4,1.5 switch_door_data.cxx,1.8,1.9 switch_door_data.hxx,1.4,1.5 teleporter_data.cxx,1.9,1.10 teleporter_data.hxx,1.4,1.5thunderstorm_background_data.cxx,1.4,1.5 thunderstorm_background_data.hxx,1.3,1.4 worldobj_group_data.cxx,1.6,1.7 worldobj_group_data.hxx,1.4,1.5 |
Date: |
26 Feb 2003 17:08:32 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/worldobjsdata
In directory dark:/tmp/cvs-serv28381/worldobjsdata
Modified Files:
bumper_data.cxx bumper_data.hxx conveyor_belt_data.cxx
conveyor_belt_data.hxx entrance_data.cxx entrance_data.hxx
exit_data.cxx exit_data.hxx fake_exit_data.cxx
fake_exit_data.hxx groundpiece_data.cxx groundpiece_data.hxx
guillotine_data.cxx guillotine_data.hxx hammer_data.cxx
hammer_data.hxx hotspot_data.cxx hotspot_data.hxx
ice_block_data.cxx ice_block_data.hxx info_box_data.cxx
info_box_data.hxx laser_exit_data.cxx laser_exit_data.hxx
liquid_data.cxx liquid_data.hxx prefab_obj_data.cxx
prefab_obj_data.hxx rain_generator_data.cxx
rain_generator_data.hxx smasher_data.cxx smasher_data.hxx
snow_generator_data.cxx snow_generator_data.hxx
solid_color_background_data.cxx
solid_color_background_data.hxx spike_data.cxx spike_data.hxx
starfield_background_data.cxx starfield_background_data.hxx
surface_background_data.cxx surface_background_data.hxx
switch_door_data.cxx switch_door_data.hxx teleporter_data.cxx
teleporter_data.hxx thunderstorm_background_data.cxx
thunderstorm_background_data.hxx worldobj_group_data.cxx
worldobj_group_data.hxx
Log Message:
changed the way world objects get inserted into the world
Index: bumper_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/bumper_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bumper_data.cxx 18 Feb 2003 01:23:52 -0000 1.8
+++ bumper_data.cxx 26 Feb 2003 17:08:29 -0000 1.9
@@ -19,6 +19,7 @@
#include <iostream>
#include "bumper_data.hxx"
+#include "../world.hxx"
#include "../xml_helper.hxx"
#include "../xml_file_reader.hxx"
#include "../editorobjs/bumper_obj.hxx"
@@ -52,10 +53,10 @@
xml << "</worldobj>\n\n";
}
-WorldObj*
-BumperData::create_WorldObj ()
+void
+BumperData::insert_WorldObjs (World* world)
{
- return new WorldObjs::Bumper(*this);
+ world->add_object(new WorldObjs::Bumper(*this));
}
EditorObjLst
Index: bumper_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/bumper_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bumper_data.hxx 28 Sep 2002 11:52:26 -0000 1.4
+++ bumper_data.hxx 26 Feb 2003 17:08:29 -0000 1.5
@@ -39,7 +39,7 @@
void write_xml (std::ostream& xml);
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World*);
EditorObjLst create_EditorObj ();
Index: conveyor_belt_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/conveyor_belt_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- conveyor_belt_data.cxx 18 Feb 2003 01:23:52 -0000 1.8
+++ conveyor_belt_data.cxx 26 Feb 2003 17:08:29 -0000 1.9
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "../world.hxx"
#include "../xml_file_reader.hxx"
#include "../xml_file_writer.hxx"
#include "../editorobjs/conveyor_belt_obj.hxx"
@@ -63,10 +64,10 @@
writer.end_section();
}
-WorldObj*
-ConveyorBeltData::create_WorldObj ()
+void
+ConveyorBeltData::insert_WorldObjs (World* world)
{
- return new WorldObjs::ConveyorBelt(*this);
+ world->add_object(new WorldObjs::ConveyorBelt(*this));
}
EditorObjLst
Index: conveyor_belt_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/conveyor_belt_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- conveyor_belt_data.hxx 27 Jan 2003 22:14:52 -0000 1.5
+++ conveyor_belt_data.hxx 26 Feb 2003 17:08:29 -0000 1.6
@@ -44,7 +44,7 @@
void write_xml (std::ostream& xml);
/** Create an WorldObj from the given data object */
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World* world);
/** Create an EditorObj from the given data object */
EditorObjLst create_EditorObj ();
Index: entrance_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/entrance_data.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- entrance_data.cxx 19 Feb 2003 17:17:01 -0000 1.5
+++ entrance_data.cxx 26 Feb 2003 17:08:29 -0000 1.6
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "../world.hxx"
#include "../editorobjs/entrance_obj.hxx"
#include "../worldobjs/entrances/woodthing.hxx"
#include "../worldobjs/entrances/cloud.hxx"
@@ -103,19 +104,17 @@
<< std::endl;
}
-WorldObj*
-EntranceData::create_WorldObj ()
+void
+EntranceData::insert_WorldObjs (World* world)
{
if (type == "generic") {
- return new WorldObjs::Entrance(*this);
+ world->add_object(new WorldObjs::Entrance(*this));
} else if (type == "woodthing") {
- return new WorldObjs::Entrances::WoodThing(*this);
+ world->add_object(new WorldObjs::Entrances::WoodThing(*this));
} else if (type == "cloud") {
- return new WorldObjs::Entrances::Cloud(*this);
- } else {
- PingusError::raise("Entrance: Entrance type in Level file is unknown: " +
type);
- return 0; // never reached
+ world->add_object(new WorldObjs::Entrances::Cloud(*this));
}
+ //PingusError::raise("Entrance: Entrance type in Level file is unknown: " +
type);
}
EditorObjLst
Index: entrance_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/entrance_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- entrance_data.hxx 28 Sep 2002 11:52:26 -0000 1.2
+++ entrance_data.hxx 26 Feb 2003 17:08:29 -0000 1.3
@@ -50,7 +50,7 @@
void write_xml (std::ostream&);
EditorObjLst create_EditorObj ();
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World*);
private:
EntranceData& operator= (const EntranceData& old);
Index: exit_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/exit_data.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exit_data.cxx 18 Feb 2003 01:23:52 -0000 1.5
+++ exit_data.cxx 26 Feb 2003 17:08:29 -0000 1.6
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "../world.hxx"
#include "../string_converter.hxx"
#include "../xml_helper.hxx"
#include "../xml_file_reader.hxx"
@@ -70,10 +71,10 @@
<< std::endl;
}
-WorldObj*
-ExitData::create_WorldObj ()
+void
+ExitData::insert_WorldObjs (World* world)
{
- return new WorldObjs::Exit(*this);
+ world->add_object(new WorldObjs::Exit(*this));
}
EditorObjLst
Index: exit_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/exit_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exit_data.hxx 28 Sep 2002 11:52:26 -0000 1.2
+++ exit_data.hxx 26 Feb 2003 17:08:29 -0000 1.3
@@ -49,7 +49,7 @@
void write_xml (std::ostream&);
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World*);
EditorObjLst create_EditorObj ();
private:
Index: fake_exit_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/fake_exit_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fake_exit_data.cxx 18 Feb 2003 10:14:52 -0000 1.8
+++ fake_exit_data.cxx 26 Feb 2003 17:08:29 -0000 1.9
@@ -19,6 +19,7 @@
#include <iostream>
#include "fake_exit_data.hxx"
+#include "../world.hxx"
#include "../xml_helper.hxx"
#include "../xml_file_reader.hxx"
#include "../editorobjs/fake_exit_obj.hxx"
@@ -51,10 +52,10 @@
xml << "</worldobj>\n\n";
}
-WorldObj*
-FakeExitData::create_WorldObj ()
+void
+FakeExitData::insert_WorldObjs (World* world)
{
- return new WorldObjs::FakeExit(*this);
+ world->add_object(new WorldObjs::FakeExit(*this));
}
EditorObjLst
Index: fake_exit_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/fake_exit_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fake_exit_data.hxx 28 Sep 2002 11:52:26 -0000 1.4
+++ fake_exit_data.hxx 26 Feb 2003 17:08:29 -0000 1.5
@@ -41,7 +41,7 @@
void write_xml (std::ostream& xml);
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World*);
EditorObjLst create_EditorObj ();
Index: groundpiece_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/groundpiece_data.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- groundpiece_data.cxx 18 Feb 2003 22:03:39 -0000 1.13
+++ groundpiece_data.cxx 26 Feb 2003 17:08:29 -0000 1.14
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "../world.hxx"
#include "../xml_file_reader.hxx"
#include "../editorobjs/groundpiece_obj.hxx"
#include "../worldobjs/groundpiece.hxx"
@@ -88,10 +89,10 @@
return EditorObjLst(1, new EditorObjs::GroundpieceObj(*this));
}
-WorldObj*
-GroundpieceData::create_WorldObj ()
+void
+GroundpieceData::insert_WorldObjs (World* world)
{
- return new WorldObjs::Groundpiece(*this);
+ world->add_object(new WorldObjs::Groundpiece(*this));
}
void
Index: groundpiece_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/groundpiece_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- groundpiece_data.hxx 20 Dec 2002 18:45:41 -0000 1.4
+++ groundpiece_data.hxx 26 Feb 2003 17:08:29 -0000 1.5
@@ -49,7 +49,7 @@
~GroundpieceData ();
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World*);
EditorObjLst create_EditorObj ();
void write_xml (std::ostream& xml);
Index: guillotine_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/guillotine_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- guillotine_data.cxx 18 Feb 2003 01:23:52 -0000 1.8
+++ guillotine_data.cxx 26 Feb 2003 17:08:29 -0000 1.9
@@ -19,6 +19,7 @@
#include <iostream>
#include "guillotine_data.hxx"
+#include "../world.hxx"
#include "../xml_helper.hxx"
#include "../xml_file_reader.hxx"
#include "../editorobjs/guillotine_obj.hxx"
@@ -57,10 +58,10 @@
xml << "</worldobj>\n\n";
}
-WorldObj*
-GuillotineData::create_WorldObj ()
+void
+GuillotineData::insert_WorldObjs (World* world)
{
- return new WorldObjs::Guillotine(*this);
+ world->add_object(new WorldObjs::Guillotine(*this));
}
EditorObjLst
Index: guillotine_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/guillotine_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- guillotine_data.hxx 28 Sep 2002 11:52:26 -0000 1.4
+++ guillotine_data.hxx 26 Feb 2003 17:08:29 -0000 1.5
@@ -45,7 +45,7 @@
void write_xml (std::ostream& xml);
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World*);
EditorObjLst create_EditorObj ();
Index: hammer_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hammer_data.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hammer_data.cxx 18 Feb 2003 01:23:52 -0000 1.9
+++ hammer_data.cxx 26 Feb 2003 17:08:29 -0000 1.10
@@ -51,10 +51,10 @@
xml << "</worldobj>\n\n";
}
-WorldObj*
-HammerData::create_WorldObj ()
+void
+HammerData::insert_WorldObjs (World* world)
{
- return new WorldObjs::Hammer(*this);
+ world->add_object(new WorldObjs::Hammer(*this));
}
EditorObjLst
Index: hammer_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hammer_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hammer_data.hxx 1 Oct 2002 23:40:19 -0000 1.5
+++ hammer_data.hxx 26 Feb 2003 17:08:29 -0000 1.6
@@ -20,8 +20,9 @@
#ifndef HEADER_PINGUS_WORLDOBJSDATA_HAMMER_DATA_HXX
#define HEADER_PINGUS_WORLDOBJSDATA_HAMMER_DATA_HXX
-#include "../vector.hxx"
#include <ClanLib/Display/Display/surface.h>
+#include "../vector.hxx"
+#include "../world.hxx"
#include "../game_counter.hxx"
#include "../libxmlfwd.hxx"
#include "../worldobj_data.hxx"
@@ -39,7 +40,7 @@
void write_xml (std::ostream& xml);
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World* world);
EditorObjLst create_EditorObj ();
Index: hotspot_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hotspot_data.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hotspot_data.cxx 18 Feb 2003 01:23:52 -0000 1.4
+++ hotspot_data.cxx 26 Feb 2003 17:08:29 -0000 1.5
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "../world.hxx"
#include "../editorobjs/hotspot_obj.hxx"
#include "../worldobjs/hotspot.hxx"
#include "../xml_helper.hxx"
@@ -58,10 +59,10 @@
{
}
-WorldObj*
-HotspotData::create_WorldObj ()
+void
+HotspotData::insert_WorldObjs (World* world)
{
- return new WorldObjs::Hotspot(*this);
+ world->add_object(new WorldObjs::Hotspot(*this));
}
EditorObjLst
Index: hotspot_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hotspot_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hotspot_data.hxx 28 Nov 2002 20:09:54 -0000 1.4
+++ hotspot_data.hxx 26 Feb 2003 17:08:29 -0000 1.5
@@ -43,7 +43,7 @@
void write_xml (std::ostream&);
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World*);
EditorObjLst create_EditorObj ();
private:
Index: ice_block_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/ice_block_data.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ice_block_data.cxx 18 Feb 2003 10:14:52 -0000 1.7
+++ ice_block_data.cxx 26 Feb 2003 17:08:29 -0000 1.8
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "../world.hxx"
#include "../xml_file_reader.hxx"
#include "../xml_helper.hxx"
#include "../editorobjs/ice_block_obj.hxx"
@@ -54,10 +55,10 @@
<< " </worldobj>\n" << std::endl;
}
-WorldObj*
-IceBlockData::create_WorldObj ()
+void
+IceBlockData::insert_WorldObjs (World* world)
{
- return new WorldObjs::IceBlock(*this);
+ world->add_object(new WorldObjs::IceBlock(*this));
}
EditorObjLst
Index: ice_block_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/ice_block_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ice_block_data.hxx 28 Sep 2002 11:52:27 -0000 1.4
+++ ice_block_data.hxx 26 Feb 2003 17:08:29 -0000 1.5
@@ -44,7 +44,7 @@
void write_xml (std::ostream& xml);
/** Create an WorldObj from the given data object */
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World* world);
/** Create an EditorObj from the given data object */
EditorObjLst create_EditorObj ();
Index: info_box_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/info_box_data.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- info_box_data.cxx 18 Feb 2003 10:14:52 -0000 1.9
+++ info_box_data.cxx 26 Feb 2003 17:08:29 -0000 1.10
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "../world.hxx"
#include "../xml_file_reader.hxx"
#include "../xml_helper.hxx"
#include "../editorobjs/info_box_obj.hxx"
@@ -34,10 +35,10 @@
{
}
-WorldObj*
-InfoBoxData::create_WorldObj ()
+void
+InfoBoxData::insert_WorldObjs (World* world)
{
- return new WorldObjs::InfoBox(*this);
+ world->add_object(new WorldObjs::InfoBox(*this));
}
EditorObjLst
Index: info_box_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/info_box_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- info_box_data.hxx 28 Sep 2002 11:52:27 -0000 1.4
+++ info_box_data.hxx 26 Feb 2003 17:08:29 -0000 1.5
@@ -47,7 +47,7 @@
void write_xml (std::ostream& xml);
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World* world);
EditorObjLst create_EditorObj ();
private:
Index: laser_exit_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/laser_exit_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- laser_exit_data.cxx 18 Feb 2003 01:23:52 -0000 1.8
+++ laser_exit_data.cxx 26 Feb 2003 17:08:29 -0000 1.9
@@ -19,6 +19,7 @@
#include <iostream>
#include "laser_exit_data.hxx"
+#include "../world.hxx"
#include "../xml_helper.hxx"
#include "../xml_file_reader.hxx"
#include "../editorobjs/laser_exit_obj.hxx"
@@ -51,10 +52,10 @@
xml << "</worldobj>\n\n";
}
-WorldObj*
-LaserExitData::create_WorldObj ()
+void
+LaserExitData::insert_WorldObjs (World* world)
{
- return new WorldObjs::LaserExit(*this);
+ world->add_object(new WorldObjs::LaserExit(*this));
}
EditorObjLst
Index: laser_exit_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/laser_exit_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- laser_exit_data.hxx 28 Sep 2002 11:52:27 -0000 1.4
+++ laser_exit_data.hxx 26 Feb 2003 17:08:29 -0000 1.5
@@ -20,8 +20,8 @@
#ifndef HEADER_PINGUS_WORLDOBJSDATA_LASER_EXIT_DATA_HXX
#define HEADER_PINGUS_WORLDOBJSDATA_LASER_EXIT_DATA_HXX
-#include "../vector.hxx"
#include <ClanLib/Display/Display/surface.h>
+#include "../vector.hxx"
#include "../game_counter.hxx"
#include "../libxmlfwd.hxx"
#include "../worldobj_data.hxx"
@@ -41,7 +41,7 @@
void write_xml (std::ostream& xml);
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World*);
EditorObjLst create_EditorObj ();
Index: liquid_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/liquid_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- liquid_data.cxx 19 Feb 2003 17:17:01 -0000 1.8
+++ liquid_data.cxx 26 Feb 2003 17:08:29 -0000 1.9
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "../world.hxx"
#include "../editorobjs/liquid_obj.hxx"
#include "../worldobjs/liquid.hxx"
#include "../string_converter.hxx"
@@ -74,10 +75,10 @@
<< "</liquid>\n" << std::endl;
}
-WorldObj*
-LiquidData::create_WorldObj ()
+void
+LiquidData::insert_WorldObjs (World* world)
{
- return new WorldObjs::Liquid(*this);
+ world->add_object(new WorldObjs::Liquid(*this));
}
EditorObjLst
Index: liquid_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/liquid_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- liquid_data.hxx 18 Feb 2003 17:04:13 -0000 1.4
+++ liquid_data.hxx 26 Feb 2003 17:08:29 -0000 1.5
@@ -21,6 +21,7 @@
#define HEADER_PINGUS_WORLDOBJSDATA_LIQUID_DATA_HXX
#include "../vector.hxx"
+#include "../world.hxx"
#include "../libxmlfwd.hxx"
#include "../res_descriptor.hxx"
#include "../worldobj_data.hxx"
@@ -49,7 +50,7 @@
void write_xml(std::ostream&);
/** Create an WorldObj from the given data object */
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World* world);
/** Create an EditorObj from the given data object */
EditorObjLst create_EditorObj ();
Index: prefab_obj_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/prefab_obj_data.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- prefab_obj_data.cxx 18 Feb 2003 10:14:52 -0000 1.6
+++ prefab_obj_data.cxx 26 Feb 2003 17:08:29 -0000 1.7
@@ -40,10 +40,9 @@
data = Prefab::create (uid);
}
-WorldObj*
-PrefabObjData::create_WorldObj ()
+void
+PrefabObjData::insert_WorldObjs ()
{
- return 0; //data->create_EditorObj ();
}
EditorObjLst
Index: prefab_obj_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/prefab_obj_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- prefab_obj_data.hxx 28 Sep 2002 11:52:27 -0000 1.4
+++ prefab_obj_data.hxx 26 Feb 2003 17:08:29 -0000 1.5
@@ -56,7 +56,7 @@
/** The PrefabData is flattened to a WorldObjGroup, the World
doesn't need to keep track of prefabs */
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs ();
/** Create a EditorObjs::PrefabObj from the prefab data */
EditorObjLst create_EditorObj ();
Index: rain_generator_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/rain_generator_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rain_generator_data.cxx 16 Sep 2002 17:17:17 -0000 1.3
+++ rain_generator_data.cxx 26 Feb 2003 17:08:29 -0000 1.4
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <fstream>
+#include "../world.hxx"
#include "../editor/weather_obj.hxx"
#include "../worldobjs/rain_generator.hxx"
#include "rain_generator_data.hxx"
@@ -30,10 +31,10 @@
xml << "<worldobj type=\"rain-generator\"/>" << std::endl;
}
-WorldObj*
-RainGeneratorData::create_WorldObj ()
+void
+RainGeneratorData::insert_WorldObjs (World* world)
{
- return new WorldObjs::RainGenerator();
+ world->add_object(new WorldObjs::RainGenerator());
}
EditorObjLst
Index: rain_generator_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/rain_generator_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rain_generator_data.hxx 12 Oct 2002 00:49:11 -0000 1.3
+++ rain_generator_data.hxx 26 Feb 2003 17:08:29 -0000 1.4
@@ -32,7 +32,7 @@
public:
RainGeneratorData(xmlDocPtr doc, xmlNodePtr cur) { UNUSED_ARG(doc);
UNUSED_ARG(cur); }
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World* world);
EditorObjLst create_EditorObj ();
void write_xml(std::ostream& xml);
Index: smasher_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/smasher_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- smasher_data.cxx 18 Feb 2003 01:23:52 -0000 1.8
+++ smasher_data.cxx 26 Feb 2003 17:08:29 -0000 1.9
@@ -19,6 +19,7 @@
#include <iostream>
#include "smasher_data.hxx"
+#include "../world.hxx"
#include "../xml_helper.hxx"
#include "../xml_file_reader.hxx"
#include "../editorobjs/smasher_obj.hxx"
@@ -51,10 +52,10 @@
xml << "</worldobj>\n\n";
}
-WorldObj*
-SmasherData::create_WorldObj ()
+void
+SmasherData::insert_WorldObjs (World* world)
{
- return new WorldObjs::Smasher(*this);
+ world->add_object(new WorldObjs::Smasher(*this));
}
EditorObjLst
Index: smasher_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/smasher_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- smasher_data.hxx 28 Sep 2002 11:52:27 -0000 1.4
+++ smasher_data.hxx 26 Feb 2003 17:08:29 -0000 1.5
@@ -39,7 +39,7 @@
void write_xml (std::ostream& xml);
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World*);
EditorObjLst create_EditorObj ();
Index: snow_generator_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/snow_generator_data.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- snow_generator_data.cxx 19 Feb 2003 17:17:01 -0000 1.5
+++ snow_generator_data.cxx 26 Feb 2003 17:08:29 -0000 1.6
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "../world.hxx"
#include "../xml_file_reader.hxx"
#include "../editor/weather_obj.hxx"
#include "../worldobjs/snow_generator.hxx"
@@ -27,6 +28,8 @@
SnowGeneratorData::SnowGeneratorData(xmlDocPtr doc, xmlNodePtr cur)
{
+ intensity = 1.0f;
+
XMLFileReader reader(doc, cur);
reader.read_float("intensity", intensity);
}
@@ -40,10 +43,10 @@
<< std::endl;
}
-WorldObj*
-SnowGeneratorData::create_WorldObj ()
+void
+SnowGeneratorData::insert_WorldObjs (World* world)
{
- return new WorldObjs::SnowGenerator(*this);
+ world->add_object(new WorldObjs::SnowGenerator(*this));
}
EditorObjLst
Index: snow_generator_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/snow_generator_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- snow_generator_data.hxx 19 Feb 2003 17:17:01 -0000 1.6
+++ snow_generator_data.hxx 26 Feb 2003 17:08:29 -0000 1.7
@@ -33,7 +33,7 @@
public:
SnowGeneratorData(xmlDocPtr doc, xmlNodePtr cur);
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World* world);
EditorObjLst create_EditorObj ();
void write_xml(std::ostream& xml);
Index: solid_color_background_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/solid_color_background_data.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- solid_color_background_data.cxx 18 Feb 2003 01:23:52 -0000 1.4
+++ solid_color_background_data.cxx 26 Feb 2003 17:08:29 -0000 1.5
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "../world.hxx"
#include "../xml_file_reader.hxx"
#include "../xml_file_writer.hxx"
#include "../editorobjs/solid_color_background_obj.hxx"
@@ -48,10 +49,10 @@
writer.end_section();
}
-WorldObj*
-SolidColorBackgroundData::create_WorldObj ()
+void
+SolidColorBackgroundData::insert_WorldObjs (World* world)
{
- return new WorldObjs::SolidColorBackground(*this);
+ world->add_object(new WorldObjs::SolidColorBackground(*this));
}
EditorObjLst
Index: solid_color_background_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/solid_color_background_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- solid_color_background_data.hxx 28 Sep 2002 11:52:27 -0000 1.3
+++ solid_color_background_data.hxx 26 Feb 2003 17:08:29 -0000 1.4
@@ -45,7 +45,7 @@
stream */
virtual void write_xml (std::ostream& xml);
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World* world);
EditorObjLst create_EditorObj ();
private:
Index: spike_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/spike_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- spike_data.cxx 18 Feb 2003 01:23:52 -0000 1.8
+++ spike_data.cxx 26 Feb 2003 17:08:30 -0000 1.9
@@ -19,6 +19,7 @@
#include <iostream>
#include "spike_data.hxx"
+#include "../world.hxx"
#include "../xml_helper.hxx"
#include "../xml_file_reader.hxx"
#include "../editorobjs/spike_obj.hxx"
@@ -52,10 +53,10 @@
xml << "</worldobj>\n\n";
}
-WorldObj*
-SpikeData::create_WorldObj ()
+void
+SpikeData::insert_WorldObjs (World* world)
{
- return new WorldObjs::Spike(*this);
+ world->add_object(new WorldObjs::Spike(*this));
}
EditorObjLst
Index: spike_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/spike_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- spike_data.hxx 18 Feb 2003 01:23:52 -0000 1.5
+++ spike_data.hxx 26 Feb 2003 17:08:30 -0000 1.6
@@ -42,7 +42,7 @@
void write_xml (std::ostream& xml);
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World*);
EditorObjLst create_EditorObj ();
Index: starfield_background_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/starfield_background_data.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- starfield_background_data.cxx 18 Feb 2003 01:23:52 -0000 1.6
+++ starfield_background_data.cxx 26 Feb 2003 17:08:30 -0000 1.7
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "../world.hxx"
#include "../xml_file_reader.hxx"
#include "../editorobjs/starfield_background_obj.hxx"
#include "../worldobjs/starfield_background.hxx"
@@ -64,10 +65,10 @@
<< std::endl;
}
-WorldObj*
-StarfieldBackgroundData::create_WorldObj ()
+void
+StarfieldBackgroundData::insert_WorldObjs (World* world)
{
- return new WorldObjs::StarfieldBackground(*this);
+ world->add_object(new WorldObjs::StarfieldBackground(*this));
}
EditorObjLst
Index: starfield_background_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/starfield_background_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- starfield_background_data.hxx 27 Sep 2002 11:26:49 -0000 1.2
+++ starfield_background_data.hxx 26 Feb 2003 17:08:30 -0000 1.3
@@ -38,7 +38,7 @@
void write_xml (std::ostream& xml);
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World*);
EditorObjLst create_EditorObj ();
private:
Index: surface_background_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/surface_background_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- surface_background_data.cxx 18 Feb 2003 18:50:24 -0000 1.8
+++ surface_background_data.cxx 26 Feb 2003 17:08:30 -0000 1.9
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "../world.hxx"
#include "../xml_helper.hxx"
#include "../xml_file_reader.hxx"
#include "../editorobjs/surface_background_obj.hxx"
@@ -101,10 +102,10 @@
reader.read_bool("keep-aspect", keep_aspect);
}
-WorldObj*
-SurfaceBackgroundData::create_WorldObj ()
+void
+SurfaceBackgroundData::insert_WorldObjs (World* world)
{
- return new WorldObjs::SurfaceBackground(*this);
+ world->add_object(new WorldObjs::SurfaceBackground(*this));
}
EditorObjLst
Index: surface_background_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/surface_background_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- surface_background_data.hxx 18 Feb 2003 17:04:13 -0000 1.4
+++ surface_background_data.hxx 26 Feb 2003 17:08:30 -0000 1.5
@@ -75,7 +75,7 @@
stream */
void write_xml (std::ostream& xml);
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World* world);
EditorObjLst create_EditorObj ();
private:
Index: switch_door_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/switch_door_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- switch_door_data.cxx 18 Feb 2003 10:14:52 -0000 1.8
+++ switch_door_data.cxx 26 Feb 2003 17:08:30 -0000 1.9
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "../world.hxx"
#include "../xml_file_reader.hxx"
#include "../xml_helper.hxx"
#include "../editorobjs/switch_door_obj.hxx"
@@ -67,10 +68,10 @@
}
/** Create an WorldObj from the given data object */
-WorldObj*
-SwitchDoorData::create_WorldObj ()
+void
+SwitchDoorData::insert_WorldObjs (World* world)
{
- return new WorldObjs::SwitchDoor(*this);
+ world->add_object(new WorldObjs::SwitchDoor(*this));
}
/** Create an EditorObj from the given data object */
Index: switch_door_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/switch_door_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- switch_door_data.hxx 28 Sep 2002 11:52:27 -0000 1.4
+++ switch_door_data.hxx 26 Feb 2003 17:08:30 -0000 1.5
@@ -49,7 +49,7 @@
void write_xml (std::ostream& xml);
/** Create an WorldObj from the given data object */
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World* world);
/** Create an EditorObj from the given data object */
EditorObjLst create_EditorObj ();
Index: teleporter_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/teleporter_data.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- teleporter_data.cxx 18 Feb 2003 17:04:13 -0000 1.9
+++ teleporter_data.cxx 26 Feb 2003 17:08:30 -0000 1.10
@@ -19,6 +19,7 @@
#include <iostream>
#include "teleporter_data.hxx"
+#include "../world.hxx"
#include "../xml_helper.hxx"
#include "../xml_file_reader.hxx"
#include "../editorobjs/teleporter_obj.hxx"
@@ -59,10 +60,10 @@
subreader.read_vector("position", target_pos);
}
-WorldObj*
-TeleporterData::create_WorldObj ()
+void
+TeleporterData::insert_WorldObjs (World* world)
{
- return new WorldObjs::Teleporter(*this);
+ world->add_object(new WorldObjs::Teleporter(*this));
}
EditorObjLst
Index: teleporter_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/teleporter_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- teleporter_data.hxx 7 Oct 2002 23:04:14 -0000 1.4
+++ teleporter_data.hxx 26 Feb 2003 17:08:30 -0000 1.5
@@ -42,7 +42,7 @@
void write_xml (std::ostream& xml);
/** Create an WorldObj from the given data object */
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World*);
/** Create an EditorObj from the given data object */
EditorObjLst create_EditorObj ();
Index: thunderstorm_background_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/thunderstorm_background_data.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- thunderstorm_background_data.cxx 18 Feb 2003 01:23:52 -0000 1.4
+++ thunderstorm_background_data.cxx 26 Feb 2003 17:08:30 -0000 1.5
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "../world.hxx"
#include "../xml_helper.hxx"
#include "../xml_file_reader.hxx"
#include "../editorobjs/thunderstorm_background_obj.hxx"
@@ -45,10 +46,10 @@
reader.read_vector("position", pos);
}
-WorldObj*
-ThunderstormBackgroundData::create_WorldObj ()
+void
+ThunderstormBackgroundData::insert_WorldObjs (World* world)
{
- return new WorldObjs::ThunderstormBackground(*this);
+ world->add_object(new WorldObjs::ThunderstormBackground(*this));
}
EditorObjLst
Index: thunderstorm_background_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/thunderstorm_background_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- thunderstorm_background_data.hxx 28 Sep 2002 11:52:27 -0000 1.3
+++ thunderstorm_background_data.hxx 26 Feb 2003 17:08:30 -0000 1.4
@@ -41,7 +41,7 @@
stream */
virtual void write_xml (std::ostream& xml);
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World* world);
EditorObjLst create_EditorObj ();
private:
Index: worldobj_group_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/worldobj_group_data.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- worldobj_group_data.cxx 28 Sep 2002 11:52:27 -0000 1.6
+++ worldobj_group_data.cxx 26 Feb 2003 17:08:30 -0000 1.7
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "../world.hxx"
#include "../editor/editorobj_group.hxx"
#include "../xml_helper.hxx"
#include "../worldobj_data_factory.hxx"
@@ -79,10 +80,10 @@
xml << "</group>\n\n";
}
-WorldObj*
-WorldObjGroupData::create_WorldObj ()
+void
+WorldObjGroupData::insert_WorldObjs (World* world)
{
- return new WorldObjs::WorldObjGroup (*this);
+ world->add_object(new WorldObjs::WorldObjGroup (*this));
}
EditorObjLst
Index: worldobj_group_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/worldobj_group_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- worldobj_group_data.hxx 27 Sep 2002 11:26:49 -0000 1.4
+++ worldobj_group_data.hxx 26 Feb 2003 17:08:30 -0000 1.5
@@ -44,7 +44,7 @@
void write_xml (std::ostream& xml);
/** Create an WorldObj from the given data object */
- WorldObj* create_WorldObj ();
+ void insert_WorldObjs (World*);
/** Create an EditorObj from the given data object */
EditorObjLst create_EditorObj ();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata bumper_data.cxx,1.8,1.9 bumper_data.hxx,1.4,1.5 conveyor_belt_data.cxx,1.8,1.9 conveyor_belt_data.hxx,1.5,1.6 entrance_data.cxx,1.5,1.6 entrance_data.hxx,1.2,1.3 exit_data.cxx,1.5,1.6 exit_data.hxx,1.2,1.3 fake_exit_data.cxx,1.8,1.9 fake_exit_data.hxx,1.4,1.5 groundpiece_data.cxx,1.13,1.14 groundpiece_data.hxx,1.4,1.5 guillotine_data.cxx,1.8,1.9 guillotine_data.hxx,1.4,1.5 hammer_data.cxx,1.9,1.10 hammer_data.hxx,1.5,1.6 hotspot_data.cxx,1.4,1.5 hotspot_data.hxx,1.4,1.5 ice_block_data.cxx,1.7,1.8 ice_block_data.hxx,1.4,1.5 info_box_data.cxx,1.9,1.10 info_box_data.hxx,1.4,1.5 laser_exit_data.cxx,1.8,1.9 laser_exit_data.hxx,1.4,1.5 liquid_data.cxx,1.8,1.9 liquid_data.hxx,1.4,1.5 prefab_obj_data.cxx,1.6,1.7 prefab_obj_data.hxx,1.4,1.5 rain_generator_data.cxx,1.3,1.4 rain_generator_data.hxx,1.3,1.4 smasher_data.cxx,1.8,1.9 smasher_data.hxx,1.4,1.5 snow_generator_data.cxx,1.5,1.6 snow_generator_data.hxx,1.6,1.7solid_color_background_data.cxx,1.4,1.5 solid_color_background_data.hxx,1.3,1.4 spike_data.cxx,1.8,1.9 spike_data.hxx,1.5,1.6 starfield_background_data.cxx,1.6,1.7 starfield_background_data.hxx,1.2,1.3surface_background_data.cxx,1.8,1.9 surface_background_data.hxx,1.4,1.5 switch_door_data.cxx,1.8,1.9 switch_door_data.hxx,1.4,1.5 teleporter_data.cxx,1.9,1.10 teleporter_data.hxx,1.4,1.5thunderstorm_background_data.cxx,1.4,1.5 thunderstorm_background_data.hxx,1.3,1.4 worldobj_group_data.cxx,1.6,1.7 worldobj_group_data.hxx,1.4,1.5,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src game_session.cxx,1.27,1.28 smallmap.cxx,1.31,1.32 world.cxx,1.38,1.39 world.hxx,1.24,1.25 worldobj_data.hxx,1.7,1.8
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/data/images/groundpieces/ground/green piece2.png,1.1,1.2
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src game_session.cxx,1.27,1.28 smallmap.cxx,1.31,1.32 world.cxx,1.38,1.39 world.hxx,1.24,1.25 worldobj_data.hxx,1.7,1.8
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/data/images/groundpieces/ground/green piece2.png,1.1,1.2
- Index(es):