[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.13,
|
From: |
Ingo Ruhnke |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata bumper_data.cxx, 1.13, 1.14 bumper_data.hxx, 1.9, 1.10 fake_exit_data.cxx, 1.12, 1.13 fake_exit_data.hxx, 1.9, 1.10 groundpiece_data.hxx, 1.9, 1.10 guillotine_data.cxx, 1.13, 1.14 guillotine_data.hxx, 1.10, 1.11 hammer_data.hxx, 1.10, 1.11 laser_exit_data.cxx, 1.12, 1.13 laser_exit_data.hxx, 1.9, 1.10 rain_generator_data.cxx, 1.7, 1.8 smasher_data.cxx, 1.12, 1.13 smasher_data.hxx, 1.9, 1.10 snow_generator_data.cxx, 1.9, 1.10 spike_data.cxx, 1.13, 1.14 spike_data.hxx, 1.10, 1.11 worldobj_group_data.cxx, 1.13, 1.14 |
|
Date: |
Mon, 20 Oct 2003 15:11:12 +0200 |
Update of /var/lib/cvs/Games/Pingus/src/worldobjsdata
In directory dark:/tmp/cvs-serv12729/worldobjsdata
Modified Files:
bumper_data.cxx bumper_data.hxx fake_exit_data.cxx
fake_exit_data.hxx groundpiece_data.hxx guillotine_data.cxx
guillotine_data.hxx hammer_data.hxx laser_exit_data.cxx
laser_exit_data.hxx rain_generator_data.cxx smasher_data.cxx
smasher_data.hxx snow_generator_data.cxx spike_data.cxx
spike_data.hxx worldobj_group_data.cxx
Log Message:
- replaced a few CL_Surfaces with CL_Sprite
Index: bumper_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/bumper_data.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- bumper_data.cxx 18 Oct 2003 23:17:28 -0000 1.13
+++ bumper_data.cxx 20 Oct 2003 13:11:09 -0000 1.14
@@ -35,7 +35,7 @@
}
BumperData::BumperData (xmlDocPtr doc, xmlNodePtr cur)
- : surface(PingusResource::load_surface("Traps/bumper", "traps"))
+ : surface(PingusResource::load_sprite("Traps/bumper", "traps"))
{
XMLFileReader reader(doc, cur);
reader.read_vector("position", pos);
Index: bumper_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/bumper_data.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- bumper_data.hxx 18 Oct 2003 23:17:28 -0000 1.9
+++ bumper_data.hxx 20 Oct 2003 13:11:09 -0000 1.10
@@ -21,7 +21,7 @@
#define HEADER_PINGUS_WORLDOBJSDATA_BUMPER_DATA_HXX
#include "../vector.hxx"
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
#include "../worldobj_data.hxx"
#include "../libxmlfwd.hxx"
@@ -31,7 +31,7 @@
class BumperData : public WorldObjData {
public:
- CL_Surface surface;
+ CL_Sprite surface;
Vector pos;
public:
Index: fake_exit_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/fake_exit_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- fake_exit_data.cxx 18 Oct 2003 23:17:28 -0000 1.12
+++ fake_exit_data.cxx 20 Oct 2003 13:11:09 -0000 1.13
@@ -34,7 +34,8 @@
{
}
-FakeExitData::FakeExitData (xmlDocPtr doc, xmlNodePtr cur) :
surface(PingusResource::load_surface("Traps/fake_exit", "traps"))
+FakeExitData::FakeExitData (xmlDocPtr doc, xmlNodePtr cur)
+ : surface(PingusResource::load_sprite("Traps/fake_exit", "traps"))
{
XMLFileReader reader(doc, cur);
reader.read_vector("position", pos);
Index: fake_exit_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/fake_exit_data.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fake_exit_data.hxx 18 Oct 2003 23:17:28 -0000 1.9
+++ fake_exit_data.hxx 20 Oct 2003 13:11:09 -0000 1.10
@@ -21,7 +21,7 @@
#define HEADER_PINGUS_WORLDOBJSDATA_FAKE_EXIT_DATA_HXX
#include "../vector.hxx"
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
#include "../game_counter.hxx"
#include "../libxmlfwd.hxx"
#include "../worldobj_data.hxx"
@@ -31,7 +31,7 @@
class FakeExitData : public WorldObjData {
public:
- CL_Surface surface;
+ CL_Sprite surface;
Vector pos;
GameCounter counter;
Index: groundpiece_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/groundpiece_data.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- groundpiece_data.hxx 18 Oct 2003 23:17:28 -0000 1.9
+++ groundpiece_data.hxx 20 Oct 2003 13:11:09 -0000 1.10
@@ -21,7 +21,7 @@
#define HEADER_PINGUS_GROUNDPIECE_DATA_HXX
#include "../vector.hxx"
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
#include "../libxmlfwd.hxx"
#include "../res_descriptor.hxx"
#include "../worldobj_data.hxx"
@@ -37,7 +37,7 @@
class GroundpieceData : public WorldObjData
{
public:
- CL_Surface surface;
+ CL_Sprite surface;
ResDescriptor desc;
Vector pos;
Index: guillotine_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/guillotine_data.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- guillotine_data.cxx 18 Oct 2003 23:17:28 -0000 1.13
+++ guillotine_data.cxx 20 Oct 2003 13:11:09 -0000 1.14
@@ -35,8 +35,8 @@
}
GuillotineData::GuillotineData (xmlDocPtr doc, xmlNodePtr cur)
- : surface (PingusResource::load_surface("Traps/guillotinekill", "traps")),
- idle_surf(PingusResource::load_surface("Traps/guillotineidle", "traps"))
+ : surface (PingusResource::load_sprite("Traps/guillotinekill", "traps")),
+ idle_surf(PingusResource::load_sprite("Traps/guillotineidle", "traps"))
{
if (cur->name)
std::cout << reinterpret_cast<const char*>(cur->name) << std::endl;
Index: guillotine_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/guillotine_data.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- guillotine_data.hxx 19 Oct 2003 12:25:48 -0000 1.10
+++ guillotine_data.hxx 20 Oct 2003 13:11:09 -0000 1.11
@@ -21,7 +21,7 @@
#define HEADER_PINGUS_WORLDOBJSDATA_GUILLOTINE_DATA_HXX
#include "../vector.hxx"
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
#include "../direction.hxx"
#include "../game_counter.hxx"
#include "../libxmlfwd.hxx"
@@ -32,8 +32,8 @@
class GuillotineData : public WorldObjData {
public:
- CL_Surface surface;
- CL_Surface idle_surf;
+ CL_Sprite surface;
+ CL_Sprite idle_surf;
Vector pos;
Direction direction;
GameCounter counter;
Index: hammer_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/hammer_data.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- hammer_data.hxx 18 Oct 2003 23:17:28 -0000 1.10
+++ hammer_data.hxx 20 Oct 2003 13:11:09 -0000 1.11
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_WORLDOBJSDATA_HAMMER_DATA_HXX
#define HEADER_PINGUS_WORLDOBJSDATA_HAMMER_DATA_HXX
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
#include "../vector.hxx"
#include "../world.hxx"
#include "../game_counter.hxx"
Index: laser_exit_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/laser_exit_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- laser_exit_data.cxx 18 Oct 2003 23:17:28 -0000 1.12
+++ laser_exit_data.cxx 20 Oct 2003 13:11:09 -0000 1.13
@@ -34,7 +34,8 @@
{
}
-LaserExitData::LaserExitData (xmlDocPtr doc, xmlNodePtr cur) :
surface(PingusResource::load_surface("Traps/laser_exit", "traps"))
+LaserExitData::LaserExitData (xmlDocPtr doc, xmlNodePtr cur)
+ : surface(PingusResource::load_sprite("Traps/laser_exit", "traps"))
{
XMLFileReader reader(doc, cur);
reader.read_vector("position", pos);
Index: laser_exit_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/laser_exit_data.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- laser_exit_data.hxx 18 Oct 2003 23:17:28 -0000 1.9
+++ laser_exit_data.hxx 20 Oct 2003 13:11:09 -0000 1.10
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_WORLDOBJSDATA_LASER_EXIT_DATA_HXX
#define HEADER_PINGUS_WORLDOBJSDATA_LASER_EXIT_DATA_HXX
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
#include "../vector.hxx"
#include "../game_counter.hxx"
#include "../libxmlfwd.hxx"
@@ -31,7 +31,7 @@
class LaserExitData : public WorldObjData {
public:
- CL_Surface surface;
+ CL_Sprite surface;
Vector pos;
GameCounter counter;
Index: rain_generator_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/rain_generator_data.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- rain_generator_data.cxx 18 Oct 2003 23:17:28 -0000 1.7
+++ rain_generator_data.cxx 20 Oct 2003 13:11:09 -0000 1.8
@@ -42,7 +42,7 @@
void
RainGeneratorData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
- obj_mgr->add(new WeatherObj("rain-generator"));
+ obj_mgr->add(new EditorNS::WeatherObj("rain-generator"));
}
} // namespace WorldObjsData
Index: smasher_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/smasher_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- smasher_data.cxx 18 Oct 2003 23:17:28 -0000 1.12
+++ smasher_data.cxx 20 Oct 2003 13:11:09 -0000 1.13
@@ -34,7 +34,8 @@
{
}
-SmasherData::SmasherData (xmlDocPtr doc, xmlNodePtr cur) :
surface(PingusResource::load_surface("Traps/smasher", "traps"))
+SmasherData::SmasherData (xmlDocPtr doc, xmlNodePtr cur)
+ : surface(PingusResource::load_sprite("Traps/smasher", "traps"))
{
XMLFileReader reader(doc, cur);
reader.read_vector("position", pos);
Index: smasher_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/smasher_data.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- smasher_data.hxx 18 Oct 2003 23:17:28 -0000 1.9
+++ smasher_data.hxx 20 Oct 2003 13:11:09 -0000 1.10
@@ -21,7 +21,7 @@
#define HEADER_PINGUS_WORLDOBJSDATA_SMASHER_DATA_HXX
#include "../vector.hxx"
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
#include "../libxmlfwd.hxx"
#include "../worldobj_data.hxx"
@@ -30,7 +30,7 @@
class SmasherData : public WorldObjData {
public:
- CL_Surface surface;
+ CL_Sprite surface;
Vector pos;
public:
Index: snow_generator_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/snow_generator_data.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- snow_generator_data.cxx 18 Oct 2003 23:17:28 -0000 1.9
+++ snow_generator_data.cxx 20 Oct 2003 13:11:09 -0000 1.10
@@ -54,7 +54,7 @@
void
SnowGeneratorData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
- obj_mgr->add(new WeatherObj("snow-generator"));
+ obj_mgr->add(new EditorNS::WeatherObj("snow-generator"));
}
} // namespace WorldObjsData
Index: spike_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/spike_data.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- spike_data.cxx 18 Oct 2003 23:17:28 -0000 1.13
+++ spike_data.cxx 20 Oct 2003 13:11:09 -0000 1.14
@@ -36,7 +36,7 @@
}
SpikeData::SpikeData (xmlDocPtr doc, xmlNodePtr cur)
- : surface(PingusResource::load_surface("Traps/spike", "traps"))
+ : surface(PingusResource::load_sprite("Traps/spike", "traps"))
{
XMLFileReader reader(doc, cur);
reader.read_vector("position", pos);
Index: spike_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/spike_data.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- spike_data.hxx 18 Oct 2003 23:17:28 -0000 1.10
+++ spike_data.hxx 20 Oct 2003 13:11:09 -0000 1.11
@@ -21,7 +21,7 @@
#define HEADER_PINGUS_WORLDOBJSDATA_SPIKE_DATA_HXX
#include "../vector.hxx"
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
#include "../game_counter.hxx"
#include "../libxmlfwd.hxx"
#include "../worldobj_data.hxx"
@@ -32,7 +32,7 @@
class SpikeData : public WorldObjData
{
public:
- CL_Surface surface;
+ CL_Sprite surface;
Vector pos;
GameCounter counter;
Index: worldobj_group_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/worldobj_group_data.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- worldobj_group_data.cxx 18 Oct 2003 23:17:28 -0000 1.13
+++ worldobj_group_data.cxx 20 Oct 2003 13:11:09 -0000 1.14
@@ -93,7 +93,7 @@
void
WorldObjGroupData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
- EditorObjGroup* group = new EditorObjGroup();
+ EditorNS::EditorObjGroup* group = new EditorNS::EditorObjGroup();
for (ObjsIter i = objs.begin (); i != objs.end (); ++i)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata bumper_data.cxx, 1.13, 1.14 bumper_data.hxx, 1.9, 1.10 fake_exit_data.cxx, 1.12, 1.13 fake_exit_data.hxx, 1.9, 1.10 groundpiece_data.hxx, 1.9, 1.10 guillotine_data.cxx, 1.13, 1.14 guillotine_data.hxx, 1.10, 1.11 hammer_data.hxx, 1.10, 1.11 laser_exit_data.cxx, 1.12, 1.13 laser_exit_data.hxx, 1.9, 1.10 rain_generator_data.cxx, 1.7, 1.8 smasher_data.cxx, 1.12, 1.13 smasher_data.hxx, 1.9, 1.10 snow_generator_data.cxx, 1.9, 1.10 spike_data.cxx, 1.13, 1.14 spike_data.hxx, 1.10, 1.11 worldobj_group_data.cxx, 1.13, 1.14,
Ingo Ruhnke <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx, 1.15, 1.16 conveyor_belt.cxx, 1.24, 1.25 conveyor_belt.hxx, 1.19, 1.20 entrance.hxx, 1.6, 1.7 fake_exit.cxx, 1.15, 1.16 groundpiece.cxx, 1.4, 1.5 groundpiece.hxx, 1.8, 1.9 guillotine.cxx, 1.10, 1.11 ice_block.cxx, 1.23, 1.24 ice_block.hxx, 1.17, 1.18 info_box.cxx, 1.22, 1.23 laser_exit.cxx, 1.14, 1.15 liquid.cxx, 1.10, 1.11 liquid.hxx, 1.7, 1.8 smasher.cxx, 1.20, 1.21 solid_color_background.cxx, 1.6, 1.7 spike.cxx, 1.11, 1.12 starfield_background_stars.cxx, 1.9, 1.10 starfield_background_stars.hxx, 1.8, 1.9 surface_background.cxx, 1.12, 1.13 surface_background.hxx, 1.7, 1.8 switch_door.cxx, 1.25, 1.26 switch_door.hxx, 1.21, 1.22 thunderstorm_background.cxx, 1.6, 1.7 thunderstorm_background.hxx, 1.9, 1.10
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src client.hxx, 1.28, 1.29 col_map.hxx, 1.12, 1.13 pingus_resource.hxx, 1.17, 1.18 time_display.cxx, 1.16, 1.17 timer.cxx, 1.5, 1.6 timer.hxx, 1.7, 1.8 view.hxx, 1.14, 1.15
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx, 1.15, 1.16 conveyor_belt.cxx, 1.24, 1.25 conveyor_belt.hxx, 1.19, 1.20 entrance.hxx, 1.6, 1.7 fake_exit.cxx, 1.15, 1.16 groundpiece.cxx, 1.4, 1.5 groundpiece.hxx, 1.8, 1.9 guillotine.cxx, 1.10, 1.11 ice_block.cxx, 1.23, 1.24 ice_block.hxx, 1.17, 1.18 info_box.cxx, 1.22, 1.23 laser_exit.cxx, 1.14, 1.15 liquid.cxx, 1.10, 1.11 liquid.hxx, 1.7, 1.8 smasher.cxx, 1.20, 1.21 solid_color_background.cxx, 1.6, 1.7 spike.cxx, 1.11, 1.12 starfield_background_stars.cxx, 1.9, 1.10 starfield_background_stars.hxx, 1.8, 1.9 surface_background.cxx, 1.12, 1.13 surface_background.hxx, 1.7, 1.8 switch_door.cxx, 1.25, 1.26 switch_door.hxx, 1.21, 1.22 thunderstorm_background.cxx, 1.6, 1.7 thunderstorm_background.hxx, 1.9, 1.10
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src client.hxx, 1.28, 1.29 col_map.hxx, 1.12, 1.13 pingus_resource.hxx, 1.17, 1.18 time_display.cxx, 1.16, 1.17 timer.cxx, 1.5, 1.6 timer.hxx, 1.7, 1.8 view.hxx, 1.14, 1.15
- Index(es):