[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs Makefile.am,1.1,1.2 bumper
|
From: |
torangan |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs Makefile.am,1.1,1.2 bumper_obj.cxx,1.3,1.4 bumper_obj.hxx,1.2,1.3 fake_exit_obj.cxx,1.3,1.4 fake_exit_obj.hxx,1.2,1.3 guillotine_obj.cxx,1.3,1.4 guillotine_obj.hxx,1.2,1.3 hammer_obj.cxx,1.3,1.4 hammer_obj.hxx,1.2,1.3 laser_exit_obj.cxx,1.3,1.4 laser_exit_obj.hxx,1.2,1.3 smasher_obj.cxx,1.3,1.4 smasher_obj.hxx,1.2,1.3 spike_obj.cxx,1.3,1.4 spike_obj.hxx,1.2,1.3 |
|
Date: |
9 Sep 2002 16:13:47 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editorobjs
In directory dark:/tmp/cvs-serv6312/editorobjs
Modified Files:
Makefile.am bumper_obj.cxx bumper_obj.hxx fake_exit_obj.cxx
fake_exit_obj.hxx guillotine_obj.cxx guillotine_obj.hxx
hammer_obj.cxx hammer_obj.hxx laser_exit_obj.cxx
laser_exit_obj.hxx smasher_obj.cxx smasher_obj.hxx
spike_obj.cxx spike_obj.hxx
Log Message:
split teleporter, some cleanup/cosmetic changes
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am 4 Sep 2002 14:55:12 -0000 1.1
+++ Makefile.am 9 Sep 2002 16:13:44 -0000 1.2
@@ -18,12 +18,14 @@
noinst_LIBRARIES = libpingus_editorobjs.a
libpingus_editorobjs_a_SOURCES = \
- bumper_obj.cxx bumper_obj.hxx \
- fake_exit_obj.cxx fake_exit_obj.hxx \
- guillotine_obj.cxx guillotine_obj.hxx \
- hammer_obj.cxx hammer_obj.hxx \
- laser_exit_obj.cxx laser_exit_obj.hxx \
- smasher_obj.cxx smasher_obj.hxx \
- spike_obj.cxx spike_obj.hxx
+ bumper_obj.cxx bumper_obj.hxx \
+ fake_exit_obj.cxx fake_exit_obj.hxx \
+ guillotine_obj.cxx guillotine_obj.hxx \
+ hammer_obj.cxx hammer_obj.hxx \
+ laser_exit_obj.cxx laser_exit_obj.hxx \
+ smasher_obj.cxx smasher_obj.hxx \
+ spike_obj.cxx spike_obj.hxx \
+ teleporter_obj.cxx teleporter_obj.hxx \
+ teleporter_target_obj.cxx teleporter_target_obj.cxx
# EOF #
Index: bumper_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/bumper_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bumper_obj.cxx 9 Sep 2002 09:38:47 -0000 1.3
+++ bumper_obj.cxx 9 Sep 2002 16:13:44 -0000 1.4
@@ -24,55 +24,53 @@
namespace EditorObjs {
- BumperObj::BumperObj (WorldObjsData::BumperData* data_) :
SpriteEditorObj(data_->pos),
- frame(0),
- data(new
WorldObjsData::BumperData(*data_))
- {
- data->pos.z = -100;
- sprite = Sprite("Traps/bumper", "traps");
- sprite.set_align_center_bottom ();
- }
-
- BumperObj::~BumperObj ()
- {
- delete data;
- }
-
+BumperObj::BumperObj (WorldObjsData::BumperData* data_) :
SpriteEditorObj(data_->pos),
+ frame(0),
+ data(new
WorldObjsData::BumperData(*data_))
+{
+ data->pos.z = -100;
+ sprite = Sprite("Traps/bumper", "traps");
+ sprite.set_align_center_bottom ();
+}
+
+BumperObj::~BumperObj ()
+{
+ delete data;
+}
+
EditorObjLst
BumperObj::create (const CL_Vector& pos)
{
- EditorObjLst lst;
- WorldObjsData::BumperData data;
- data.pos = pos;
- lst.push_back (new BumperObj (&data));
- return lst;
+ WorldObjsData::BumperData newdata;
+ newdata.pos = pos;
+ return EditorObjLst(1, new BumperObj(&newdata));
}
- EditorObj*
- BumperObj::duplicate ()
- {
- return new BumperObj(data);
- }
-
- void
- BumperObj::write_xml (std::ostream& xml)
- {
- data->write_xml(xml);
- }
-
- void
- BumperObj::draw (EditorView* view)
- {
- view->draw(sprite, data->pos, frame);
- }
-
- std::string
- BumperObj::status_line ()
- {
- char str[64];
- snprintf (str, 64, "BumperObj: %4.2fx%4.2fx%4.2f", data->pos.x,
data->pos.y, data->pos.z);
- return str;
- }
+EditorObj*
+BumperObj::duplicate ()
+{
+ return new BumperObj(data);
+}
+
+void
+BumperObj::write_xml (std::ostream& xml)
+{
+ data->write_xml(xml);
+}
+
+void
+BumperObj::draw (EditorView* view)
+{
+ view->draw(sprite, data->pos, frame);
+}
+
+std::string
+BumperObj::status_line ()
+{
+ char str[64];
+ snprintf (str, 64, "BumperObj: %4.2fx%4.2fx%4.2f", data->pos.x, data->pos.y,
data->pos.z);
+ return str;
+}
}
Index: bumper_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/bumper_obj.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bumper_obj.hxx 8 Sep 2002 18:13:04 -0000 1.2
+++ bumper_obj.hxx 9 Sep 2002 16:13:44 -0000 1.3
@@ -21,7 +21,6 @@
#define HEADER_PINGUS_EDITOROBJS_BUMPER_OBJ_HXX
#include "../editor/sprite_editorobj.hxx"
-#include "../worldobj_data.hxx"
namespace WorldObjsData {
class BumperData;
@@ -29,29 +28,29 @@
namespace EditorObjs {
- class BumperObj : public SpriteEditorObj
- {
- private:
- int frame;
- WorldObjsData::BumperData* const data;
-
- public:
- BumperObj (WorldObjsData::BumperData* data_);
- ~BumperObj ();
+class BumperObj : public SpriteEditorObj
+{
+ private:
+ int frame;
+ WorldObjsData::BumperData* const data;
+
+ public:
+ BumperObj (WorldObjsData::BumperData* data_);
+ ~BumperObj ();
static EditorObjLst create (const CL_Vector& pos);
- EditorObj* duplicate ();
-
- void write_xml (std::ostream& xml);
- void draw (EditorView* view);
-
- std::string status_line ();
+ EditorObj* duplicate ();
- private:
- BumperObj (const BumperObj&);
- BumperObj operator= (const BumperObj&);
- };
+ void write_xml (std::ostream& xml);
+ void draw (EditorView* view);
+
+ std::string status_line ();
+
+ private:
+ BumperObj (const BumperObj&);
+ BumperObj operator= (const BumperObj&);
+};
}
Index: fake_exit_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/fake_exit_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fake_exit_obj.cxx 9 Sep 2002 09:38:47 -0000 1.3
+++ fake_exit_obj.cxx 9 Sep 2002 16:13:44 -0000 1.4
@@ -24,55 +24,53 @@
namespace EditorObjs {
- FakeExitObj::FakeExitObj (WorldObjsData::FakeExitData* data_) :
SpriteEditorObj(data_->pos),
- frame(0),
- data(new
WorldObjsData::FakeExitData(*data_))
- {
- data->pos.z = -100;
- sprite = Sprite("Traps/fake_exit", "traps");
- sprite.set_align_center_bottom ();
- }
-
- FakeExitObj::~FakeExitObj ()
- {
- delete data;
- }
+FakeExitObj::FakeExitObj (WorldObjsData::FakeExitData* data_) :
SpriteEditorObj(data_->pos),
+ frame(0),
+ data(new
WorldObjsData::FakeExitData(*data_))
+{
+ data->pos.z = -100;
+ sprite = Sprite("Traps/fake_exit", "traps");
+ sprite.set_align_center_bottom ();
+}
+
+FakeExitObj::~FakeExitObj ()
+{
+ delete data;
+}
EditorObjLst
FakeExitObj::create (const CL_Vector& pos)
{
- EditorObjLst lst;
- WorldObjsData::FakeExitData data;
- data.pos = pos;
- lst.push_back (new FakeExitObj (&data));
- return lst;
+ WorldObjsData::FakeExitData newdata;
+ newdata.pos = pos;
+ return EditorObjLst(1, new FakeExitObj (&newdata));
}
- EditorObj*
- FakeExitObj::duplicate ()
- {
- return new FakeExitObj(data);
- }
-
- void
- FakeExitObj::write_xml (std::ostream& xml)
- {
- data->write_xml(xml);
- }
-
- void
- FakeExitObj::draw (EditorView* view)
- {
- view->draw(sprite, data->pos, frame);
- }
-
- std::string
- FakeExitObj::status_line ()
- {
- char str[64];
- snprintf (str, 64, "FakeExitObj: %4.2fx%4.2fx%4.2f", data->pos.x,
data->pos.y, data->pos.z);
- return str;
- }
+EditorObj*
+FakeExitObj::duplicate ()
+{
+ return new FakeExitObj(data);
+}
+
+void
+FakeExitObj::write_xml (std::ostream& xml)
+{
+ data->write_xml(xml);
+}
+
+void
+FakeExitObj::draw (EditorView* view)
+{
+ view->draw(sprite, data->pos, frame);
+}
+
+std::string
+FakeExitObj::status_line ()
+{
+ char str[64];
+ snprintf (str, 64, "FakeExitObj: %4.2fx%4.2fx%4.2f", data->pos.x,
data->pos.y, data->pos.z);
+ return str;
+}
}
Index: fake_exit_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/fake_exit_obj.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fake_exit_obj.hxx 8 Sep 2002 18:13:04 -0000 1.2
+++ fake_exit_obj.hxx 9 Sep 2002 16:13:44 -0000 1.3
@@ -21,7 +21,6 @@
#define HEADER_PINGUS_EDITOROBJS_FAKE_EXIT_OBJ_HXX
#include "../editor/sprite_editorobj.hxx"
-#include "../worldobj_data.hxx"
namespace WorldObjsData {
class FakeExitData;
@@ -29,29 +28,29 @@
namespace EditorObjs {
- class FakeExitObj : public SpriteEditorObj
- {
- private:
- int frame;
- WorldObjsData::FakeExitData* const data;
-
- public:
- FakeExitObj (WorldObjsData::FakeExitData* data_);
- ~FakeExitObj ();
-
+class FakeExitObj : public SpriteEditorObj
+{
+ private:
+ int frame;
+ WorldObjsData::FakeExitData* const data;
+
+ public:
+ FakeExitObj (WorldObjsData::FakeExitData* data_);
+ ~FakeExitObj ();
+
static EditorObjLst create (const CL_Vector& pos);
- EditorObj* duplicate ();
-
- void write_xml (std::ostream& xml);
- void draw (EditorView* view);
-
- std::string status_line ();
+ EditorObj* duplicate ();
- private:
- FakeExitObj (const FakeExitObj&);
- FakeExitObj operator= (const FakeExitObj&);
- };
+ void write_xml (std::ostream& xml);
+ void draw (EditorView* view);
+
+ std::string status_line ();
+
+ private:
+ FakeExitObj (const FakeExitObj&);
+ FakeExitObj operator= (const FakeExitObj&);
+};
}
Index: guillotine_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/guillotine_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- guillotine_obj.cxx 9 Sep 2002 09:38:47 -0000 1.3
+++ guillotine_obj.cxx 9 Sep 2002 16:13:44 -0000 1.4
@@ -24,54 +24,52 @@
namespace EditorObjs {
- GuillotineObj::GuillotineObj (WorldObjsData::GuillotineData* data_) :
SpriteEditorObj(data_->pos),
-
frame(0),
-
data(new WorldObjsData::GuillotineData(*data_))
- {
- data->pos.z = -100;
- sprite = Sprite("Traps/guillotineidle", "traps");
- }
-
- GuillotineObj::~GuillotineObj ()
- {
- delete data;
- }
+GuillotineObj::GuillotineObj (WorldObjsData::GuillotineData* data_) :
SpriteEditorObj(data_->pos),
+ frame(0),
+ data(new
WorldObjsData::GuillotineData(*data_))
+{
+ data->pos.z = -100;
+ sprite = Sprite("Traps/guillotineidle", "traps");
+}
+
+GuillotineObj::~GuillotineObj ()
+{
+ delete data;
+}
EditorObjLst
GuillotineObj::create (const CL_Vector& pos)
{
- EditorObjLst lst;
- WorldObjsData::GuillotineData data;
- data.pos = pos;
- lst.push_back (new GuillotineObj (&data));
- return lst;
+ WorldObjsData::GuillotineData newdata;
+ newdata.pos = pos;
+ return EditorObjLst(1, new GuillotineObj(&newdata));
}
- EditorObj*
- GuillotineObj::duplicate ()
- {
- return new GuillotineObj(data);
- }
-
- void
- GuillotineObj::write_xml (std::ostream& xml)
- {
- data->write_xml(xml);
- }
-
- void
- GuillotineObj::draw (EditorView* view)
- {
- view->draw(sprite, data->pos, frame);
- }
+EditorObj*
+GuillotineObj::duplicate ()
+{
+ return new GuillotineObj(data);
+}
- std::string
- GuillotineObj::status_line ()
- {
- char str[64];
- snprintf (str, 64, "GuillotineObj: %4.2fx%4.2fx%4.2f", data->pos.x,
data->pos.y, data->pos.z);
- return str;
- }
+void
+GuillotineObj::write_xml (std::ostream& xml)
+{
+ data->write_xml(xml);
+}
+
+void
+GuillotineObj::draw (EditorView* view)
+{
+ view->draw(sprite, data->pos, frame);
+}
+
+std::string
+GuillotineObj::status_line ()
+{
+ char str[64];
+ snprintf (str, 64, "GuillotineObj: %4.2fx%4.2fx%4.2f", data->pos.x,
data->pos.y, data->pos.z);
+ return str;
+}
}
Index: guillotine_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/guillotine_obj.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- guillotine_obj.hxx 8 Sep 2002 18:13:04 -0000 1.2
+++ guillotine_obj.hxx 9 Sep 2002 16:13:44 -0000 1.3
@@ -21,7 +21,6 @@
#define HEADER_PINGUS_EDITOROBJS_GUILLOTINE_OBJ_HXX
#include "../editor/sprite_editorobj.hxx"
-#include "../worldobj_data.hxx"
namespace WorldObjsData {
class GuillotineData;
@@ -29,29 +28,29 @@
namespace EditorObjs {
- class GuillotineObj : public SpriteEditorObj
- {
- private:
- int frame;
- WorldObjsData::GuillotineData* const data;
-
- public:
- GuillotineObj (WorldObjsData::GuillotineData* data_);
- ~GuillotineObj ();
-
+class GuillotineObj : public SpriteEditorObj
+{
+ private:
+ int frame;
+ WorldObjsData::GuillotineData* const data;
+
+ public:
+ GuillotineObj (WorldObjsData::GuillotineData* data_);
+ ~GuillotineObj ();
+
static EditorObjLst create (const CL_Vector& pos);
- EditorObj* duplicate ();
-
- void write_xml (std::ostream& xml);
- void draw (EditorView* view);
-
- std::string status_line ();
+ EditorObj* duplicate ();
- private:
- GuillotineObj (const GuillotineObj&);
- GuillotineObj operator= (const GuillotineObj&);
- };
+ void write_xml (std::ostream& xml);
+ void draw (EditorView* view);
+
+ std::string status_line ();
+
+ private:
+ GuillotineObj (const GuillotineObj&);
+ GuillotineObj operator= (const GuillotineObj&);
+};
}
Index: hammer_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/hammer_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hammer_obj.cxx 9 Sep 2002 09:38:47 -0000 1.3
+++ hammer_obj.cxx 9 Sep 2002 16:13:44 -0000 1.4
@@ -24,55 +24,53 @@
namespace EditorObjs {
- HammerObj::HammerObj (WorldObjsData::HammerData* data_) :
SpriteEditorObj(data_->pos),
- frame(0),
- data(new
WorldObjsData::HammerData(*data_))
- {
- data->pos.z = -100;
- sprite = Sprite("Traps/hammer", "traps");
- sprite.set_align_center_bottom ();
- }
-
- HammerObj::~HammerObj ()
- {
- delete data;
- }
-
- EditorObj*
- HammerObj::duplicate ()
- {
- return new HammerObj(data);
- }
+HammerObj::HammerObj (WorldObjsData::HammerData* data_) :
SpriteEditorObj(data_->pos),
+ frame(0),
+ data(new
WorldObjsData::HammerData(*data_))
+{
+ data->pos.z = -100;
+ sprite = Sprite("Traps/hammer", "traps");
+ sprite.set_align_center_bottom ();
+}
+
+HammerObj::~HammerObj ()
+{
+ delete data;
+}
+
+EditorObj*
+HammerObj::duplicate ()
+{
+ return new HammerObj(data);
+}
EditorObjLst
HammerObj::create (const CL_Vector& pos)
{
- EditorObjLst lst;
WorldObjsData::HammerData hammer_data;
hammer_data.pos = pos;
- lst.push_back (new HammerObj (&hammer_data));
- return lst;
+ return EditorObjLst(1, new HammerObj(&hammer_data));
}
- void
- HammerObj::write_xml (std::ostream& xml)
- {
- data->write_xml(xml);
- }
-
- void
- HammerObj::draw (EditorView* view)
- {
- view->draw(sprite, data->pos, frame);
- }
+void
+HammerObj::write_xml (std::ostream& xml)
+{
+ data->write_xml(xml);
+}
- std::string
- HammerObj::status_line ()
- {
- char str[64];
- snprintf (str, 64, "HammerObj: %4.2fx%4.2fx%4.2f", data->pos.x,
data->pos.y, data->pos.z);
- return str;
- }
+void
+HammerObj::draw (EditorView* view)
+{
+ view->draw(sprite, data->pos, frame);
+}
+
+std::string
+HammerObj::status_line ()
+{
+ char str[64];
+ snprintf (str, 64, "HammerObj: %4.2fx%4.2fx%4.2f", data->pos.x, data->pos.y,
data->pos.z);
+ return str;
+}
}
Index: hammer_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/hammer_obj.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hammer_obj.hxx 8 Sep 2002 18:13:04 -0000 1.2
+++ hammer_obj.hxx 9 Sep 2002 16:13:44 -0000 1.3
@@ -21,7 +21,6 @@
#define HEADER_PINGUS_EDITOROBJS_HAMMER_OBJ_HXX
#include "../editor/sprite_editorobj.hxx"
-#include "../worldobj_data.hxx"
namespace WorldObjsData {
class HammerData;
@@ -29,29 +28,29 @@
namespace EditorObjs {
- class HammerObj : public SpriteEditorObj
- {
- private:
- int frame;
- WorldObjsData::HammerData* const data;
-
- public:
- HammerObj (WorldObjsData::HammerData* data_);
- ~HammerObj ();
-
+class HammerObj : public SpriteEditorObj
+{
+ private:
+ int frame;
+ WorldObjsData::HammerData* const data;
+
+ public:
+ HammerObj (WorldObjsData::HammerData* data_);
+ ~HammerObj ();
+
static EditorObjLst create (const CL_Vector& pos);
- EditorObj* duplicate ();
-
- void write_xml (std::ostream& xml);
- void draw (EditorView* view);
-
- std::string status_line ();
+ EditorObj* duplicate ();
- private:
- HammerObj (const HammerObj&);
- HammerObj operator= (const HammerObj&);
- };
+ void write_xml (std::ostream& xml);
+ void draw (EditorView* view);
+
+ std::string status_line ();
+
+ private:
+ HammerObj (const HammerObj&);
+ HammerObj operator= (const HammerObj&);
+};
}
Index: laser_exit_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/laser_exit_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- laser_exit_obj.cxx 9 Sep 2002 09:38:47 -0000 1.3
+++ laser_exit_obj.cxx 9 Sep 2002 16:13:44 -0000 1.4
@@ -24,55 +24,53 @@
namespace EditorObjs {
- LaserExitObj::LaserExitObj (WorldObjsData::LaserExitData* data_) :
SpriteEditorObj(data_->pos),
- frame(0),
- data(new
WorldObjsData::LaserExitData(*data_))
- {
- data->pos.z = -100;
- sprite = Sprite("Traps/laser_exit", "traps");
- sprite.set_align_center_bottom ();
- }
-
- LaserExitObj::~LaserExitObj ()
- {
- delete data;
- }
+LaserExitObj::LaserExitObj (WorldObjsData::LaserExitData* data_) :
SpriteEditorObj(data_->pos),
+ frame(0),
+ data(new
WorldObjsData::LaserExitData(*data_))
+{
+ data->pos.z = -100;
+ sprite = Sprite("Traps/laser_exit", "traps");
+ sprite.set_align_center_bottom ();
+}
+
+LaserExitObj::~LaserExitObj ()
+{
+ delete data;
+}
EditorObjLst
LaserExitObj::create (const CL_Vector& pos)
{
- EditorObjLst lst;
- WorldObjsData::LaserExitData data;
- data.pos = pos;
- lst.push_back (new LaserExitObj (&data));
- return lst;
+ WorldObjsData::LaserExitData newdata;
+ newdata.pos = pos;
+ return EditorObjLst(1, new LaserExitObj(&newdata));
}
EditorObj*
- LaserExitObj::duplicate ()
- {
- return new LaserExitObj(data);
- }
-
- void
- LaserExitObj::write_xml (std::ostream& xml)
- {
- data->write_xml(xml);
- }
-
- void
- LaserExitObj::draw (EditorView* view)
- {
- view->draw(sprite, data->pos, frame);
- }
+LaserExitObj::duplicate ()
+{
+ return new LaserExitObj(data);
+}
- std::string
- LaserExitObj::status_line ()
- {
- char str[64];
- snprintf (str, 64, "LaserExitObj: %4.2fx%4.2fx%4.2f", data->pos.x,
data->pos.y, data->pos.z);
- return str;
- }
+void
+LaserExitObj::write_xml (std::ostream& xml)
+{
+ data->write_xml(xml);
+}
+
+void
+LaserExitObj::draw (EditorView* view)
+{
+ view->draw(sprite, data->pos, frame);
+}
+
+std::string
+LaserExitObj::status_line ()
+{
+ char str[64];
+ snprintf (str, 64, "LaserExitObj: %4.2fx%4.2fx%4.2f", data->pos.x,
data->pos.y, data->pos.z);
+ return str;
+}
}
Index: laser_exit_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/laser_exit_obj.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- laser_exit_obj.hxx 8 Sep 2002 18:13:04 -0000 1.2
+++ laser_exit_obj.hxx 9 Sep 2002 16:13:44 -0000 1.3
@@ -21,7 +21,6 @@
#define HEADER_PINGUS_EDITOROBJS_LASER_EXIT_OBJ_HXX
#include "../editor/sprite_editorobj.hxx"
-#include "../worldobj_data.hxx"
namespace WorldObjsData {
class LaserExitData;
@@ -29,30 +28,30 @@
namespace EditorObjs {
- class LaserExitObj : public SpriteEditorObj
- {
- private:
- int frame;
- WorldObjsData::LaserExitData* const data;
-
- public:
- LaserExitObj (WorldObjsData::LaserExitData* data_);
- ~LaserExitObj ();
+class LaserExitObj : public SpriteEditorObj
+{
+ private:
+ int frame;
+ WorldObjsData::LaserExitData* const data;
+
+ public:
+ LaserExitObj (WorldObjsData::LaserExitData* data_);
+ ~LaserExitObj ();
static EditorObjLst create (const CL_Vector& pos);
-
- EditorObj* duplicate ();
-
- void write_xml (std::ostream& xml);
- void draw (EditorView* view);
-
- std::string status_line ();
+
+ EditorObj* duplicate ();
- private:
- LaserExitObj (const LaserExitObj&);
- LaserExitObj operator= (const LaserExitObj&);
- };
+ void write_xml (std::ostream& xml);
+ void draw (EditorView* view);
+
+ std::string status_line ();
+
+ private:
+ LaserExitObj (const LaserExitObj&);
+ LaserExitObj operator= (const LaserExitObj&);
+};
}
Index: smasher_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/smasher_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- smasher_obj.cxx 9 Sep 2002 09:38:47 -0000 1.3
+++ smasher_obj.cxx 9 Sep 2002 16:13:44 -0000 1.4
@@ -24,54 +24,52 @@
namespace EditorObjs {
- SmasherObj::SmasherObj (WorldObjsData::SmasherData* data_) :
SpriteEditorObj(data_->pos),
- frame(0),
- data(new
WorldObjsData::SmasherData(*data_))
- {
- data->pos.z = -100;
- sprite = Sprite("Traps/smasher", "traps");
- }
-
- SmasherObj::~SmasherObj ()
- {
- delete data;
- }
+SmasherObj::SmasherObj (WorldObjsData::SmasherData* data_) :
SpriteEditorObj(data_->pos),
+ frame(0),
+ data(new
WorldObjsData::SmasherData(*data_))
+{
+ data->pos.z = -100;
+ sprite = Sprite("Traps/smasher", "traps");
+}
+
+SmasherObj::~SmasherObj ()
+{
+ delete data;
+}
EditorObjLst
SmasherObj::create (const CL_Vector& pos)
{
- EditorObjLst lst;
WorldObjsData::SmasherData smasher_data;
smasher_data.pos = pos;
- lst.push_back (new SmasherObj (&smasher_data));
- return lst;
+ return EditorObjLst(1, new SmasherObj(&smasher_data));
}
- EditorObj*
- SmasherObj::duplicate ()
- {
- return new SmasherObj(data);
- }
-
- void
- SmasherObj::write_xml (std::ostream& xml)
- {
- data->write_xml(xml);
- }
-
- void
- SmasherObj::draw (EditorView* view)
- {
- view->draw(sprite, data->pos, frame);
- }
+EditorObj*
+SmasherObj::duplicate ()
+{
+ return new SmasherObj(data);
+}
- std::string
- SmasherObj::status_line ()
- {
- char str[64];
- snprintf (str, 64, "SmasherObj: %4.2fx%4.2fx%4.2f", data->pos.x,
data->pos.y, data->pos.z);
- return str;
- }
+void
+SmasherObj::write_xml (std::ostream& xml)
+{
+ data->write_xml(xml);
+}
+
+void
+SmasherObj::draw (EditorView* view)
+{
+ view->draw(sprite, data->pos, frame);
+}
+
+std::string
+SmasherObj::status_line ()
+{
+ char str[64];
+ snprintf (str, 64, "SmasherObj: %4.2fx%4.2fx%4.2f", data->pos.x,
data->pos.y, data->pos.z);
+ return str;
+}
}
Index: smasher_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/smasher_obj.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- smasher_obj.hxx 8 Sep 2002 18:13:04 -0000 1.2
+++ smasher_obj.hxx 9 Sep 2002 16:13:44 -0000 1.3
@@ -21,7 +21,6 @@
#define HEADER_PINGUS_EDITOROBJS_SMASHER_OBJ_HXX
#include "../editor/sprite_editorobj.hxx"
-#include "../worldobj_data.hxx"
namespace WorldObjsData {
class SmasherData;
@@ -29,29 +28,29 @@
namespace EditorObjs {
- class SmasherObj : public SpriteEditorObj
- {
- private:
- int frame;
- WorldObjsData::SmasherData* const data;
-
- public:
- SmasherObj (WorldObjsData::SmasherData* data_);
- ~SmasherObj ();
+class SmasherObj : public SpriteEditorObj
+{
+ private:
+ int frame;
+ WorldObjsData::SmasherData* const data;
+
+ public:
+ SmasherObj (WorldObjsData::SmasherData* data_);
+ ~SmasherObj ();
static EditorObjLst create (const CL_Vector& pos);
-
- EditorObj* duplicate ();
-
- void write_xml (std::ostream& xml);
- void draw (EditorView* view);
-
- std::string status_line ();
+
+ EditorObj* duplicate ();
- private:
- SmasherObj (const SmasherObj&);
- SmasherObj operator= (const SmasherObj&);
- };
+ void write_xml (std::ostream& xml);
+ void draw (EditorView* view);
+
+ std::string status_line ();
+
+ private:
+ SmasherObj (const SmasherObj&);
+ SmasherObj operator= (const SmasherObj&);
+};
}
Index: spike_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/spike_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- spike_obj.cxx 9 Sep 2002 09:38:47 -0000 1.3
+++ spike_obj.cxx 9 Sep 2002 16:13:44 -0000 1.4
@@ -24,54 +24,52 @@
namespace EditorObjs {
- SpikeObj::SpikeObj (WorldObjsData::SpikeData* data_) :
SpriteEditorObj(data_->pos),
- frame(0),
- data(new
WorldObjsData::SpikeData(*data_))
- {
- data->pos.z = -100;
- sprite = Sprite("Traps/spike", "traps");
- }
-
- SpikeObj::~SpikeObj ()
- {
- delete data;
- }
+SpikeObj::SpikeObj (WorldObjsData::SpikeData* data_) :
SpriteEditorObj(data_->pos),
+ frame(0),
+ data(new
WorldObjsData::SpikeData(*data_))
+{
+ data->pos.z = -100;
+ sprite = Sprite("Traps/spike", "traps");
+}
+
+SpikeObj::~SpikeObj ()
+{
+ delete data;
+}
EditorObjLst
SpikeObj::create (const CL_Vector& pos)
{
- EditorObjLst lst;
WorldObjsData::SpikeData spike_data;
spike_data.pos = pos;
- lst.push_back (new SpikeObj (&spike_data));
- return lst;
+ return EditorObjLst(1, new SpikeObj (&spike_data));
}
- EditorObj*
- SpikeObj::duplicate ()
- {
- return new SpikeObj(data);
- }
-
- void
- SpikeObj::write_xml (std::ostream& xml)
- {
- data->write_xml(xml);
- }
-
- void
- SpikeObj::draw (EditorView* view)
- {
- view->draw(sprite, data->pos, frame);
- }
+EditorObj*
+SpikeObj::duplicate ()
+{
+ return new SpikeObj(data);
+}
- std::string
- SpikeObj::status_line ()
- {
- char str[64];
- snprintf (str, 64, "SpikeObj: %4.2fx%4.2fx%4.2f", data->pos.x,
data->pos.y, data->pos.z);
- return str;
- }
+void
+SpikeObj::write_xml (std::ostream& xml)
+{
+ data->write_xml(xml);
+}
+
+void
+SpikeObj::draw (EditorView* view)
+{
+ view->draw(sprite, data->pos, frame);
+}
+
+std::string
+SpikeObj::status_line ()
+{
+ char str[64];
+ snprintf (str, 64, "SpikeObj: %4.2fx%4.2fx%4.2f", data->pos.x, data->pos.y,
data->pos.z);
+ return str;
+}
}
Index: spike_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/spike_obj.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- spike_obj.hxx 8 Sep 2002 18:13:04 -0000 1.2
+++ spike_obj.hxx 9 Sep 2002 16:13:44 -0000 1.3
@@ -21,7 +21,6 @@
#define HEADER_PINGUS_EDITOROBJS_SPIKE_OBJ_HXX
#include "../editor/sprite_editorobj.hxx"
-#include "../worldobj_data.hxx"
namespace WorldObjsData {
class SpikeData;
@@ -29,29 +28,29 @@
namespace EditorObjs {
- class SpikeObj : public SpriteEditorObj
- {
- private:
- int frame;
- WorldObjsData::SpikeData* const data;
-
- public:
- SpikeObj (WorldObjsData::SpikeData* data_);
- ~SpikeObj ();
-
+class SpikeObj : public SpriteEditorObj
+{
+ private:
+ int frame;
+ WorldObjsData::SpikeData* const data;
+
+ public:
+ SpikeObj (WorldObjsData::SpikeData* data_);
+ ~SpikeObj ();
+
static EditorObjLst create (const CL_Vector& pos);
- EditorObj* duplicate ();
-
- void write_xml (std::ostream& xml);
- void draw (EditorView* view);
-
- std::string status_line ();
+ EditorObj* duplicate ();
- private:
- SpikeObj (const SpikeObj&);
- SpikeObj operator= (const SpikeObj&);
- };
+ void write_xml (std::ostream& xml);
+ void draw (EditorView* view);
+
+ std::string status_line ();
+
+ private:
+ SpikeObj (const SpikeObj&);
+ SpikeObj operator= (const SpikeObj&);
+};
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editorobjs Makefile.am,1.1,1.2 bumper_obj.cxx,1.3,1.4 bumper_obj.hxx,1.2,1.3 fake_exit_obj.cxx,1.3,1.4 fake_exit_obj.hxx,1.2,1.3 guillotine_obj.cxx,1.3,1.4 guillotine_obj.hxx,1.2,1.3 hammer_obj.cxx,1.3,1.4 hammer_obj.hxx,1.2,1.3 laser_exit_obj.cxx,1.3,1.4 laser_exit_obj.hxx,1.2,1.3 smasher_obj.cxx,1.3,1.4 smasher_obj.hxx,1.2,1.3 spike_obj.cxx,1.3,1.4 spike_obj.hxx,1.2,1.3,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs teleporter.cxx,1.7,1.8 teleporter.hxx,1.10,1.11
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs fake_exit_obj.cxx,1.4,1.5 fake_exit_obj.hxx,1.3,1.4
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs teleporter.cxx,1.7,1.8 teleporter.hxx,1.10,1.11
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs fake_exit_obj.cxx,1.4,1.5 fake_exit_obj.hxx,1.3,1.4
- Index(es):