[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.11,1.
From: |
torangan |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata bumper_data.cxx,1.11,1.12 bumper_data.hxx,1.7,1.8 conveyor_belt_data.cxx,1.11,1.12 conveyor_belt_data.hxx,1.8,1.9 entrance_data.cxx,1.8,1.9 entrance_data.hxx,1.5,1.6 exit_data.cxx,1.9,1.10 exit_data.hxx,1.5,1.6 fake_exit_data.hxx,1.7,1.8 groundpiece_data.cxx,1.17,1.18 groundpiece_data.hxx,1.7,1.8 guillotine_data.cxx,1.11,1.12 guillotine_data.hxx,1.7,1.8 hammer_data.cxx,1.12,1.13 hammer_data.hxx,1.8,1.9 hotspot_data.cxx,1.7,1.8 hotspot_data.hxx,1.7,1.8 ice_block_data.cxx,1.10,1.11 ice_block_data.hxx,1.7,1.8 info_box_data.cxx,1.12,1.13 info_box_data.hxx,1.7,1.8 laser_exit_data.hxx,1.7,1.8 liquid_data.cxx,1.13,1.14 liquid_data.hxx,1.7,1.8 prefab_obj_data.cxx,1.11,1.12 prefab_obj_data.hxx,1.8,1.9 rain_generator_data.hxx,1.6,1.7 smasher_data.hxx,1.7,1.8 snow_generator_data.hxx,1.9,1.10 solid_color_background_data.hxx,1.6,1.7 spike_data.hxx,1.8,1.9 starfield_background_data.cxx,1.9,1.10 starfield_background_data.hxx,1.5,1.6surface_background_data.cxx,1.11,1.12 surface_background_data.hxx,1.7,1.8 switch_door_data.cxx,1.11,1.12 switch_door_data.hxx,1.7,1.8 teleporter_data.cxx,1.12,1.13 teleporter_data.hxx,1.7,1.8thunderstorm_background_data.hxx,1.6,1.7 worldobj_group_data.cxx,1.11,1.12 worldobj_group_data.hxx,1.7,1.8 |
Date: |
19 Apr 2003 10:23:22 -0000 |
Update of /var/lib/cvs/Games/Pingus/src/worldobjsdata
In directory dark:/tmp/cvs-serv20737/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.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.hxx liquid_data.cxx liquid_data.hxx
prefab_obj_data.cxx prefab_obj_data.hxx
rain_generator_data.hxx smasher_data.hxx
snow_generator_data.hxx solid_color_background_data.hxx
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.hxx worldobj_group_data.cxx
worldobj_group_data.hxx
Log Message:
removed trailing whitespace
Index: bumper_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/bumper_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- bumper_data.cxx 5 Mar 2003 19:13:59 -0000 1.11
+++ bumper_data.cxx 19 Apr 2003 10:23:19 -0000 1.12
@@ -33,7 +33,7 @@
{
}
-BumperData::BumperData (xmlDocPtr doc, xmlNodePtr cur)
+BumperData::BumperData (xmlDocPtr doc, xmlNodePtr cur)
: surface(PingusResource::load_surface("Traps/bumper", "traps"))
{
XMLFileReader reader(doc, cur);
Index: bumper_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/bumper_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bumper_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
+++ bumper_data.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -31,23 +31,23 @@
public:
CL_Surface surface;
Vector pos;
-
+
public:
BumperData ();
BumperData (xmlDocPtr doc, xmlNodePtr node);
BumperData (const BumperData& old);
-
+
void write_xml (std::ostream& xml);
-
+
void insert_WorldObjs (World*);
-
+
void insert_EditorObjs (EditorNS::EditorObjMgr*);
-
+
private:
BumperData& operator= (const BumperData&);
-
+
};
-
+
} // namespace WorldObjsData
#endif
Index: conveyor_belt_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/conveyor_belt_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- conveyor_belt_data.cxx 5 Mar 2003 19:13:59 -0000 1.11
+++ conveyor_belt_data.cxx 19 Apr 2003 10:23:19 -0000 1.12
@@ -28,7 +28,7 @@
namespace WorldObjsData {
-ConveyorBeltData::ConveyorBeltData ()
+ConveyorBeltData::ConveyorBeltData ()
: width(5),
speed(2),
counter(0)
@@ -54,7 +54,7 @@
/** Writte the content of this object formated as xml to the given
stream */
-void
+void
ConveyorBeltData::write_xml (std::ostream& xml)
{
XMLFileWriter writer(xml);
@@ -65,7 +65,7 @@
writer.end_section();
}
-void
+void
ConveyorBeltData::insert_WorldObjs (World* world)
{
world->add_object(new WorldObjs::ConveyorBelt(*this));
Index: conveyor_belt_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/conveyor_belt_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- conveyor_belt_data.hxx 5 Mar 2003 19:13:59 -0000 1.8
+++ conveyor_belt_data.hxx 19 Apr 2003 10:23:19 -0000 1.9
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// 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.
@@ -37,7 +37,7 @@
ConveyorBeltData ();
ConveyorBeltData (const ConveyorBeltData& old);
ConveyorBeltData (xmlDocPtr doc, xmlNodePtr cur);
-
+
/** Write the content of this object formatted as xml to the given
stream */
@@ -48,7 +48,7 @@
/** Create an EditorObj from the given data object */
void insert_EditorObjs (EditorNS::EditorObjMgr*);
-
+
private:
ConveyorBeltData& operator= (const ConveyorBeltData&);
};
Index: entrance_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/entrance_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- entrance_data.cxx 5 Mar 2003 19:13:59 -0000 1.8
+++ entrance_data.cxx 19 Apr 2003 10:23:19 -0000 1.9
@@ -48,7 +48,7 @@
reader.read_int("owner-id", owner_id);
reader.read_vector("position", pos);
reader.read_int("release-rate", release_rate);
-
+
std::string direction_str;
reader.read_string("direction", direction_str);
@@ -76,11 +76,11 @@
{
}
-void
+void
EntranceData::write_xml (std::ostream& xml)
{
std::string dir_str;
-
+
switch(direction)
{
case EntranceData::LEFT:
@@ -102,7 +102,7 @@
<< " <release-rate>" << release_rate << "</release-rate>\n"
<< " <owner-id>" << owner_id << "</owner-id>\n"
<< "</entrance>\n"
- << std::endl;
+ << std::endl;
}
void
@@ -118,7 +118,7 @@
//PingusError::raise("Entrance: Entrance type in Level file is unknown: " +
type);
}
-void
+void
EntranceData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::EntranceObj(*this));
Index: entrance_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/entrance_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- entrance_data.hxx 5 Mar 2003 19:13:59 -0000 1.5
+++ entrance_data.hxx 19 Apr 2003 10:23:19 -0000 1.6
@@ -31,14 +31,14 @@
{
public:
enum EntranceDirection { LEFT, RIGHT, MISC };
-
+
public:
EntranceDirection direction;
ResDescriptor desc;
Vector pos;
int release_rate;
int owner_id;
-
+
/// The type of the entrance type (woodthing, generic, etc.)
std::string type;
@@ -46,7 +46,7 @@
EntranceData ();
EntranceData (xmlDocPtr doc, xmlNodePtr cur);
EntranceData (const EntranceData& old);
-
+
void write_xml (std::ostream&);
void insert_EditorObjs (EditorNS::EditorObjMgr*);
Index: exit_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/exit_data.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- exit_data.cxx 5 Mar 2003 19:13:59 -0000 1.9
+++ exit_data.cxx 19 Apr 2003 10:23:19 -0000 1.10
@@ -57,7 +57,7 @@
{
}
-void
+void
ExitData::write_xml (std::ostream& xml)
{
xml << "<exit use-old-pos-handling=\"" << use_old_pos_handling << "\">\n";
@@ -66,14 +66,14 @@
//pos.x += surf.get_width ()/2;
//pos.y += surf.get_height ();
XMLhelper::write_vector_xml(xml, pos);
-
+
XMLhelper::write_desc_xml(xml, desc);
xml << " <owner-id>" << owner_id << "</owner-id>"
<< "</exit>\n"
<< std::endl;
}
-void
+void
ExitData::insert_WorldObjs (World* world)
{
world->add_object(new WorldObjs::Exit(*this));
Index: exit_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/exit_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exit_data.hxx 5 Mar 2003 19:13:59 -0000 1.5
+++ exit_data.hxx 19 Apr 2003 10:23:19 -0000 1.6
@@ -33,7 +33,7 @@
Vector pos;
ResDescriptor desc;
int owner_id;
-
+
/** Causes the entrance handling to fall back to the old position
treatment, that means the position is treaten as the upper/left
corner of the exit surface. The new handling treats the position
@@ -44,11 +44,11 @@
public:
ExitData ();
ExitData (xmlDocPtr doc, xmlNodePtr cur);
-
+
ExitData (const ExitData& old);
void write_xml (std::ostream&);
-
+
void insert_WorldObjs (World*);
void insert_EditorObjs (EditorNS::EditorObjMgr*);
Index: fake_exit_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/fake_exit_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fake_exit_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
+++ fake_exit_data.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -33,23 +33,23 @@
CL_Surface surface;
Vector pos;
GameCounter counter;
-
+
public:
FakeExitData ();
FakeExitData (xmlDocPtr doc, xmlNodePtr node);
FakeExitData (const FakeExitData& old);
-
+
void write_xml (std::ostream& xml);
-
+
void insert_WorldObjs (World*);
-
+
void insert_EditorObjs (EditorNS::EditorObjMgr*);
-
+
private:
FakeExitData& operator= (const FakeExitData&);
-
+
};
-
+
} // namespace WorldObjsData
#endif
Index: groundpiece_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/groundpiece_data.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- groundpiece_data.cxx 1 Apr 2003 21:54:55 -0000 1.17
+++ groundpiece_data.cxx 19 Apr 2003 10:23:19 -0000 1.18
@@ -30,9 +30,9 @@
namespace WorldObjsData {
-GroundpieceData::GroundpieceData ()
+GroundpieceData::GroundpieceData ()
{
- gptype = Groundtype::GP_GROUND;
+ gptype = Groundtype::GP_GROUND;
}
GroundpieceData::GroundpieceData (xmlDocPtr doc, xmlNodePtr cur)
@@ -56,7 +56,7 @@
}
}
-GroundpieceData::GroundpieceData (const GroundpieceData& old)
+GroundpieceData::GroundpieceData (const GroundpieceData& old)
: WorldObjData(old),
surface(old.surface),
desc(old.desc),
@@ -70,14 +70,14 @@
{
if (this == &old)
return *this;
-
+
WorldObjData::operator=(old);
-
+
surface = old.surface;
desc = old.desc;
pos = old.pos;
gptype = old.gptype;
-
+
return *this;
}
@@ -106,7 +106,7 @@
xml << "</worldobj>\n" << std::endl;
}
-void
+void
GroundpieceData::serialize(FileWriter& writer)
{
writer.begin_section("groundpiece");
@@ -116,7 +116,7 @@
writer.end_section();
}
-void
+void
GroundpieceData::deserialize(FileReader& reader)
{
std::string gptype_str = "default value";
Index: groundpiece_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/groundpiece_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- groundpiece_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
+++ groundpiece_data.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// 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.
@@ -39,11 +39,11 @@
ResDescriptor desc;
Vector pos;
- Groundtype::GPType gptype;
+ Groundtype::GPType gptype;
GroundpieceData ();
GroundpieceData (xmlDocPtr doc, xmlNodePtr cur);
-
+
GroundpieceData (const GroundpieceData& old);
GroundpieceData& operator= (const GroundpieceData& old);
Index: guillotine_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/guillotine_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- guillotine_data.cxx 5 Mar 2003 19:13:59 -0000 1.11
+++ guillotine_data.cxx 19 Apr 2003 10:23:19 -0000 1.12
@@ -33,20 +33,20 @@
{
}
-GuillotineData::GuillotineData (xmlDocPtr doc, xmlNodePtr cur)
+GuillotineData::GuillotineData (xmlDocPtr doc, xmlNodePtr cur)
: surface (PingusResource::load_surface("Traps/guillotinekill", "traps")),
idle_surf(PingusResource::load_surface("Traps/guillotineidle", "traps"))
{
if (cur->name)
std::cout << reinterpret_cast<const char*>(cur->name) << std::endl;
-
+
XMLFileReader reader(doc, cur);
reader.read_vector("position", pos);
}
GuillotineData::GuillotineData (const GuillotineData& old) : WorldObjData(old),
surface(old.surface),
-
idle_surf(old.idle_surf),
+
idle_surf(old.idle_surf),
pos(old.pos)
{
}
Index: guillotine_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/guillotine_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- guillotine_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
+++ guillotine_data.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -37,23 +37,23 @@
Direction direction;
GameCounter counter;
GameCounter idle_counter;
-
+
public:
GuillotineData ();
GuillotineData (xmlDocPtr doc, xmlNodePtr node);
GuillotineData (const GuillotineData& old);
-
+
void write_xml (std::ostream& xml);
-
+
void insert_WorldObjs (World*);
-
+
void insert_EditorObjs (EditorNS::EditorObjMgr*);
-
+
private:
GuillotineData& operator= (const GuillotineData&);
-
+
};
-
+
} // namespace WorldObjsData
#endif
Index: hammer_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/hammer_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- hammer_data.cxx 5 Mar 2003 19:13:59 -0000 1.12
+++ hammer_data.cxx 19 Apr 2003 10:23:19 -0000 1.13
@@ -38,7 +38,7 @@
reader.read_vector("position", pos);
}
-HammerData::HammerData (const HammerData& old)
+HammerData::HammerData (const HammerData& old)
: WorldObjData(old),
pos(old.pos)
{
Index: hammer_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/hammer_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- hammer_data.hxx 5 Mar 2003 19:13:59 -0000 1.8
+++ hammer_data.hxx 19 Apr 2003 10:23:19 -0000 1.9
@@ -32,23 +32,23 @@
class HammerData : public WorldObjData {
public:
Vector pos;
-
+
public:
HammerData ();
HammerData (xmlDocPtr doc, xmlNodePtr node);
HammerData (const HammerData& old);
-
+
void write_xml (std::ostream& xml);
-
+
void insert_WorldObjs (World* world);
-
+
void insert_EditorObjs (EditorNS::EditorObjMgr*);
-
+
private:
HammerData& operator= (const HammerData&);
-
+
};
-
+
} // namespace WorldObjsData
#endif
Index: hotspot_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/hotspot_data.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- hotspot_data.cxx 5 Mar 2003 19:13:59 -0000 1.7
+++ hotspot_data.cxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -33,7 +33,7 @@
{
}
-void
+void
HotspotData::write_xml(std::ostream& xml)
{
xml << "<hotspot>\n";
@@ -41,7 +41,7 @@
XMLhelper::write_vector_xml(xml, pos);
xml << " <speed>" << speed << "</speed>\n"
<< " <parallax>" << para << "</parallax>\n"
- << "</hotspot>\n" << std::endl;
+ << "</hotspot>\n" << std::endl;
}
HotspotData::HotspotData (xmlDocPtr doc, xmlNodePtr cur)
@@ -61,7 +61,7 @@
{
}
-void
+void
HotspotData::insert_WorldObjs (World* world)
{
world->add_object(new WorldObjs::Hotspot(*this));
Index: hotspot_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/hotspot_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- hotspot_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
+++ hotspot_data.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -36,16 +36,16 @@
Vector pos;
HotspotData ();
-
+
HotspotData (xmlDocPtr doc, xmlNodePtr cur);
-
+
HotspotData (const HotspotData& old);
void write_xml (std::ostream&);
void insert_WorldObjs (World*);
void insert_EditorObjs (EditorNS::EditorObjMgr*);
-
+
private:
HotspotData& operator= (const HotspotData&);
};
Index: ice_block_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/ice_block_data.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ice_block_data.cxx 5 Mar 2003 19:13:59 -0000 1.10
+++ ice_block_data.cxx 19 Apr 2003 10:23:19 -0000 1.11
@@ -28,12 +28,12 @@
namespace WorldObjsData {
-IceBlockData::IceBlockData ()
+IceBlockData::IceBlockData ()
: width(1)
{
}
-IceBlockData::IceBlockData (const IceBlockData& old)
+IceBlockData::IceBlockData (const IceBlockData& old)
: WorldObjData(old),
pos(old.pos),
width(old.width)
Index: ice_block_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/ice_block_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ice_block_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
+++ ice_block_data.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// 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.
@@ -32,7 +32,7 @@
/// The upper/left position of the iceblock's
Vector pos;
- /** The number of iceblocks, only complete blocks are supported */
+ /** The number of iceblocks, only complete blocks are supported */
int width;
IceBlockData ();
@@ -42,13 +42,13 @@
/** Write the content of this object formatted as xml to the given
stream */
void write_xml (std::ostream& xml);
-
+
/** Create an WorldObj from the given data object */
void insert_WorldObjs (World* world);
/** Create an EditorObj from the given data object */
void insert_EditorObjs (EditorNS::EditorObjMgr*);
-
+
private:
IceBlockData& operator= (const IceBlockData&);
};
Index: info_box_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/info_box_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- info_box_data.cxx 5 Mar 2003 19:13:59 -0000 1.12
+++ info_box_data.cxx 19 Apr 2003 10:23:19 -0000 1.13
@@ -28,7 +28,7 @@
namespace WorldObjsData {
-InfoBoxData::InfoBoxData ()
+InfoBoxData::InfoBoxData ()
{
}
@@ -63,12 +63,12 @@
{
}
-void
+void
InfoBoxData::write_xml (std::ostream& xml)
{
xml << " <worldobj type=\"infobox\">\n";
XMLhelper::write_vector_xml (xml, pos);
- xml << " <info-text>" << info_text << "</info-text>\n"
+ xml << " <info-text>" << info_text << "</info-text>\n"
<< " </worldobj>\n" << std::endl;
}
Index: info_box_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/info_box_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- info_box_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
+++ info_box_data.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// 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.
@@ -40,16 +40,16 @@
public:
InfoBoxData ();
InfoBoxData (xmlDocPtr doc, xmlNodePtr cur);
-
+
InfoBoxData (const InfoBoxData& old);
-
+
~InfoBoxData ();
- void write_xml (std::ostream& xml);
-
+ void write_xml (std::ostream& xml);
+
void insert_WorldObjs (World* world);
void insert_EditorObjs (EditorNS::EditorObjMgr*);
-
+
private:
InfoBoxData& operator= (const InfoBoxData&);
};
Index: laser_exit_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/laser_exit_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- laser_exit_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
+++ laser_exit_data.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -33,23 +33,23 @@
CL_Surface surface;
Vector pos;
GameCounter counter;
-
+
public:
LaserExitData ();
LaserExitData (xmlDocPtr doc, xmlNodePtr node);
LaserExitData (const LaserExitData& old);
-
+
void write_xml (std::ostream& xml);
-
+
void insert_WorldObjs (World*);
-
+
void insert_EditorObjs (EditorNS::EditorObjMgr*);
-
+
private:
LaserExitData& operator= (const LaserExitData&);
-
+
};
-
+
} // namespace WorldObjsData
#endif
Index: liquid_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/liquid_data.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- liquid_data.cxx 1 Apr 2003 21:54:55 -0000 1.13
+++ liquid_data.cxx 19 Apr 2003 10:23:19 -0000 1.14
@@ -29,7 +29,7 @@
namespace WorldObjsData {
-LiquidData::LiquidData ()
+LiquidData::LiquidData ()
: old_width_handling(true),
width(0),
speed(20)
@@ -65,7 +65,7 @@
}
-void
+void
LiquidData::write_xml (std::ostream& xml)
{
xml << "<liquid use-old-width-handling=\"" << old_width_handling << "\">\n";
@@ -84,7 +84,7 @@
void
LiquidData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
-{
+{
obj_mgr->add(new EditorObjs::LiquidObj(*this));
}
Index: liquid_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/liquid_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- liquid_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
+++ liquid_data.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// 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.
@@ -36,13 +36,13 @@
/** Cause to interpret the width in pixels instead of tiles */
bool old_width_handling;
-
+
int width;
/** Number of miliseconds between frames */
int speed;
-public:
+public:
LiquidData ();
LiquidData (xmlDocPtr doc, xmlNodePtr cur);
LiquidData (const LiquidData& old);
Index: prefab_obj_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/prefab_obj_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- prefab_obj_data.cxx 5 Mar 2003 19:55:14 -0000 1.11
+++ prefab_obj_data.cxx 19 Apr 2003 10:23:19 -0000 1.12
@@ -32,7 +32,7 @@
XMLFileReader reader(doc, cur);
reader.read_vector("position", pos);
reader.read_string("type", type);
-
+
// try to load the data for this prefab-uid
data = Prefab::create (type);
if (data == 0)
Index: prefab_obj_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/prefab_obj_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- prefab_obj_data.hxx 5 Mar 2003 19:55:14 -0000 1.8
+++ prefab_obj_data.hxx 19 Apr 2003 10:23:19 -0000 1.9
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// 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.
@@ -47,7 +47,7 @@
/** The uniq identifer of this prefab */
std::string type;
-
+
/** A pointer to the prefab (just for caching, this is not real data
of this object, since it can be consturcted from the name) */
Prefab* data;
@@ -57,7 +57,7 @@
/** The PrefabData is flattened to a WorldObjGroup, the World
doesn't need to keep track of prefabs */
void insert_WorldObjs (World*);
-
+
/** Create a EditorObjs::PrefabObj from the prefab data */
void insert_EditorObjs (EditorNS::EditorObjMgr*);
Index: rain_generator_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/rain_generator_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rain_generator_data.hxx 5 Mar 2003 19:13:59 -0000 1.6
+++ rain_generator_data.hxx 19 Apr 2003 10:23:19 -0000 1.7
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2002 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// 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.
Index: smasher_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/smasher_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- smasher_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
+++ smasher_data.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -31,23 +31,23 @@
public:
CL_Surface surface;
Vector pos;
-
+
public:
SmasherData ();
SmasherData (xmlDocPtr doc, xmlNodePtr node);
SmasherData (const SmasherData& old);
-
+
void write_xml (std::ostream& xml);
-
+
void insert_WorldObjs (World*);
-
+
void insert_EditorObjs (EditorNS::EditorObjMgr*);
-
+
private:
SmasherData& operator= (const SmasherData&);
-
+
};
-
+
} // namespace WorldObjsData
#endif
Index: snow_generator_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/snow_generator_data.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- snow_generator_data.hxx 5 Mar 2003 19:13:59 -0000 1.9
+++ snow_generator_data.hxx 19 Apr 2003 10:23:19 -0000 1.10
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2002 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// 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.
@@ -32,7 +32,7 @@
float intensity;
public:
SnowGeneratorData(xmlDocPtr doc, xmlNodePtr cur);
-
+
void insert_WorldObjs (World* world);
void insert_EditorObjs (EditorNS::EditorObjMgr*);
Index: solid_color_background_data.hxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/worldobjsdata/solid_color_background_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- solid_color_background_data.hxx 5 Mar 2003 19:13:59 -0000 1.6
+++ solid_color_background_data.hxx 19 Apr 2003 10:23:19 -0000 1.7
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// 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.
Index: spike_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/spike_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- spike_data.hxx 5 Mar 2003 19:13:59 -0000 1.8
+++ spike_data.hxx 19 Apr 2003 10:23:19 -0000 1.9
@@ -28,29 +28,29 @@
namespace WorldObjsData {
-class SpikeData : public WorldObjData
+class SpikeData : public WorldObjData
{
public:
CL_Surface surface;
Vector pos;
GameCounter counter;
-
+
public:
SpikeData ();
SpikeData (xmlDocPtr doc, xmlNodePtr node);
SpikeData (const SpikeData& old);
-
+
void write_xml (std::ostream& xml);
-
+
void insert_WorldObjs (World*);
-
+
void insert_EditorObjs (EditorNS::EditorObjMgr*);
-
+
private:
SpikeData& operator= (const SpikeData&);
-
+
};
-
+
} // namespace WorldObjsData
#endif
Index: starfield_background_data.cxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/worldobjsdata/starfield_background_data.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- starfield_background_data.cxx 5 Mar 2003 19:13:59 -0000 1.9
+++ starfield_background_data.cxx 19 Apr 2003 10:23:19 -0000 1.10
@@ -41,7 +41,7 @@
large_stars_count(old. large_stars_count)
{
}
-
+
StarfieldBackgroundData::StarfieldBackgroundData (xmlDocPtr doc, xmlNodePtr
cur)
{
small_stars_count = 100;
@@ -55,7 +55,7 @@
reader.read_int("large-stars", large_stars_count);
}
-void
+void
StarfieldBackgroundData::write_xml(std::ostream& xml)
{
xml << "<background type=\"starfield\">\n"
Index: starfield_background_data.hxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/worldobjsdata/starfield_background_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- starfield_background_data.hxx 5 Mar 2003 19:13:59 -0000 1.5
+++ starfield_background_data.hxx 19 Apr 2003 10:23:19 -0000 1.6
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// 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.
Index: surface_background_data.cxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/worldobjsdata/surface_background_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- surface_background_data.cxx 5 Mar 2003 19:13:59 -0000 1.11
+++ surface_background_data.cxx 19 Apr 2003 10:23:19 -0000 1.12
@@ -41,7 +41,7 @@
{
}
-SurfaceBackgroundData::SurfaceBackgroundData (const SurfaceBackgroundData&
old)
+SurfaceBackgroundData::SurfaceBackgroundData (const SurfaceBackgroundData& old)
: WorldObjData(old),
desc(old.desc),
para_x(old.para_x),
@@ -61,7 +61,7 @@
{
xml << "<background type=\"surface\">\n";
XMLhelper::write_desc_xml(xml, desc);
-
+
xml << " <color>\n"
<< " <red>" << color.red << "</red>\n"
<< " <green>" << color.green << "</green>\n"
@@ -96,7 +96,7 @@
reader.read_float("scroll-x", scroll_x);
reader.read_float("scroll-y", scroll_y);
-
+
reader.read_bool("stretch-x", stretch_x);
reader.read_bool("stretch-y", stretch_y);
Index: surface_background_data.hxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/worldobjsdata/surface_background_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- surface_background_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
+++ surface_background_data.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// 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.
@@ -63,18 +63,18 @@
public:
/// Init all fields with some usefull defaults values.
SurfaceBackgroundData ();
-
+
/** Parse the xml snip and return a newly allocated
SurfaceBackgroundData*, the user is responsible to delete the
object */
SurfaceBackgroundData (xmlDocPtr doc, xmlNodePtr cur);
SurfaceBackgroundData (const SurfaceBackgroundData& old);
-
+
/** Write the content of this object formated as xml to the given
stream */
void write_xml (std::ostream& xml);
-
+
void insert_WorldObjs (World* world);
void insert_EditorObjs (EditorNS::EditorObjMgr*);
Index: switch_door_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/switch_door_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- switch_door_data.cxx 5 Mar 2003 19:13:59 -0000 1.11
+++ switch_door_data.cxx 19 Apr 2003 10:23:19 -0000 1.12
@@ -28,7 +28,7 @@
namespace WorldObjsData {
-SwitchDoorData::SwitchDoorData ()
+SwitchDoorData::SwitchDoorData ()
: door_height(10)
{
}
@@ -46,7 +46,7 @@
subreader.read_int("height", door_height);
}
-SwitchDoorData::SwitchDoorData (const SwitchDoorData& old)
+SwitchDoorData::SwitchDoorData (const SwitchDoorData& old)
: WorldObjData(old),
door_pos(old.door_pos),
switch_pos(old.switch_pos),
@@ -54,7 +54,7 @@
{
}
-void
+void
SwitchDoorData::write_xml (std::ostream& xml)
{
xml << " <worldobj type=\"switchdoor\">\n";
Index: switch_door_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/switch_door_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- switch_door_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
+++ switch_door_data.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// 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.
@@ -31,9 +31,9 @@
class SwitchDoorData : public WorldObjData
{
public:
- /// The upper/middle pos of the door
+ /// The upper/middle pos of the door
Vector door_pos;
-
+
/// The bottom/middle pos of the switch
Vector switch_pos;
@@ -47,7 +47,7 @@
/** Write the content of this object formatted as xml to the given
stream */
void write_xml (std::ostream& xml);
-
+
/** Create an WorldObj from the given data object */
void insert_WorldObjs (World* world);
Index: teleporter_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/teleporter_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- teleporter_data.cxx 5 Mar 2003 19:13:59 -0000 1.12
+++ teleporter_data.cxx 19 Apr 2003 10:23:19 -0000 1.13
@@ -39,7 +39,7 @@
{
}
-void
+void
TeleporterData::write_xml (std::ostream& xml)
{
xml << " <worldobj type=\"teleporter\">";
@@ -60,7 +60,7 @@
subreader.read_vector("position", target_pos);
}
-void
+void
TeleporterData::insert_WorldObjs (World* world)
{
world->add_object(new WorldObjs::Teleporter(*this));
Index: teleporter_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/teleporter_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- teleporter_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
+++ teleporter_data.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// 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.
@@ -32,7 +32,7 @@
public:
Vector pos;
Vector target_pos;
-
+
TeleporterData ();
TeleporterData (xmlDocPtr doc, xmlNodePtr cur);
TeleporterData (const TeleporterData& data);
@@ -46,7 +46,7 @@
/** Create an EditorObj from the given data object */
void insert_EditorObjs (EditorNS::EditorObjMgr*);
-
+
private:
TeleporterData& operator= (const TeleporterData& data);
};
Index: thunderstorm_background_data.hxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/worldobjsdata/thunderstorm_background_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- thunderstorm_background_data.hxx 5 Mar 2003 19:13:59 -0000 1.6
+++ thunderstorm_background_data.hxx 19 Apr 2003 10:23:19 -0000 1.7
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// 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.
@@ -36,7 +36,7 @@
ThunderstormBackgroundData (xmlDocPtr doc, xmlNodePtr cur);
ThunderstormBackgroundData (const ThunderstormBackgroundData& old);
-
+
/** Writte the content of this object formated as xml to the given
stream */
virtual void write_xml (std::ostream& xml);
@@ -44,7 +44,7 @@
void insert_WorldObjs (World* world);
void insert_EditorObjs (EditorNS::EditorObjMgr*);
-private:
+private:
ThunderstormBackgroundData& operator= (const ThunderstormBackgroundData&);
};
Index: worldobj_group_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/worldobj_group_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- worldobj_group_data.cxx 5 Apr 2003 23:24:32 -0000 1.11
+++ worldobj_group_data.cxx 19 Apr 2003 10:23:19 -0000 1.12
@@ -36,9 +36,9 @@
cur = cur->children;
//std::cout << "WorldObjGroupData::WorldObjGroupData (xmlDocPtr doc,
xmlNodePtr cur)" << std::endl;
-
+
cur = XMLhelper::skip_blank (cur->next);
-
+
while (cur)
{
//std::cout << "WorldObjGroupData: " << cur->name << std::endl;
@@ -46,7 +46,7 @@
cur = cur->next;
cur = XMLhelper::skip_blank (cur->next);
}
-
+
//std::cout << "WorldObjGroupData: size = " << objs.size () << std::endl;
}
@@ -65,13 +65,13 @@
delete *i;
}
-void
+void
WorldObjGroupData::add (WorldObjData* data)
{
objs.push_back (data);
}
-void
+void
WorldObjGroupData::write_xml (std::ostream& xml)
{
xml << "<group>\n";
@@ -80,7 +80,7 @@
xml << "</group>\n\n";
}
-void
+void
WorldObjGroupData::insert_WorldObjs (World* world)
{
// Flatten all objects of the group and insert them normal into the
@@ -98,10 +98,10 @@
{
(*i)->insert_EditorObjs(group);
}
-
+
obj_mgr->add(group);
}
-
+
} // namespace WorldObjsData
/* EOF */
Index: worldobj_group_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/worldobj_group_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- worldobj_group_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
+++ worldobj_group_data.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// 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.
@@ -31,7 +31,7 @@
private:
std::vector<WorldObjData*> objs;
typedef std::vector<WorldObjData*>::iterator ObjsIter;
-
+
public:
WorldObjGroupData ();
WorldObjGroupData (xmlDocPtr doc, xmlNodePtr cur);
@@ -40,7 +40,7 @@
~WorldObjGroupData ();
void add (WorldObjData*);
-
+
void write_xml (std::ostream& xml);
/** Create an WorldObj from the given data object */
@@ -48,7 +48,7 @@
/** Create an EditorObj from the given data object */
void insert_EditorObjs (EditorNS::EditorObjMgr*);
-
+
private:
WorldObjGroupData& operator= (const WorldObjGroupData&);
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata bumper_data.cxx,1.11,1.12 bumper_data.hxx,1.7,1.8 conveyor_belt_data.cxx,1.11,1.12 conveyor_belt_data.hxx,1.8,1.9 entrance_data.cxx,1.8,1.9 entrance_data.hxx,1.5,1.6 exit_data.cxx,1.9,1.10 exit_data.hxx,1.5,1.6 fake_exit_data.hxx,1.7,1.8 groundpiece_data.cxx,1.17,1.18 groundpiece_data.hxx,1.7,1.8 guillotine_data.cxx,1.11,1.12 guillotine_data.hxx,1.7,1.8 hammer_data.cxx,1.12,1.13 hammer_data.hxx,1.8,1.9 hotspot_data.cxx,1.7,1.8 hotspot_data.hxx,1.7,1.8 ice_block_data.cxx,1.10,1.11 ice_block_data.hxx,1.7,1.8 info_box_data.cxx,1.12,1.13 info_box_data.hxx,1.7,1.8 laser_exit_data.hxx,1.7,1.8 liquid_data.cxx,1.13,1.14 liquid_data.hxx,1.7,1.8 prefab_obj_data.cxx,1.11,1.12 prefab_obj_data.hxx,1.8,1.9 rain_generator_data.hxx,1.6,1.7 smasher_data.hxx,1.7,1.8 snow_generator_data.hxx,1.9,1.10 solid_color_background_data.hxx,1.6,1.7 spike_data.hxx,1.8,1.9 starfield_background_data.cxx,1.9,1.10 starfield_background_data.hxx,1.5,1.6surface_background_data.cxx,1.11,1.12 surface_background_data.hxx,1.7,1.8 switch_door_data.cxx,1.11,1.12 switch_door_data.hxx,1.7,1.8 teleporter_data.cxx,1.12,1.13 teleporter_data.hxx,1.7,1.8thunderstorm_background_data.hxx,1.6,1.7 worldobj_group_data.cxx,1.11,1.12 worldobj_group_data.hxx,1.7,1.8,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap dot.hxx,1.6,1.7 dot_factory.cxx,1.3,1.4 dot_factory.hxx,1.1,1.2 drawable.hxx,1.7,1.8 drawable_factory.hxx,1.1,1.2 graph.hxx,1.22,1.23 level_dot.cxx,1.21,1.22 level_dot.hxx,1.9,1.10 manager.cxx,1.36,1.37 manager.hxx,1.20,1.21 path.cxx,1.6,1.7 path.hxx,1.3,1.4 path_drawable.cxx,1.7,1.8 path_drawable.hxx,1.4,1.5 path_graph.cxx,1.20,1.21 path_graph.hxx,1.9,1.10 pathfinder.hxx,1.11,1.12 pingus.cxx,1.32,1.33 pingus.hxx,1.25,1.26 sprite_drawable.cxx,1.3,1.4 sprite_drawable.hxx,1.2,1.3 surface_drawable.cxx,1.5,1.6 surface_drawable.hxx,1.4,1.5 worldmap.cxx,1.45,1.46 worldmap.hxx,1.28,1.29
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx,1.17,1.18 angel.hxx,1.14,1.15 basher.cxx,1.28,1.29 basher.hxx,1.16,1.17 blocker.cxx,1.18,1.19 blocker.hxx,1.14,1.15 boarder.cxx,1.14,1.15 boarder.hxx,1.13,1.14 bomber.cxx,1.33,1.34 bomber.hxx,1.19,1.20 bridger.cxx,1.29,1.30 bridger.hxx,1.17,1.18 climber.cxx,1.21,1.22 climber.hxx,1.14,1.15 digger.cxx,1.23,1.24 digger.hxx,1.14,1.15 drown.cxx,1.13,1.14 drown.hxx,1.12,1.13 exiter.cxx,1.17,1.18 exiter.hxx,1.13,1.14 faller.cxx,1.39,1.40 faller.hxx,1.19,1.20 floater.cxx,1.23,1.24 floater.hxx,1.14,1.15 jumper.cxx,1.19,1.20 jumper.hxx,1.12,1.13 laser_kill.cxx,1.14,1.15 laser_kill.hxx,1.13,1.14 miner.cxx,1.21,1.22 miner.hxx,1.13,1.14 rocket_launcher.cxx,1.14,1.15 rocket_launcher.hxx,1.12,1.13 slider.cxx,1.17,1.18 slider.hxx,1.12,1.13 smashed.cxx,1.13,1.14 smashed.hxx,1.14,1.15 splashed.cxx,1.14,1.15 splashed.hxx,1.14,1.15 superman.cxx,1.11,1.12 superman.hxx,1.13,1.14 teleported.cxx,1.12,1.13 teleported.hxx,1.13,1.14 waiter.cxx,1.13,1.14 waiter.hxx,1.13,1.14 walker.cxx,1.32,1.33 walker.hxx,1.13,1.14
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap dot.hxx,1.6,1.7 dot_factory.cxx,1.3,1.4 dot_factory.hxx,1.1,1.2 drawable.hxx,1.7,1.8 drawable_factory.hxx,1.1,1.2 graph.hxx,1.22,1.23 level_dot.cxx,1.21,1.22 level_dot.hxx,1.9,1.10 manager.cxx,1.36,1.37 manager.hxx,1.20,1.21 path.cxx,1.6,1.7 path.hxx,1.3,1.4 path_drawable.cxx,1.7,1.8 path_drawable.hxx,1.4,1.5 path_graph.cxx,1.20,1.21 path_graph.hxx,1.9,1.10 pathfinder.hxx,1.11,1.12 pingus.cxx,1.32,1.33 pingus.hxx,1.25,1.26 sprite_drawable.cxx,1.3,1.4 sprite_drawable.hxx,1.2,1.3 surface_drawable.cxx,1.5,1.6 surface_drawable.hxx,1.4,1.5 worldmap.cxx,1.45,1.46 worldmap.hxx,1.28,1.29
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx,1.17,1.18 angel.hxx,1.14,1.15 basher.cxx,1.28,1.29 basher.hxx,1.16,1.17 blocker.cxx,1.18,1.19 blocker.hxx,1.14,1.15 boarder.cxx,1.14,1.15 boarder.hxx,1.13,1.14 bomber.cxx,1.33,1.34 bomber.hxx,1.19,1.20 bridger.cxx,1.29,1.30 bridger.hxx,1.17,1.18 climber.cxx,1.21,1.22 climber.hxx,1.14,1.15 digger.cxx,1.23,1.24 digger.hxx,1.14,1.15 drown.cxx,1.13,1.14 drown.hxx,1.12,1.13 exiter.cxx,1.17,1.18 exiter.hxx,1.13,1.14 faller.cxx,1.39,1.40 faller.hxx,1.19,1.20 floater.cxx,1.23,1.24 floater.hxx,1.14,1.15 jumper.cxx,1.19,1.20 jumper.hxx,1.12,1.13 laser_kill.cxx,1.14,1.15 laser_kill.hxx,1.13,1.14 miner.cxx,1.21,1.22 miner.hxx,1.13,1.14 rocket_launcher.cxx,1.14,1.15 rocket_launcher.hxx,1.12,1.13 slider.cxx,1.17,1.18 slider.hxx,1.12,1.13 smashed.cxx,1.13,1.14 smashed.hxx,1.14,1.15 splashed.cxx,1.14,1.15 splashed.hxx,1.14,1.15 superman.cxx,1.11,1.12 superman.hxx,1.13,1.14 teleported.cxx,1.12,1.13 teleported.hxx,1.13,1.14 waiter.cxx,1.13,1.14 waiter.hxx,1.13,1.14 walker.cxx,1.32,1.33 walker.hxx,1.13,1.14
- Index(es):