[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs conveyor_belt_obj.cxx, 1.
From: |
Ingo Ruhnke |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs conveyor_belt_obj.cxx, 1.9, 1.10 conveyor_belt_obj.hxx, 1.9, 1.10 entrance_obj.cxx, 1.8, 1.9 exit_obj.cxx, 1.3, 1.4 fake_exit_obj.cxx, 1.12, 1.13 groundpiece_obj.cxx, 1.16, 1.17 guillotine_obj.cxx, 1.11, 1.12 hotspot_obj.cxx, 1.4, 1.5 ice_block_obj.cxx, 1.8, 1.9 ice_block_obj.hxx, 1.7, 1.8 info_box_obj.cxx, 1.6, 1.7 laser_exit_obj.cxx, 1.12, 1.13 liquid_obj.cxx, 1.7, 1.8 liquid_obj.hxx, 1.7, 1.8 prefab_obj.hxx, 1.5, 1.6 smasher_obj.cxx, 1.10, 1.11 solid_color_background_obj.cxx, 1.8, 1.9 solid_color_background_obj.hxx, 1.8, 1.9 spike_obj.cxx, 1.12, 1.13 starfield_background_obj.cxx, 1.7, 1.8 starfield_background_obj.hxx, 1.8, 1.9 surface_background_obj.cxx, 1.11, 1.12 surface_background_obj.hxx, 1.8, 1.9 switch_door_obj.cxx, 1.9, 1.10 switch_door_switch_obj.cxx, 1.4, 1.5 teleporter_obj.cxx, 1.10, 1.11 teleporter_target_obj.cxx, 1.7, 1.8 teleporter_target_obj.hxx, 1.6, 1.7 thunderstorm_background_obj.cxx, 1.4, 1.5 thunderstorm_background_obj.hxx, 1.6, 1.7 |
Date: |
Sun, 19 Oct 2003 14:25:50 +0200 |
Update of /var/lib/cvs/Games/Pingus/src/editorobjs
In directory dark:/tmp/cvs-serv19578/editorobjs
Modified Files:
conveyor_belt_obj.cxx conveyor_belt_obj.hxx entrance_obj.cxx
exit_obj.cxx fake_exit_obj.cxx groundpiece_obj.cxx
guillotine_obj.cxx hotspot_obj.cxx ice_block_obj.cxx
ice_block_obj.hxx info_box_obj.cxx laser_exit_obj.cxx
liquid_obj.cxx liquid_obj.hxx prefab_obj.hxx smasher_obj.cxx
solid_color_background_obj.cxx solid_color_background_obj.hxx
spike_obj.cxx starfield_background_obj.cxx
starfield_background_obj.hxx surface_background_obj.cxx
surface_background_obj.hxx switch_door_obj.cxx
switch_door_switch_obj.cxx teleporter_obj.cxx
teleporter_target_obj.cxx teleporter_target_obj.hxx
thunderstorm_background_obj.cxx
thunderstorm_background_obj.hxx
Log Message:
- some more stuff, still not much useable
Index: conveyor_belt_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/conveyor_belt_obj.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- conveyor_belt_obj.cxx 18 Oct 2003 23:17:27 -0000 1.9
+++ conveyor_belt_obj.cxx 19 Oct 2003 12:25:47 -0000 1.10
@@ -31,9 +31,9 @@
ConveyorBeltObj::ConveyorBeltObj (const WorldObjsData::ConveyorBeltData& data_)
: data(new WorldObjsData::ConveyorBeltData(data_)),
- left_sur (PingusResource::load_surface ("conveyorbelt_left",
"worldobjs")),
- right_sur (PingusResource::load_surface ("conveyorbelt_right",
"worldobjs")),
- middle_sur(PingusResource::load_surface ("conveyorbelt_middle",
"worldobjs"))
+ left_sur (PingusResource::load_sprite("conveyorbelt_left",
"worldobjs")),
+ right_sur (PingusResource::load_sprite("conveyorbelt_right",
"worldobjs")),
+ middle_sur(PingusResource::load_sprite("conveyorbelt_middle", "worldobjs"))
{
}
@@ -47,16 +47,20 @@
ConveyorBeltObj::draw (EditorNS::EditorView * view)
{
view->draw(left_sur, data->pos, static_cast<int>(data->counter));
+
+#ifdef CLANLIB_0_6
for (int i=0; i < data->width; ++i)
{
view->draw(middle_sur,
- static_cast<int>(data->pos.x) + left_sur.get_width() + i *
middle_sur.get_width(),
+ static_cast<int>(data->pos.x) +
left_sur.get_frame_size(0).width
+ + i * middle_sur.get_frame_size(0).width,
static_cast<int>(data->pos.y),
static_cast<int>(data->counter));
}
view->draw(right_sur,
- static_cast<int>(data->pos.x) + left_sur.get_width() + data->width
* middle_sur.get_width(),
+ static_cast<int>(data->pos.x) + left_sur.get_frame_size().width
+ + data->width * middle_sur.get_frame_size().width,
static_cast<int>(data->pos.y),
static_cast<int>(data->counter));
@@ -66,6 +70,7 @@
else if (data->counter < 0)
data->counter = middle_sur.get_num_frames() - 1;
+#endif
}
void
@@ -83,7 +88,7 @@
{
WorldObjsData::ConveyorBeltData newdata;
newdata.pos = pos;
- return EditorObjLst(1, new ConveyorBeltObj(newdata));
+ return EditorNS::EditorObjLst(1, new ConveyorBeltObj(newdata));
}
std::string
@@ -97,15 +102,19 @@
int
ConveyorBeltObj::get_width ()
{
- return left_sur .get_width()
- + right_sur .get_width()
- + middle_sur.get_width() * data->width;
+ return left_sur .get_frame_size(0).width
+ + right_sur .get_frame_size(0).width
+ + middle_sur.get_frame_size(0).width * data->width;
}
int
ConveyorBeltObj::get_height ()
{
+#ifdef CLANLIB_0_6
return middle_sur.get_height();
+#else
+ return 24;
+#endif
}
float
Index: conveyor_belt_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/conveyor_belt_obj.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- conveyor_belt_obj.hxx 18 Oct 2003 23:17:27 -0000 1.9
+++ conveyor_belt_obj.hxx 19 Oct 2003 12:25:47 -0000 1.10
@@ -38,9 +38,9 @@
private:
WorldObjsData::ConveyorBeltData* const data;
- CL_Surface left_sur;
- CL_Surface right_sur;
- CL_Surface middle_sur;
+ CL_Sprite left_sur;
+ CL_Sprite right_sur;
+ CL_Sprite middle_sur;
public:
ConveyorBeltObj (const WorldObjsData::ConveyorBeltData& data_);
Index: entrance_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/entrance_obj.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- entrance_obj.cxx 19 Apr 2003 10:23:18 -0000 1.8
+++ entrance_obj.cxx 19 Oct 2003 12:25:47 -0000 1.9
@@ -25,6 +25,8 @@
#include "../editor/editor.hxx"
#include "entrance_obj.hxx"
+namespace Pingus {
+
using namespace WorldObjsData;
namespace EditorObjs {
@@ -61,7 +63,7 @@
delete data;
}
-EditorObj*
+EditorNS::EditorObj*
EntranceObj::duplicate ()
{
return new EntranceObj(*data);
@@ -120,5 +122,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: exit_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/exit_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exit_obj.cxx 18 Oct 2003 23:17:27 -0000 1.3
+++ exit_obj.cxx 19 Oct 2003 12:25:47 -0000 1.4
@@ -44,7 +44,7 @@
delete data;
}
-EditorObj*
+EditorNS::EditorObj*
ExitObj::duplicate ()
{
return new ExitObj(*data);
Index: fake_exit_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/fake_exit_obj.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- fake_exit_obj.cxx 18 Oct 2003 23:17:28 -0000 1.12
+++ fake_exit_obj.cxx 19 Oct 2003 12:25:47 -0000 1.13
@@ -41,15 +41,15 @@
delete data;
}
-EditorObjLst
+EditorNS::EditorObjLst
FakeExitObj::create (const Vector& pos)
{
WorldObjsData::FakeExitData newdata;
newdata.pos = pos;
- return EditorObjLst(1, new FakeExitObj (newdata));
+ return EditorNS::EditorObjLst(1, new FakeExitObj (newdata));
}
-EditorObj*
+EditorNS::EditorObj*
FakeExitObj::duplicate ()
{
return new FakeExitObj(*data);
Index: groundpiece_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/groundpiece_obj.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- groundpiece_obj.cxx 18 Oct 2003 23:17:28 -0000 1.16
+++ groundpiece_obj.cxx 19 Oct 2003 12:25:47 -0000 1.17
@@ -44,7 +44,7 @@
delete data;
}
-EditorObj*
+EditorNS::EditorObj*
GroundpieceObj::duplicate ()
{
return new GroundpieceObj(*data);
Index: guillotine_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/guillotine_obj.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- guillotine_obj.cxx 18 Oct 2003 23:17:28 -0000 1.11
+++ guillotine_obj.cxx 19 Oct 2003 12:25:47 -0000 1.12
@@ -39,15 +39,15 @@
delete data;
}
-EditorObjLst
+EditorNS::EditorObjLst
GuillotineObj::create (const Vector& pos)
{
WorldObjsData::GuillotineData newdata;
newdata.pos = pos;
- return EditorObjLst(1, new GuillotineObj(newdata));
+ return EditorNS::EditorObjLst(1, new GuillotineObj(newdata));
}
-EditorObj*
+EditorNS::EditorObj*
GuillotineObj::duplicate ()
{
return new GuillotineObj(*data);
Index: hotspot_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/hotspot_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hotspot_obj.cxx 18 Oct 2003 23:17:28 -0000 1.4
+++ hotspot_obj.cxx 19 Oct 2003 12:25:47 -0000 1.5
@@ -37,7 +37,7 @@
data->write_xml(xml);
}
-EditorObj*
+EditorNS::EditorObj*
HotspotObj::duplicate ()
{
return new HotspotObj(*data);
Index: ice_block_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/ice_block_obj.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ice_block_obj.cxx 18 Oct 2003 23:17:28 -0000 1.8
+++ ice_block_obj.cxx 19 Oct 2003 12:25:47 -0000 1.9
@@ -37,12 +37,12 @@
}
/** Create the object with resonable defaults */
-EditorObjLst
+EditorNS::EditorObjLst
IceBlockObj::create (const Vector& pos)
{
WorldObjsData::IceBlockData newdata;
newdata.pos = pos;
- return EditorObjLst(1, new IceBlockObj(newdata));
+ return EditorNS::EditorObjLst(1, new IceBlockObj(newdata));
}
std::string
@@ -59,7 +59,7 @@
data->write_xml(xml);
}
-EditorObj*
+EditorNS::EditorObj*
IceBlockObj::duplicate ()
{
return new IceBlockObj(*data);
Index: ice_block_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/ice_block_obj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ice_block_obj.hxx 18 Oct 2003 23:17:28 -0000 1.7
+++ ice_block_obj.hxx 19 Oct 2003 12:25:47 -0000 1.8
@@ -44,7 +44,7 @@
void write_xml (std::ostream& xml);
- EditorObj* duplicate ();
+ EditorNS::EditorObj* duplicate ();
std::string status_line ();
EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
private:
Index: info_box_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/info_box_obj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- info_box_obj.cxx 18 Oct 2003 23:17:28 -0000 1.6
+++ info_box_obj.cxx 19 Oct 2003 12:25:47 -0000 1.7
@@ -35,12 +35,12 @@
delete data;
}
-EditorObjLst
+EditorNS::EditorObjLst
InfoBoxObj::create (const Vector& pos)
{
WorldObjsData::InfoBoxData newdata;
newdata.pos = pos;
- return EditorObjLst(1, new InfoBoxObj(newdata));
+ return EditorNS::EditorObjLst(1, new InfoBoxObj(newdata));
}
void
@@ -49,7 +49,7 @@
data->write_xml(xml);
}
-EditorObj*
+EditorNS::EditorObj*
InfoBoxObj::duplicate ()
{
return new InfoBoxObj(*data);
Index: laser_exit_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/laser_exit_obj.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- laser_exit_obj.cxx 18 Oct 2003 23:17:28 -0000 1.12
+++ laser_exit_obj.cxx 19 Oct 2003 12:25:47 -0000 1.13
@@ -40,15 +40,15 @@
delete data;
}
-EditorObjLst
+EditorNS::EditorObjLst
LaserExitObj::create (const Vector& pos)
{
WorldObjsData::LaserExitData newdata;
newdata.pos = pos;
- return EditorObjLst(1, new LaserExitObj(newdata));
+ return EditorNS::EditorObjLst(1, new LaserExitObj(newdata));
}
-EditorObj*
+EditorNS::EditorObj*
LaserExitObj::duplicate ()
{
return new LaserExitObj(*data);
Index: liquid_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/liquid_obj.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- liquid_obj.cxx 18 Oct 2003 23:17:28 -0000 1.7
+++ liquid_obj.cxx 19 Oct 2003 12:25:47 -0000 1.8
@@ -45,7 +45,7 @@
delete data;
}
-EditorObj*
+EditorNS::EditorObj*
LiquidObj::duplicate ()
{
return new LiquidObj(*data);
Index: liquid_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/liquid_obj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- liquid_obj.hxx 18 Oct 2003 23:17:28 -0000 1.7
+++ liquid_obj.hxx 19 Oct 2003 12:25:47 -0000 1.8
@@ -31,7 +31,7 @@
namespace EditorObjs {
-class LiquidObj : public SpriteEditorObj
+class LiquidObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::LiquidData* const data;
Index: prefab_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/prefab_obj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- prefab_obj.hxx 18 Oct 2003 23:17:28 -0000 1.5
+++ prefab_obj.hxx 19 Oct 2003 12:25:47 -0000 1.6
@@ -31,7 +31,7 @@
/** The PrefabObj represents a Prefab inside the editor workspace
*/
-class PrefabObj : public EditorObj
+class PrefabObj : public EditorNS::EditorObj
{
private:
/** The object group which this prefab wraps */
Index: smasher_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/smasher_obj.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- smasher_obj.cxx 18 Oct 2003 23:17:28 -0000 1.10
+++ smasher_obj.cxx 19 Oct 2003 12:25:47 -0000 1.11
@@ -39,15 +39,15 @@
delete data;
}
-EditorObjLst
+EditorNS::EditorObjLst
SmasherObj::create (const Vector& pos)
{
WorldObjsData::SmasherData smasher_data;
smasher_data.pos = pos;
- return EditorObjLst(1, new SmasherObj(smasher_data));
+ return EditorNS::EditorObjLst(1, new SmasherObj(smasher_data));
}
-EditorObj*
+EditorNS::EditorObj*
SmasherObj::duplicate ()
{
return new SmasherObj(*data);
Index: solid_color_background_obj.cxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/editorobjs/solid_color_background_obj.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- solid_color_background_obj.cxx 18 Oct 2003 23:17:28 -0000 1.8
+++ solid_color_background_obj.cxx 19 Oct 2003 12:25:47 -0000 1.9
@@ -27,9 +27,10 @@
#include "solid_color_background_obj.hxx"
+namespace Pingus {
+
using namespace EditorNS;
-namespace Pingus {
namespace EditorObjs {
SolidColorBackgroundObj::SolidColorBackgroundObj (const
WorldObjsData::SolidColorBackgroundData& data_)
@@ -48,7 +49,7 @@
data->write_xml(xml);
}
-EditorObj*
+EditorNS::EditorObj*
SolidColorBackgroundObj::duplicate ()
{
return new SolidColorBackgroundObj(*data);
Index: solid_color_background_obj.hxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/editorobjs/solid_color_background_obj.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- solid_color_background_obj.hxx 18 Oct 2003 23:17:28 -0000 1.8
+++ solid_color_background_obj.hxx 19 Oct 2003 12:25:47 -0000 1.9
@@ -26,6 +26,8 @@
#include "../editor/property_window.hxx"
#include "surface_background_obj.hxx"
+namespace Pingus {
+
using namespace EditorNS;
namespace WorldObjsData {
@@ -69,6 +71,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: spike_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/spike_obj.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- spike_obj.cxx 18 Oct 2003 23:17:28 -0000 1.12
+++ spike_obj.cxx 19 Oct 2003 12:25:47 -0000 1.13
@@ -38,15 +38,15 @@
delete data;
}
-EditorObjLst
+EditorNS::EditorObjLst
SpikeObj::create (const Vector& pos)
{
WorldObjsData::SpikeData spike_data;
spike_data.pos = pos;
- return EditorObjLst(1, new SpikeObj(spike_data));
+ return EditorNS::EditorObjLst(1, new SpikeObj(spike_data));
}
-EditorObj*
+EditorNS::EditorObj*
SpikeObj::duplicate ()
{
return new SpikeObj(*data);
Index: starfield_background_obj.cxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/editorobjs/starfield_background_obj.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- starfield_background_obj.cxx 18 Oct 2003 23:17:28 -0000 1.7
+++ starfield_background_obj.cxx 19 Oct 2003 12:25:47 -0000 1.8
@@ -24,11 +24,11 @@
#include "../editor/property_window.hxx"
#include "surface_background_obj.hxx"
-using namespace EditorNS;
-
namespace Pingus {
namespace EditorObjs {
+using namespace EditorNS;
+
StarfieldBackgroundObj::StarfieldBackgroundObj (const
WorldObjsData::StarfieldBackgroundData& data_)
: SpriteEditorObj ("Stars/starfield_icon", "game"),
data(new WorldObjsData::StarfieldBackgroundData(data_)),
@@ -48,7 +48,7 @@
data->write_xml (xml);
}
-EditorObj*
+EditorNS::EditorObj*
StarfieldBackgroundObj::duplicate ()
{
return new StarfieldBackgroundObj(*data);
Index: starfield_background_obj.hxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/editorobjs/starfield_background_obj.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- starfield_background_obj.hxx 18 Oct 2003 23:17:28 -0000 1.8
+++ starfield_background_obj.hxx 19 Oct 2003 12:25:47 -0000 1.9
@@ -32,7 +32,7 @@
namespace EditorObjs {
-class StarfieldBackgroundObj : public SpriteEditorObj
+class StarfieldBackgroundObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::StarfieldBackgroundData* const data;
Index: surface_background_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/surface_background_obj.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- surface_background_obj.cxx 18 Oct 2003 23:17:28 -0000 1.11
+++ surface_background_obj.cxx 19 Oct 2003 12:25:47 -0000 1.12
@@ -25,11 +25,11 @@
#include "../editor/property_window.hxx"
#include "surface_background_obj.hxx"
-using namespace EditorNS;
-
namespace Pingus {
namespace EditorObjs {
+using namespace EditorNS;
+
SurfaceBackgroundObj::SurfaceBackgroundObj (const
WorldObjsData::SurfaceBackgroundData& data_)
: SpriteEditorObj (data_.desc.res_name, data_.desc.datafile),
data(new WorldObjsData::SurfaceBackgroundData(data_))
@@ -48,7 +48,7 @@
data->write_xml(xml);
}
-EditorObj*
+EditorNS::EditorObj*
SurfaceBackgroundObj::duplicate ()
{
return new SurfaceBackgroundObj(*data);
Index: surface_background_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/surface_background_obj.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- surface_background_obj.hxx 18 Oct 2003 23:17:28 -0000 1.8
+++ surface_background_obj.hxx 19 Oct 2003 12:25:47 -0000 1.9
@@ -30,7 +30,7 @@
namespace EditorObjs {
-class SurfaceBackgroundObj : public SpriteEditorObj
+class SurfaceBackgroundObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::SurfaceBackgroundData* const data;
Index: switch_door_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/switch_door_obj.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- switch_door_obj.cxx 18 Oct 2003 23:17:28 -0000 1.9
+++ switch_door_obj.cxx 19 Oct 2003 12:25:47 -0000 1.10
@@ -41,7 +41,7 @@
delete data;
}
-EditorObj*
+EditorNS::EditorObj*
SwitchDoorObj::duplicate ()
{
pwarn << "SwitchDoorObj::duplicate(): not implemented" << std::endl;
@@ -67,7 +67,7 @@
/** Create this object (and child objects) with resonable defaults
for the editor */
-EditorObjLst
+EditorNS::EditorObjLst
SwitchDoorObj::create (const Vector& pos)
{
WorldObjsData::SwitchDoorData newdata;
@@ -76,7 +76,7 @@
newdata.switch_pos = pos;
newdata.door_height = 15;
- return EditorObjLst(1, new SwitchDoorObj(newdata));
+ return EditorNS::EditorObjLst(1, new SwitchDoorObj(newdata));
}
void
Index: switch_door_switch_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/switch_door_switch_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- switch_door_switch_obj.cxx 18 Oct 2003 23:17:28 -0000 1.4
+++ switch_door_switch_obj.cxx 19 Oct 2003 12:25:47 -0000 1.5
@@ -36,7 +36,7 @@
return "--- SwitchDoorSwitchObj ---";
}
-EditorObj*
+EditorNS::EditorObj*
SwitchDoorSwitchObj::duplicate ()
{
return door->duplicate ();
Index: teleporter_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/teleporter_obj.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- teleporter_obj.cxx 19 Apr 2003 10:23:18 -0000 1.10
+++ teleporter_obj.cxx 19 Oct 2003 12:25:47 -0000 1.11
@@ -23,6 +23,7 @@
#include "../editor/editor_view.hxx"
#include "../worldobjsdata/teleporter_data.hxx"
+namespace Pingus {
namespace EditorObjs {
TeleporterObj::TeleporterObj (const WorldObjsData::TeleporterData& data_)
@@ -43,14 +44,14 @@
return data->target_pos;
}
-EditorObj*
+EditorNS::EditorObj*
TeleporterObj::duplicate()
{
pwarn << "EditorTeleporterObj::duplicate(): not implemented" << std::endl;
return 0;
}
-EditorObjLst
+EditorNS::EditorObjLst
TeleporterObj::create (const Vector& pos)
{
WorldObjsData::TeleporterData newdata;
@@ -59,7 +60,7 @@
newdata.target_pos.x = pos.x + 50;
newdata.target_pos.y = pos.y + 50;
- return EditorObjLst(1, new TeleporterObj(newdata));
+ return EditorNS::EditorObjLst(1, new TeleporterObj(newdata));
}
void
@@ -87,5 +88,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: teleporter_target_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/teleporter_target_obj.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- teleporter_target_obj.cxx 19 Apr 2003 10:23:18 -0000 1.7
+++ teleporter_target_obj.cxx 19 Oct 2003 12:25:47 -0000 1.8
@@ -22,6 +22,7 @@
#include "teleporter_obj.hxx"
#include "teleporter_target_obj.hxx"
+namespace Pingus {
namespace EditorObjs {
TeleporterTargetObj::TeleporterTargetObj (TeleporterObj* arg_teleporter)
@@ -33,7 +34,7 @@
sprite.set_align_center();
}
-EditorObj*
+EditorNS::EditorObj*
TeleporterTargetObj::duplicate ()
{
return teleporter->duplicate();
@@ -48,5 +49,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: teleporter_target_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/teleporter_target_obj.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- teleporter_target_obj.hxx 18 Oct 2003 23:17:28 -0000 1.6
+++ teleporter_target_obj.hxx 19 Oct 2003 12:25:47 -0000 1.7
@@ -31,7 +31,7 @@
itself is handled inside the EditorObjsTeleporterObj, but we need
this helper object to be able to show and move the teleporter
target inside the editor */
-class TeleporterTargetObj : public SpriteEditorObj
+class TeleporterTargetObj : public EditorNS::SpriteEditorObj
{
private:
TeleporterObj* teleporter;
Index: thunderstorm_background_obj.cxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/editorobjs/thunderstorm_background_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- thunderstorm_background_obj.cxx 18 Oct 2003 23:17:28 -0000 1.4
+++ thunderstorm_background_obj.cxx 19 Oct 2003 12:25:47 -0000 1.5
@@ -42,7 +42,7 @@
data->write_xml(xml);
}
-EditorObj*
+EditorNS::EditorObj*
ThunderstormBackgroundObj::duplicate ()
{
return new ThunderstormBackgroundObj(*data);
Index: thunderstorm_background_obj.hxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/editorobjs/thunderstorm_background_obj.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- thunderstorm_background_obj.hxx 18 Oct 2003 23:17:28 -0000 1.6
+++ thunderstorm_background_obj.hxx 19 Oct 2003 12:25:47 -0000 1.7
@@ -30,7 +30,7 @@
namespace EditorObjs {
-class ThunderstormBackgroundObj : public SpriteEditorObj
+class ThunderstormBackgroundObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::ThunderstormBackgroundData* const data;
@@ -41,7 +41,7 @@
void write_xml (std::ostream& xml);
- EditorObj* duplicate ();
+ EditorNS::EditorObj* duplicate ();
std::string status_line ();
EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editorobjs conveyor_belt_obj.cxx, 1.9, 1.10 conveyor_belt_obj.hxx, 1.9, 1.10 entrance_obj.cxx, 1.8, 1.9 exit_obj.cxx, 1.3, 1.4 fake_exit_obj.cxx, 1.12, 1.13 groundpiece_obj.cxx, 1.16, 1.17 guillotine_obj.cxx, 1.11, 1.12 hotspot_obj.cxx, 1.4, 1.5 ice_block_obj.cxx, 1.8, 1.9 ice_block_obj.hxx, 1.7, 1.8 info_box_obj.cxx, 1.6, 1.7 laser_exit_obj.cxx, 1.12, 1.13 liquid_obj.cxx, 1.7, 1.8 liquid_obj.hxx, 1.7, 1.8 prefab_obj.hxx, 1.5, 1.6 smasher_obj.cxx, 1.10, 1.11 solid_color_background_obj.cxx, 1.8, 1.9 solid_color_background_obj.hxx, 1.8, 1.9 spike_obj.cxx, 1.12, 1.13 starfield_background_obj.cxx, 1.7, 1.8 starfield_background_obj.hxx, 1.8, 1.9 surface_background_obj.cxx, 1.11, 1.12 surface_background_obj.hxx, 1.8, 1.9 switch_door_obj.cxx, 1.9, 1.10 switch_door_switch_obj.cxx, 1.4, 1.5 teleporter_obj.cxx, 1.10, 1.11 teleporter_target_obj.cxx, 1.7, 1.8 teleporter_target_obj.hxx, 1.6, 1.7 thunderstorm_background_obj.cxx, 1.4, 1.5 thunderstorm_background_obj.hxx, 1.6, 1.7,
Ingo Ruhnke <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/input/pointers Makefile.am, 1.2, 1.3 mouse_pointer.cxx, 1.3, 1.4
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/sound sound_real.cxx, 1.9, 1.10 sound_res_mgr.cxx, 1.3, 1.4
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/input/pointers Makefile.am, 1.2, 1.3 mouse_pointer.cxx, 1.3, 1.4
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/sound sound_real.cxx, 1.9, 1.10 sound_res_mgr.cxx, 1.3, 1.4
- Index(es):