[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper_obj.cxx,1.6,1.7 bum
|
From: |
grumbel |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper_obj.cxx,1.6,1.7 bumper_obj.hxx,1.4,1.5 fake_exit_obj.cxx,1.7,1.8 fake_exit_obj.hxx,1.5,1.6 guillotine_obj.cxx,1.6,1.7 guillotine_obj.hxx,1.4,1.5 hammer_obj.cxx,1.6,1.7 hammer_obj.hxx,1.4,1.5 laser_exit_obj.cxx,1.6,1.7 laser_exit_obj.hxx,1.4,1.5 smasher_obj.cxx,1.5,1.6 smasher_obj.hxx,1.5,1.6 spike_obj.cxx,1.6,1.7 spike_obj.hxx,1.4,1.5 teleporter_obj.cxx,1.3,1.4 teleporter_obj.hxx,1.3,1.4 |
|
Date: |
11 Sep 2002 12:46:00 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editorobjs
In directory dark:/tmp/cvs-serv8556/src/editorobjs
Modified Files:
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
Log Message:
- removed Pingus namespace mostly
- paked most Editor stuff into EditorNS
- added namespace for ResourceModifier
Index: bumper_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/bumper_obj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bumper_obj.cxx 10 Sep 2002 19:24:19 -0000 1.6
+++ bumper_obj.cxx 11 Sep 2002 12:45:58 -0000 1.7
@@ -61,7 +61,7 @@
}
void
-BumperObj::draw (EditorView* view)
+BumperObj::draw (EditorNS::EditorView* view)
{
view->draw(sprite, data->pos, frame);
}
Index: bumper_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/bumper_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bumper_obj.hxx 10 Sep 2002 19:24:19 -0000 1.4
+++ bumper_obj.hxx 11 Sep 2002 12:45:58 -0000 1.5
@@ -43,7 +43,7 @@
EditorObj* duplicate ();
void write_xml (std::ostream& xml);
- void draw (EditorView* view);
+ void draw (EditorNS::EditorView* view);
std::string status_line ();
Index: fake_exit_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/fake_exit_obj.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fake_exit_obj.cxx 10 Sep 2002 19:24:19 -0000 1.7
+++ fake_exit_obj.cxx 11 Sep 2002 12:45:58 -0000 1.8
@@ -61,7 +61,7 @@
}
void
-FakeExitObj::draw (EditorView* view)
+FakeExitObj::draw (EditorNS::EditorView* view)
{
view->draw(sprite, data->pos, frame);
}
Index: fake_exit_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/fake_exit_obj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fake_exit_obj.hxx 10 Sep 2002 19:24:19 -0000 1.5
+++ fake_exit_obj.hxx 11 Sep 2002 12:45:58 -0000 1.6
@@ -43,7 +43,7 @@
EditorObj* duplicate ();
void write_xml (std::ostream& xml);
- void draw (EditorView* view);
+ void draw (EditorNS::EditorView* view);
std::string status_line ();
Index: guillotine_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/guillotine_obj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- guillotine_obj.cxx 10 Sep 2002 19:24:19 -0000 1.6
+++ guillotine_obj.cxx 11 Sep 2002 12:45:58 -0000 1.7
@@ -59,7 +59,7 @@
}
void
-GuillotineObj::draw (EditorView* view)
+GuillotineObj::draw (EditorNS::EditorView* view)
{
view->draw(sprite, data->pos, frame);
}
Index: guillotine_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/guillotine_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- guillotine_obj.hxx 10 Sep 2002 19:24:19 -0000 1.4
+++ guillotine_obj.hxx 11 Sep 2002 12:45:58 -0000 1.5
@@ -43,7 +43,7 @@
EditorObj* duplicate ();
void write_xml (std::ostream& xml);
- void draw (EditorView* view);
+ void draw (EditorNS::EditorView* view);
std::string status_line ();
Index: hammer_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/hammer_obj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hammer_obj.cxx 10 Sep 2002 19:24:19 -0000 1.6
+++ hammer_obj.cxx 11 Sep 2002 12:45:58 -0000 1.7
@@ -60,7 +60,7 @@
}
void
-HammerObj::draw (EditorView* view)
+HammerObj::draw (EditorNS::EditorView* view)
{
view->draw(sprite, data->pos, frame);
}
Index: hammer_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/hammer_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hammer_obj.hxx 10 Sep 2002 19:24:19 -0000 1.4
+++ hammer_obj.hxx 11 Sep 2002 12:45:58 -0000 1.5
@@ -24,7 +24,7 @@
namespace WorldObjsData {
class HammerData;
-}
+} // namespace WorldObjsData
namespace EditorObjs {
@@ -43,7 +43,7 @@
EditorObj* duplicate ();
void write_xml (std::ostream& xml);
- void draw (EditorView* view);
+ void draw (EditorNS::EditorView* view);
std::string status_line ();
Index: laser_exit_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/laser_exit_obj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- laser_exit_obj.cxx 10 Sep 2002 19:24:19 -0000 1.6
+++ laser_exit_obj.cxx 11 Sep 2002 12:45:58 -0000 1.7
@@ -60,7 +60,7 @@
}
void
-LaserExitObj::draw (EditorView* view)
+LaserExitObj::draw (EditorNS::EditorView* view)
{
view->draw(sprite, data->pos, frame);
}
Index: laser_exit_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/laser_exit_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- laser_exit_obj.hxx 10 Sep 2002 19:24:19 -0000 1.4
+++ laser_exit_obj.hxx 11 Sep 2002 12:45:58 -0000 1.5
@@ -44,7 +44,7 @@
EditorObj* duplicate ();
void write_xml (std::ostream& xml);
- void draw (EditorView* view);
+ void draw (EditorNS::EditorView* view);
std::string status_line ();
Index: smasher_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/smasher_obj.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- smasher_obj.cxx 10 Sep 2002 14:33:07 -0000 1.5
+++ smasher_obj.cxx 11 Sep 2002 12:45:58 -0000 1.6
@@ -59,7 +59,7 @@
}
void
-SmasherObj::draw (EditorView* view)
+SmasherObj::draw (EditorNS::EditorView* view)
{
view->draw(sprite, data->pos, frame);
}
Index: smasher_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/smasher_obj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- smasher_obj.hxx 10 Sep 2002 19:24:19 -0000 1.5
+++ smasher_obj.hxx 11 Sep 2002 12:45:58 -0000 1.6
@@ -43,7 +43,7 @@
EditorObj* duplicate ();
void write_xml (std::ostream& xml);
- void draw (EditorView* view);
+ void draw (EditorNS::EditorView* view);
std::string status_line ();
Index: spike_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/spike_obj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- spike_obj.cxx 10 Sep 2002 19:24:19 -0000 1.6
+++ spike_obj.cxx 11 Sep 2002 12:45:58 -0000 1.7
@@ -59,7 +59,7 @@
}
void
-SpikeObj::draw (EditorView* view)
+SpikeObj::draw (EditorNS::EditorView* view)
{
view->draw(sprite, data->pos, frame);
}
Index: spike_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/spike_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- spike_obj.hxx 10 Sep 2002 19:24:19 -0000 1.4
+++ spike_obj.hxx 11 Sep 2002 12:45:58 -0000 1.5
@@ -43,7 +43,7 @@
EditorObj* duplicate ();
void write_xml (std::ostream& xml);
- void draw (EditorView* view);
+ void draw (EditorNS::EditorView* view);
std::string status_line ();
Index: teleporter_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/teleporter_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- teleporter_obj.cxx 10 Sep 2002 14:33:07 -0000 1.3
+++ teleporter_obj.cxx 11 Sep 2002 12:45:58 -0000 1.4
@@ -61,7 +61,7 @@
}
void
-TeleporterObj::draw (EditorView * view)
+TeleporterObj::draw (EditorNS::EditorView * view)
{
//std::cout << "Drawing line" << std::endl;
view->draw_line (static_cast<int>(data->pos.x),
Index: teleporter_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/teleporter_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- teleporter_obj.hxx 10 Sep 2002 19:24:19 -0000 1.3
+++ teleporter_obj.hxx 11 Sep 2002 12:45:58 -0000 1.4
@@ -22,7 +22,9 @@
#include "../editor/sprite_editorobj.hxx"
+namespace EditorNS {
class EditorView;
+} // namespace EditorNS
namespace WorldObjsData {
class TeleporterData;
@@ -51,7 +53,7 @@
for the editor */
static EditorObjLst create (const CL_Vector& pos);
- void draw (EditorView * view);
+ void draw (EditorNS::EditorView * view);
std::string status_line ();
private:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper_obj.cxx,1.6,1.7 bumper_obj.hxx,1.4,1.5 fake_exit_obj.cxx,1.7,1.8 fake_exit_obj.hxx,1.5,1.6 guillotine_obj.cxx,1.6,1.7 guillotine_obj.hxx,1.4,1.5 hammer_obj.cxx,1.6,1.7 hammer_obj.hxx,1.4,1.5 laser_exit_obj.cxx,1.6,1.7 laser_exit_obj.hxx,1.4,1.5 smasher_obj.cxx,1.5,1.6 smasher_obj.hxx,1.5,1.6 spike_obj.cxx,1.6,1.7 spike_obj.hxx,1.4,1.5 teleporter_obj.cxx,1.3,1.4 teleporter_obj.hxx,1.3,1.4,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap graph.cxx,1.6,1.7 graph.hxx,1.9,1.10 manager.cxx,1.10,1.11 manager.hxx,1.10,1.11 node.cxx,1.7,1.8 node.hxx,1.6,1.7 node_data.cxx,1.4,1.5 node_data.hxx,1.7,1.8 pingus.cxx,1.8,1.9 pingus.hxx,1.10,1.11 stat.cxx,1.8,1.9 stat.hxx,1.6,1.7 worldmap.cxx,1.11,1.12 worldmap.hxx,1.10,1.11
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src action_button.hxx,1.10,1.11 blitter.cxx,1.13,1.14 client.hxx,1.15,1.16 console.cxx,1.9,1.10 display_graphic_context.cxx,1.3,1.4 fade_out.cxx,1.3,1.4 math.hxx,1.3,1.4 multiline_text.cxx,1.4,1.5 pingus.hxx,1.1,1.2 pingus_main.cxx,1.13,1.14 pingus_resource.cxx,1.15,1.16 pingus_resource.hxx,1.8,1.9 range.hxx,1.4,1.5 res_descriptor.cxx,1.9,1.10 res_descriptor.hxx,1.7,1.8 resource_modifier.cxx,1.1,1.2 resource_modifier.hxx,1.3,1.4 screen.cxx,1.1,1.2 smallmap.cxx,1.14,1.15 spot_map.cxx,1.11,1.12 story.cxx,1.9,1.10 surface_button.cxx,1.13,1.14 xml_helper.cxx,1.15,1.16
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap graph.cxx,1.6,1.7 graph.hxx,1.9,1.10 manager.cxx,1.10,1.11 manager.hxx,1.10,1.11 node.cxx,1.7,1.8 node.hxx,1.6,1.7 node_data.cxx,1.4,1.5 node_data.hxx,1.7,1.8 pingus.cxx,1.8,1.9 pingus.hxx,1.10,1.11 stat.cxx,1.8,1.9 stat.hxx,1.6,1.7 worldmap.cxx,1.11,1.12 worldmap.hxx,1.10,1.11
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src action_button.hxx,1.10,1.11 blitter.cxx,1.13,1.14 client.hxx,1.15,1.16 console.cxx,1.9,1.10 display_graphic_context.cxx,1.3,1.4 fade_out.cxx,1.3,1.4 math.hxx,1.3,1.4 multiline_text.cxx,1.4,1.5 pingus.hxx,1.1,1.2 pingus_main.cxx,1.13,1.14 pingus_resource.cxx,1.15,1.16 pingus_resource.hxx,1.8,1.9 range.hxx,1.4,1.5 res_descriptor.cxx,1.9,1.10 res_descriptor.hxx,1.7,1.8 resource_modifier.cxx,1.1,1.2 resource_modifier.hxx,1.3,1.4 screen.cxx,1.1,1.2 smallmap.cxx,1.14,1.15 spot_map.cxx,1.11,1.12 story.cxx,1.9,1.10 surface_button.cxx,1.13,1.14 xml_helper.cxx,1.15,1.16
- Index(es):