[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editor action_window.cxx,1.8,1.9 acti
|
From: |
grumbel |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editor action_window.cxx,1.8,1.9 action_window.hxx,1.6,1.7 editor.cxx,1.29,1.30 editor.hxx,1.15,1.16 editor_event.cxx,1.31,1.32 editor_event.hxx,1.13,1.14 editor_groundpiece_obj.cxx,1.11,1.12 editor_groundpiece_obj.hxx,1.8,1.9 editor_view.cxx,1.2,1.3 editor_view.hxx,1.4,1.5 editorobj.cxx,1.4,1.5 editorobj.hxx,1.14,1.15 editorobj_group.cxx,1.4,1.5 editorobj_group.hxx,1.9,1.10 entrance_window.cxx,1.3,1.4 entrance_window.hxx,1.5,1.6 groundpiece_window.cxx,1.7,1.8 groundpiece_window.hxx,1.7,1.8 level_property_window.cxx,1.9,1.10 level_property_window.hxx,1.6,1.7 object_manager.cxx,1.27,1.28 object_manager.hxx,1.16,1.17 object_selector.cxx,1.12,1.13 object_selector.hxx,1.9,1.10 panel.cxx,1.4,1.5 panel.hxx,1.6,1.7 panel_icons.cxx,1.4,1.5 panel_icons.hxx,1.5,1.6 plfobj.cxx,1.11,1.12 plfobj.hxx,1.9,1.10 property_frame.cxx,1.1,1.2 property_frame.hxx,1.4,1.5 property_window.cxx,1.9,1.10 property_window.hxx,1.6,1.7 rect_editorobj.cxx,1.4,1.5 rect_editorobj.hxx,1.4,1.5 scroll_map.cxx,1.3,1.4 scroll_map.hxx,1.3,1.4 selection.cxx,1.12,1.13 selection.hxx,1.8,1.9 sprite_editorobj.cxx,1.5,1.6 sprite_editorobj.hxx,1.5,1.6 status_line.cxx,1.7,1.8 status_line.hxx,1.8,1.9 thumb_cache.cxx,1.9,1.10 thumb_cache.hxx,1.6,1.7 weather_obj.cxx,1.7,1.8 weather_obj.hxx,1.6,1.7 |
|
Date: |
11 Sep 2002 12:46:01 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv8556/src/editor
Modified Files:
action_window.cxx action_window.hxx editor.cxx editor.hxx
editor_event.cxx editor_event.hxx editor_groundpiece_obj.cxx
editor_groundpiece_obj.hxx editor_view.cxx editor_view.hxx
editorobj.cxx editorobj.hxx editorobj_group.cxx
editorobj_group.hxx entrance_window.cxx entrance_window.hxx
groundpiece_window.cxx groundpiece_window.hxx
level_property_window.cxx level_property_window.hxx
object_manager.cxx object_manager.hxx object_selector.cxx
object_selector.hxx panel.cxx panel.hxx panel_icons.cxx
panel_icons.hxx plfobj.cxx plfobj.hxx property_frame.cxx
property_frame.hxx property_window.cxx property_window.hxx
rect_editorobj.cxx rect_editorobj.hxx scroll_map.cxx
scroll_map.hxx selection.cxx selection.hxx
sprite_editorobj.cxx sprite_editorobj.hxx status_line.cxx
status_line.hxx thumb_cache.cxx thumb_cache.hxx
weather_obj.cxx weather_obj.hxx
Log Message:
- removed Pingus namespace mostly
- paked most Editor stuff into EditorNS
- added namespace for ResourceModifier
Index: action_window.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/action_window.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- action_window.cxx 25 Aug 2002 09:08:49 -0000 1.8
+++ action_window.cxx 11 Sep 2002 12:45:58 -0000 1.9
@@ -40,6 +40,8 @@
using namespace Actions;
+namespace EditorNS {
+
ActionWindow::ActionWindow (CL_Component* arg_parent, std::vector<ActionData>*
arg_actions)
: parent (arg_parent), actions (arg_actions)
{
@@ -169,5 +171,7 @@
}
}
}
+
+} // namespace EditorNS
/* EOF */
Index: action_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/action_window.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- action_window.hxx 23 Aug 2002 15:49:54 -0000 1.6
+++ action_window.hxx 11 Sep 2002 12:45:58 -0000 1.7
@@ -30,6 +30,8 @@
class CL_InputBox;
class CL_Component;
+namespace EditorNS {
+
class ActionWindow
{
private:
@@ -59,6 +61,8 @@
ActionWindow (const ActionWindow&);
ActionWindow operator= (const ActionWindow&);
};
+
+} // namespace EditorNS
#endif
Index: editor.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor.cxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- editor.cxx 4 Sep 2002 14:55:12 -0000 1.29
+++ editor.cxx 11 Sep 2002 12:45:58 -0000 1.30
@@ -46,7 +46,7 @@
#include <cstdio>
-using namespace Pingus::Editor;
+namespace EditorNS {
Editor* Editor::instance_ = 0;
@@ -79,8 +79,8 @@
gui = new CL_GUIManager (style_manager);
action_window = new ActionWindow (gui, object_manager->get_actions ());
- property_window = new Pingus::Editor::PropertyWindow (this);
- level_property_window = new Pingus::Editor::LevelPropertyWindow (gui,
object_manager);
+ property_window = new PropertyWindow (this);
+ level_property_window = new LevelPropertyWindow (gui, object_manager);
view = new EditorView (0, 0, CL_Display::get_width (),
CL_Display::get_height (), 0, 0);
@@ -520,5 +520,7 @@
{
return gui;
}
+
+} // namespace EditorNS
/* EOF */
Index: editor.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- editor.hxx 6 Sep 2002 17:33:29 -0000 1.15
+++ editor.hxx 11 Sep 2002 12:45:58 -0000 1.16
@@ -27,9 +27,14 @@
#include "../screen.hxx"
#include "editor_help_screen.hxx"
-///
-class EditorView;
+class CL_StyleManager_Default;
+class CL_GUIManager;
+
class EditorObj;
+
+namespace EditorNS {
+
+class EditorView;
class EditorEvent;
class Panel;
class ScrollMap;
@@ -38,18 +43,8 @@
class ObjectSelector;
class StatusLine;
class ActionWindow;
-
-namespace Pingus
-{
- namespace Editor
- {
- class PropertyWindow;
- class LevelPropertyWindow;
- }
-}
-
-class CL_StyleManager_Default;
-class CL_GUIManager;
+class PropertyWindow;
+class LevelPropertyWindow;
class Editor : public Screen
{
@@ -87,8 +82,8 @@
ActionWindow* action_window;
- Pingus::Editor::LevelPropertyWindow* level_property_window;
- Pingus::Editor::PropertyWindow* property_window;
+ EditorNS::LevelPropertyWindow* level_property_window;
+ EditorNS::PropertyWindow* property_window;
enum { SELECTOR_TOOL, ZOOM_TOOL } tool;
@@ -135,6 +130,8 @@
Editor (const Editor&);
Editor operator= (const Editor&);
};
+
+} // namespace EditorNS
#endif
Index: editor_event.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_event.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- editor_event.cxx 4 Sep 2002 14:55:12 -0000 1.31
+++ editor_event.cxx 11 Sep 2002 12:45:58 -0000 1.32
@@ -47,6 +47,8 @@
#include "level_property_window.hxx"
#include "../screen_manager.hxx"
+namespace EditorNS {
+
EditorEvent::EditorEvent()
: is_enabled (false)
{
@@ -828,5 +830,7 @@
&&
(editor->get_gui_manager ()->get_focus () == editor->get_gui_manager ());
}
+
+} // namespace EditorNS
/* EOF */
Index: editor_event.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_event.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- editor_event.hxx 23 Aug 2002 15:49:54 -0000 1.13
+++ editor_event.hxx 11 Sep 2002 12:45:58 -0000 1.14
@@ -26,9 +26,12 @@
class CL_Key;
class CL_Font;
class CL_InputDevice;
-class Editor;
+
+namespace EditorNS {
+
class ObjectManager;
class EditorSelection;
+class Editor;
class EditorEvent //: public CL_Event_ButtonPress, public
CL_Event_ButtonRelease
{
@@ -109,6 +112,8 @@
EditorEvent (const EditorEvent&);
EditorEvent operator= (const EditorEvent&);
};
+
+} // namespace EditorNS
#endif
Index: editor_groundpiece_obj.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/editor/editor_groundpiece_obj.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- editor_groundpiece_obj.cxx 10 Sep 2002 14:33:07 -0000 1.11
+++ editor_groundpiece_obj.cxx 11 Sep 2002 12:45:58 -0000 1.12
@@ -21,8 +21,6 @@
#include "../pingus_resource.hxx"
#include "groundpiece_window.hxx"
-using namespace Pingus;
-
EditorGroundpieceObj::EditorGroundpieceObj(const GroundpieceData& data)
: GroundpieceData (data),
SpriteEditorObj (desc)
@@ -52,7 +50,7 @@
EditorGroundpieceObj::vertical_flip ()
{
std::cout << "Vertical flip" << std::endl;
- desc.modifier = Pingus::vertical_flip(desc.modifier);
+ desc.modifier = ResourceModifierNS::vertical_flip(desc.modifier);
sprite.get_surface () = PingusResource::load_surface (desc);
}
@@ -60,7 +58,7 @@
EditorGroundpieceObj::horizontal_flip ()
{
std::cout << "Horz flip" << std::endl;
- desc.modifier = Pingus::horizontal_flip(desc.modifier);
+ desc.modifier = ResourceModifierNS::horizontal_flip(desc.modifier);
sprite.get_surface () = PingusResource::load_surface (desc);
}
@@ -72,7 +70,7 @@
pos.x += sprite.get_width ()/2;
pos.y += sprite.get_height ()/2;
- desc.modifier = Pingus::rotate_90(desc.modifier);
+ desc.modifier = ResourceModifierNS::rotate_90(desc.modifier);
sprite.get_surface () = PingusResource::load_surface (desc);
pos.x -= sprite.get_width ()/2;
@@ -87,17 +85,17 @@
pos.x += sprite.get_width ()/2;
pos.y += sprite.get_height ()/2;
- desc.modifier = Pingus::rotate_270(desc.modifier);
+ desc.modifier = ResourceModifierNS::rotate_270(desc.modifier);
sprite.get_surface () = PingusResource::load_surface (desc);
pos.x -= sprite.get_width ()/2;
pos.y -= sprite.get_height ()/2;
}
-Pingus::Editor::PropertyFrame*
+EditorNS::PropertyFrame*
EditorGroundpieceObj::get_gui_dialog(CL_Component* parent)
{
- return new Pingus::Editor::GroundpieceWindow (parent, this);
+ return new EditorNS::GroundpieceWindow (parent, this);
}
/* EOF */
Index: editor_groundpiece_obj.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/editor/editor_groundpiece_obj.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- editor_groundpiece_obj.hxx 23 Aug 2002 15:49:54 -0000 1.8
+++ editor_groundpiece_obj.hxx 11 Sep 2002 12:45:58 -0000 1.9
@@ -46,7 +46,7 @@
EditorObj* duplicate();
std::string status_line();
- Pingus::Editor::PropertyFrame* get_gui_dialog(CL_Component* parent);
+ EditorNS::PropertyFrame* get_gui_dialog(CL_Component* parent);
private:
EditorGroundpieceObj (const EditorGroundpieceObj&);
Index: editor_view.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_view.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- editor_view.cxx 20 Jun 2002 16:48:11 -0000 1.2
+++ editor_view.cxx 11 Sep 2002 12:45:58 -0000 1.3
@@ -23,7 +23,7 @@
#include "editor_view.hxx"
#include "../math.hxx"
-using namespace Pingus;
+namespace EditorNS {
EditorView::EditorView (int x1, int y1, int x2, int y2,
int /*x_offset*/, int /*y_offset*/)
@@ -290,5 +290,7 @@
next = next.rotate (pi/8, CL_Vector (0, 0, 1.0f));
}
}
+
+} // namespace EditorNS
/* EOF */
Index: editor_view.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_view.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- editor_view.hxx 23 Aug 2002 15:49:54 -0000 1.4
+++ editor_view.hxx 11 Sep 2002 12:45:58 -0000 1.5
@@ -27,6 +27,8 @@
class CL_Rect;
class CL_Surface;
+namespace EditorNS {
+
/** The EdtiorView is basically the graphic context to which the
editor draws. It provides function to manipulate the display of
the level content, like zooming and scrolling and wrapper
@@ -96,6 +98,8 @@
EditorView (const EditorView&);
EditorView operator= (const EditorView&);
};
+
+} // namespace EditorNS
#endif
Index: editorobj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- editorobj.cxx 3 Jul 2002 17:14:25 -0000 1.4
+++ editorobj.cxx 11 Sep 2002 12:45:58 -0000 1.5
@@ -19,7 +19,7 @@
#include "editorobj.hxx"
-Editor* EditorObj::editor = 0;
+EditorNS::Editor* EditorObj::editor = 0;
EditorObj::EditorObj ()
{
@@ -35,8 +35,8 @@
return "EditorObj::status_line(): Not implemented";
}
-Pingus::Editor::PropertyFrame*
-EditorObj::get_gui_dialog (Editor*)
+EditorNS::PropertyFrame*
+EditorObj::get_gui_dialog (EditorNS::Editor*)
{
return 0;
}
Index: editorobj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- editorobj.hxx 9 Sep 2002 16:13:44 -0000 1.14
+++ editorobj.hxx 11 Sep 2002 12:45:58 -0000 1.15
@@ -27,45 +27,42 @@
class CL_Rect;
class CL_Vector;
-class EditorView;
class CL_Component;
-class Editor;
class EditorObj;
+
typedef std::vector<EditorObj*> EditorObjLst;
-namespace Pingus
-{
- namespace Editor
- {
- class PropertyFrame;
- }
-}
+namespace EditorNS {
+class PropertyFrame;
+class Editor;
+class EditorView;
+} // namespace EditorNS
/** Interface for all objects which can be shown in the editor */
class EditorObj
{
private:
- static Editor* editor;
+ static EditorNS::Editor* editor;
public:
/** Set the parent editor of all objects */
- static void set_editor(Editor* e) { editor = e; }
+ static void set_editor(EditorNS::Editor* e) { editor = e; }
- static Editor* get_editor () { return editor; }
+ static EditorNS::Editor* get_editor () { return editor; }
EditorObj ();
virtual ~EditorObj ();
/** Draw the object to the given view */
- virtual void draw (EditorView * view) =0;
+ virtual void draw (EditorNS::EditorView * view) =0;
/** Called once a game loop, the delta is the time passed since the
last update in seconds */
virtual void update (float /*delta*/) {};
/** Draw a rectangle or shape around the object to the given view */
- virtual void draw_mark (EditorView * view) =0;
+ virtual void draw_mark (EditorNS::EditorView * view) =0;
/** Return true when the object is under the given coordinates */
virtual bool is_over(const CL_Vector&) =0;
@@ -121,7 +118,7 @@
responsible for deleting the object after usage. The
CL_Component* should/must be a CL_Frame so that it can get
embedded in the properties window */
- virtual Pingus::Editor::PropertyFrame* get_gui_dialog (Editor* parent);
+ virtual EditorNS::PropertyFrame* get_gui_dialog (EditorNS::Editor* parent);
protected:
EditorObj (const EditorObj&) { }
Index: editorobj_group.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj_group.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- editorobj_group.cxx 1 Jul 2002 18:36:40 -0000 1.4
+++ editorobj_group.cxx 11 Sep 2002 12:45:58 -0000 1.5
@@ -60,7 +60,7 @@
/** Draw the object */
void
-EditorObjGroup::draw (EditorView * view)
+EditorObjGroup::draw (EditorNS::EditorView * view)
{
for(std::vector<EditorObj*>::iterator i = objs.begin(); i != objs.end(); ++i)
{
@@ -82,7 +82,7 @@
/** Draw the caputre rectangle around the object */
void
-EditorObjGroup::draw_mark (EditorView * view)
+EditorObjGroup::draw_mark (EditorNS::EditorView * view)
{
for(std::vector<EditorObj*>::iterator i = objs.begin();
i != objs.end();
Index: editorobj_group.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj_group.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- editorobj_group.hxx 23 Aug 2002 15:49:54 -0000 1.9
+++ editorobj_group.hxx 11 Sep 2002 12:45:58 -0000 1.10
@@ -40,8 +40,8 @@
float get_z_pos();
void set_position_offset(const CL_Vector& offset);
- void draw(EditorView *);
- void draw_mark (EditorView * view);
+ void draw(EditorNS::EditorView *);
+ void draw_mark (EditorNS::EditorView * view);
/** Add an object to the group, the object will get duplicated and
stay untouched */
Index: entrance_window.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/entrance_window.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- entrance_window.cxx 3 Jul 2002 17:14:25 -0000 1.3
+++ entrance_window.cxx 11 Sep 2002 12:45:58 -0000 1.4
@@ -34,7 +34,7 @@
[ok] [cancel]
***********************************/
-using namespace Pingus::Editor;
+namespace EditorNS {
EntranceWindow::EntranceWindow (CL_Component* parent, EntranceObj* obj)
: PropertyFrame (200, 100, parent),
@@ -84,5 +84,7 @@
std::cout << "EntranceWindow::~EntranceWindow (): object disapeared" <<
std::endl;
}
}
+
+} // namespace EditorNS
/* EOF */
Index: entrance_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/entrance_window.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- entrance_window.hxx 23 Aug 2002 15:49:54 -0000 1.5
+++ entrance_window.hxx 11 Sep 2002 12:45:58 -0000 1.6
@@ -28,36 +28,34 @@
class EntranceObj;
-namespace Pingus
+namespace EditorNS {
+
+class EntranceWindow : public PropertyFrame
{
- namespace Editor
- {
- class EntranceWindow : public PropertyFrame
- {
- private:
- EntranceObj* entrance;
+private:
+ EntranceObj* entrance;
- CL_Label direction_label;
- CL_RadioGroup direction_group;
- CL_RadioButton direction_left;
- CL_RadioButton direction_misc;
- CL_RadioButton direction_right;
+ CL_Label direction_label;
+ CL_RadioGroup direction_group;
+ CL_RadioButton direction_left;
+ CL_RadioButton direction_misc;
+ CL_RadioButton direction_right;
- CL_Label release_rate_label;
- CL_InputBox release_rate_input;
+ CL_Label release_rate_label;
+ CL_InputBox release_rate_input;
- public:
- EntranceWindow (CL_Component* parent, EntranceObj* );
- ~EntranceWindow ();
+public:
+ EntranceWindow (CL_Component* parent, EntranceObj* );
+ ~EntranceWindow ();
- std::string get_title () { return "Entrance Properties"; }
+ std::string get_title () { return "Entrance Properties"; }
- private:
- EntranceWindow (const EntranceWindow&);
- EntranceWindow operator= (const EntranceWindow&);
- };
- }
-}
+private:
+ EntranceWindow (const EntranceWindow&);
+ EntranceWindow operator= (const EntranceWindow&);
+};
+
+} // namespace EditorNS
#endif
Index: groundpiece_window.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/groundpiece_window.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- groundpiece_window.cxx 3 Jul 2002 17:14:25 -0000 1.7
+++ groundpiece_window.cxx 11 Sep 2002 12:45:58 -0000 1.8
@@ -31,7 +31,7 @@
[ok] [cancel]
*************************/
-using namespace Pingus::Editor;
+namespace EditorNS {
GroundpieceWindow::GroundpieceWindow (CL_Component* parent,
EditorGroundpieceObj* arg_data)
: PropertyFrame (200, 120, parent),
@@ -114,5 +114,7 @@
std::cout << "GroundpieceWindow::write_data (): object disapeared" <<
std::endl;
}
}
+
+} // namespace EditorNS
/* EOF */
Index: groundpiece_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/groundpiece_window.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- groundpiece_window.hxx 23 Aug 2002 15:49:54 -0000 1.7
+++ groundpiece_window.hxx 11 Sep 2002 12:45:58 -0000 1.8
@@ -27,45 +27,43 @@
#include "property_frame.hxx"
#include "editor_groundpiece_obj.hxx"
-namespace Pingus
+namespace EditorNS {
+
+class GroundpieceWindow : public PropertyFrame
{
- namespace Editor
- {
- class GroundpieceWindow : public PropertyFrame
- {
- private:
- EditorGroundpieceObj* data;
+private:
+ EditorGroundpieceObj* data;
- CL_Button convert_to_hotspot_button;
+ CL_Button convert_to_hotspot_button;
- CL_Label groundtype_label;
- //CL_ListBox groundtype_listbox;
+ CL_Label groundtype_label;
+ //CL_ListBox groundtype_listbox;
- CL_RadioGroup groundtype_group;
- CL_RadioButton ground_radiobutton;
- CL_RadioButton transparent_radiobutton;
- CL_RadioButton solid_radiobutton;
- CL_RadioButton bridge_radiobutton;
+ CL_RadioGroup groundtype_group;
+ CL_RadioButton ground_radiobutton;
+ CL_RadioButton transparent_radiobutton;
+ CL_RadioButton solid_radiobutton;
+ CL_RadioButton bridge_radiobutton;
- CL_Slot convert_to_hotspot_button_slot;
+ CL_Slot convert_to_hotspot_button_slot;
- public:
- GroundpieceWindow (CL_Component* parent, EditorGroundpieceObj* data);
- ~GroundpieceWindow ();
+public:
+ GroundpieceWindow (CL_Component* parent, EditorGroundpieceObj* data);
+ ~GroundpieceWindow ();
- void convert_to_hotspot ();
+ void convert_to_hotspot ();
- void read_data ();
- void write_data ();
+ void read_data ();
+ void write_data ();
- std::string get_title () { return "Groundpiece Properties"; }
+ std::string get_title () { return "Groundpiece Properties"; }
- private:
- GroundpieceWindow (const GroundpieceWindow&);
- GroundpieceWindow operator= (const GroundpieceWindow&);
- };
- }
-}
+private:
+ GroundpieceWindow (const GroundpieceWindow&);
+ GroundpieceWindow operator= (const GroundpieceWindow&);
+};
+
+} // namespace EditorNS
#endif
Index: level_property_window.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/level_property_window.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- level_property_window.cxx 23 Aug 2002 15:49:54 -0000 1.9
+++ level_property_window.cxx 11 Sep 2002 12:45:58 -0000 1.10
@@ -43,7 +43,7 @@
[ OK ] [Cancel]
*********************/
-using namespace Pingus::Editor;
+namespace EditorNS {
LevelPropertyWindow::LevelPropertyWindow (CL_Component* parent, ObjectManager*
manager_)
: CL_Window (CL_Rect (0, 0, 400, 300), "Level Properties", parent),
@@ -99,5 +99,7 @@
manager->set_playable (playable_checkbox.is_checked ());
}
+
+} // namespace EditorNS
/* EOF */
Index: level_property_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/level_property_window.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- level_property_window.hxx 23 Aug 2002 15:49:54 -0000 1.6
+++ level_property_window.hxx 11 Sep 2002 12:45:58 -0000 1.7
@@ -28,55 +28,53 @@
class ObjectManager;
-namespace Pingus
+namespace EditorNS {
+
+class LevelPropertyWindow : public CL_Window
{
- namespace Editor
- {
- class LevelPropertyWindow : public CL_Window
- {
- private:
- ObjectManager* manager;
+private:
+ ObjectManager* manager;
- CL_Label levelname_label;
- CL_InputBox levelname_input;
+ CL_Label levelname_label;
+ CL_InputBox levelname_input;
- CL_Label descritpion_label;
- CL_InputBox description_input;
+ CL_Label descritpion_label;
+ CL_InputBox description_input;
- CL_Label author_label;
- CL_InputBox author_input;
+ CL_Label author_label;
+ CL_InputBox author_input;
- CL_Label number_of_pingus_label;
- CL_InputBox number_of_pingus_input;
+ CL_Label number_of_pingus_label;
+ CL_InputBox number_of_pingus_input;
- CL_Label pingus_to_save_label;
- CL_InputBox pingus_to_save_input;
+ CL_Label pingus_to_save_label;
+ CL_InputBox pingus_to_save_input;
- CL_Label time_label;
- CL_InputBox time_input;
+ CL_Label time_label;
+ CL_InputBox time_input;
- CL_Label width_label;
- CL_InputBox width_input;
+ CL_Label width_label;
+ CL_InputBox width_input;
- CL_Label height_label;
- CL_InputBox height_input;
+ CL_Label height_label;
+ CL_InputBox height_input;
- CL_Label difficulty_label;
- CL_InputBox difficulty_input;
+ CL_Label difficulty_label;
+ CL_InputBox difficulty_input;
- CL_Label comment_label;
- CL_CheckBox playable_checkbox;
+ CL_Label comment_label;
+ CL_CheckBox playable_checkbox;
- public:
- LevelPropertyWindow (CL_Component* parent, ObjectManager*);
- ~LevelPropertyWindow ();
+public:
+ LevelPropertyWindow (CL_Component* parent, ObjectManager*);
+ ~LevelPropertyWindow ();
- private:
- LevelPropertyWindow (const LevelPropertyWindow&);
- LevelPropertyWindow operator= (const LevelPropertyWindow&);
- };
- }
-}
+private:
+ LevelPropertyWindow (const LevelPropertyWindow&);
+ LevelPropertyWindow operator= (const LevelPropertyWindow&);
+};
+
+} // namespace EditorNS
#endif
Index: object_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- object_manager.cxx 5 Sep 2002 12:40:22 -0000 1.27
+++ object_manager.cxx 11 Sep 2002 12:45:58 -0000 1.28
@@ -32,9 +32,9 @@
#include "editor_view.hxx"
using namespace std;
-using namespace Pingus;
using namespace Actions;
+namespace EditorNS {
static bool EditorObj_z_pos_sorter (EditorObj* a,
EditorObj* b)
@@ -376,5 +376,7 @@
{
return std::find (editor_objs.begin (), editor_objs.end (), obj) !=
editor_objs.end ();
}
+
+} // namespace EditorNS
/* EOF */
Index: object_manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.hxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- object_manager.hxx 23 Aug 2002 15:49:54 -0000 1.16
+++ object_manager.hxx 11 Sep 2002 12:45:58 -0000 1.17
@@ -25,6 +25,8 @@
#include "../action_data.hxx"
#include "editorobj.hxx"
+namespace EditorNS {
+
class EditorView;
/// Manager for all level objects.
@@ -150,6 +152,8 @@
ObjectManager (const ObjectManager&);
ObjectManager operator= (const ObjectManager&);
};
+
+} // namespace EditorNS
#endif
Index: object_selector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_selector.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- object_selector.cxx 9 Sep 2002 16:13:44 -0000 1.12
+++ object_selector.cxx 11 Sep 2002 12:45:58 -0000 1.13
@@ -62,6 +62,8 @@
using namespace std;
using namespace EditorObjs;
+namespace EditorNS {
+
ObjectSelector::ObjectSelector()
{
last_object = "GroundPieces/";
@@ -616,5 +618,7 @@
reader.set_strings(PingusResource::get("global")->get_resources_of_type("surface"));
return reader.read_string();
}
+
+} // namespace EditorNS
/* EOF */
Index: object_selector.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_selector.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- object_selector.hxx 8 Sep 2002 18:13:04 -0000 1.9
+++ object_selector.hxx 11 Sep 2002 12:45:58 -0000 1.10
@@ -28,7 +28,11 @@
class EditorObj;
-///
+namespace EditorNS {
+
+/** The ObjectManager provides a graphical interface to select objects
+ in the Editor from a list of objects and insert them into the
+ level. */
class ObjectSelector
{
private:
@@ -69,6 +73,8 @@
ObjectSelector (const ObjectSelector&);
ObjectSelector operator= (const ObjectSelector&);
};
+
+} // namespace EditorNS
#endif
Index: panel.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/panel.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- panel.cxx 17 Aug 2002 17:56:23 -0000 1.4
+++ panel.cxx 11 Sep 2002 12:45:58 -0000 1.5
@@ -26,6 +26,8 @@
#include "../pingus_resource.hxx"
#include "panel_icons.hxx"
+namespace EditorNS {
+
Editor* PanelIcon::editor;
PanelIcon::PanelIcon()
@@ -193,5 +195,7 @@
editor = e;
PanelIcon::editor = e;
}
+
+} // namespace EditorNS
/* EOF */
Index: panel.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/panel.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- panel.hxx 23 Aug 2002 15:49:54 -0000 1.6
+++ panel.hxx 11 Sep 2002 12:45:58 -0000 1.7
@@ -25,9 +25,10 @@
#include <ClanLib/Display/Display/surface.h>
class CL_Font;
-class Editor;
-///
+namespace EditorNS {
+
+class Editor;
class EditorEvent;
class PanelIcon
@@ -77,6 +78,8 @@
Panel (const Panel&);
Panel operator= (const Panel&);
};
+
+} // namespace EditorNS
#endif
Index: panel_icons.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/panel_icons.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- panel_icons.cxx 1 Jul 2002 12:46:22 -0000 1.4
+++ panel_icons.cxx 11 Sep 2002 12:45:58 -0000 1.5
@@ -24,6 +24,8 @@
#include "editor.hxx"
#include "editor_event.hxx"
+namespace EditorNS {
+
PanelIconLoad::PanelIconLoad()
{
tooltip = _("Load a level (F5)");
@@ -192,5 +194,7 @@
{
editor->get_event()->editor_show_actions_window ();
}
+
+} // namespace EditorNS
/* EOF */
Index: panel_icons.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/panel_icons.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- panel_icons.hxx 23 Aug 2002 15:49:54 -0000 1.5
+++ panel_icons.hxx 11 Sep 2002 12:45:58 -0000 1.6
@@ -22,6 +22,8 @@
#include "panel.hxx"
+namespace EditorNS {
+
class PanelIconNew : public PanelIcon
{
public:
@@ -186,6 +188,8 @@
PanelIconSetupActions (const PanelIconSetupActions&);
PanelIconSetupActions operator= (const PanelIconSetupActions&);
};
+
+} // namespace EditorNS
#endif
Index: plfobj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/plfobj.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- plfobj.cxx 10 Sep 2002 14:33:07 -0000 1.11
+++ plfobj.cxx 11 Sep 2002 12:45:58 -0000 1.12
@@ -89,12 +89,12 @@
return std::string(str);
}
-Pingus::Editor::PropertyFrame*
+EditorNS::PropertyFrame*
EntranceObj::get_gui_dialog (CL_Component* parent)
{
// FIXME: due to the shared_ptr<> this is not guaranted to stay here
// FIXME: long enough
- return new Pingus::Editor::EntranceWindow (parent, this);
+ return new EditorNS::EntranceWindow (parent, this);
}
ExitObj::ExitObj(const ExitData& data)
@@ -149,14 +149,14 @@
}
void
-LiquidObj::draw (EditorView * view)
+LiquidObj::draw (EditorNS::EditorView * view)
{
for(int i = 0; i < width; ++i)
view->draw (sprite, pos + CL_Vector (i * sprite.get_width (), 0));
}
void
-LiquidObj::draw_mark (EditorView * view)
+LiquidObj::draw_mark (EditorNS::EditorView * view)
{
view->draw_rect(int(pos.x),
int(pos.y),
Index: plfobj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/plfobj.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- plfobj.hxx 6 Sep 2002 17:33:29 -0000 1.9
+++ plfobj.hxx 11 Sep 2002 12:45:58 -0000 1.10
@@ -34,7 +34,7 @@
EditorObj* duplicate ();
void write_xml (std::ostream& xml) { EntranceData::write_xml (xml); }
std::string status_line ();
- Pingus::Editor::PropertyFrame* get_gui_dialog (CL_Component* parent);
+ EditorNS::PropertyFrame* get_gui_dialog (CL_Component* parent);
private:
EntranceObj (const EntranceObj&);
@@ -64,8 +64,8 @@
LiquidObj(const LiquidData& data);
EditorObj* duplicate();
- void draw (EditorView * view);
- void draw_mark (EditorView * view);
+ void draw (EditorNS::EditorView * view);
+ void draw_mark (EditorNS::EditorView * view);
void save(std::ostream& plf, std::ofstream* psm);
void write_xml(std::ostream& xml) { LiquidData::write_xml (xml); }
std::string status_line();
Index: property_frame.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/property_frame.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- property_frame.cxx 30 Jun 2002 22:32:26 -0000 1.1
+++ property_frame.cxx 11 Sep 2002 12:45:58 -0000 1.2
@@ -19,11 +19,13 @@
#include "property_frame.hxx"
-using namespace Pingus::Editor;
+namespace EditorNS {
PropertyFrame::PropertyFrame (int width, int height, CL_Component* parent)
: CL_Frame (CL_Rect (0, 0, width, height), parent)
{
}
+
+} // namespace EditorNS
/* EOF */
Index: property_frame.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/property_frame.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- property_frame.hxx 23 Aug 2002 15:49:54 -0000 1.4
+++ property_frame.hxx 11 Sep 2002 12:45:58 -0000 1.5
@@ -25,23 +25,21 @@
class CL_Component;
-namespace Pingus
+namespace EditorNS {
+
+class PropertyFrame : public CL_Frame
{
- namespace Editor
- {
- class PropertyFrame : public CL_Frame
- {
- public:
- PropertyFrame (int width, int height, CL_Component*);
+public:
+ PropertyFrame (int width, int height, CL_Component*);
- virtual std::string get_title () =0;
+ virtual std::string get_title () =0;
- private:
- PropertyFrame (const PropertyFrame&);
- PropertyFrame operator= (const PropertyFrame&);
- };
- }
-}
+private:
+ PropertyFrame (const PropertyFrame&);
+ PropertyFrame operator= (const PropertyFrame&);
+};
+
+} // namespace EditorNS
#endif
Index: property_window.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/property_window.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- property_window.cxx 16 Aug 2002 13:03:36 -0000 1.9
+++ property_window.cxx 11 Sep 2002 12:45:58 -0000 1.10
@@ -24,9 +24,9 @@
#include "property_frame.hxx"
#include "property_window.hxx"
-using namespace Pingus::Editor;
+namespace EditorNS {
-PropertyWindow::PropertyWindow (::Editor* parent)
+PropertyWindow::PropertyWindow (Editor* parent)
: CL_Window (CL_Rect (0, 0, 200, 200), "Object Properties",
parent->get_gui_manager ()),
editor (parent),
current_frame (0), label (CL_Point (50, 0), "no properties available",
get_client_area ())
@@ -49,7 +49,7 @@
if (obj)
{
// We are responsible to delete comp
- Pingus::Editor::PropertyFrame* comp = obj->get_gui_dialog (editor);
+ PropertyFrame* comp = obj->get_gui_dialog (editor);
if (comp)
{
@@ -74,5 +74,7 @@
label.show (true);
}
}
+
+} // namespace EditorNS
/* EOF */
Index: property_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/property_window.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- property_window.hxx 23 Aug 2002 15:49:54 -0000 1.6
+++ property_window.hxx 11 Sep 2002 12:45:58 -0000 1.7
@@ -24,32 +24,31 @@
#include <ClanLib/GUI/label.h>
#include <ClanLib/GUI/window.h>
-class Editor;
class EditorObj;
class CL_Component;
-namespace Pingus
+namespace EditorNS {
+
+class Editor;
+
+class PropertyWindow : public CL_Window
{
- namespace Editor
- {
- class PropertyWindow : public CL_Window
- {
- private:
- ::Editor* editor;
- CL_Component* current_frame;
- CL_Label label;
+private:
+ Editor* editor;
+ CL_Component* current_frame;
+ CL_Label label;
- public:
- PropertyWindow (::Editor* parent);
+public:
+ PropertyWindow (Editor* parent);
- void update_frame (EditorObj*);
+ void update_frame (EditorObj*);
- private:
- PropertyWindow (const PropertyWindow&);
- PropertyWindow operator= (const PropertyWindow&);
- };
- }
-}
+private:
+ PropertyWindow (const PropertyWindow&);
+ PropertyWindow operator= (const PropertyWindow&);
+};
+
+} // namespace EditorNS
#endif
Index: rect_editorobj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/rect_editorobj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rect_editorobj.cxx 6 Sep 2002 17:33:29 -0000 1.4
+++ rect_editorobj.cxx 11 Sep 2002 12:45:58 -0000 1.5
@@ -37,7 +37,7 @@
}
void
-RectEditorObj::draw_mark (EditorView * view)
+RectEditorObj::draw_mark (EditorNS::EditorView * view)
{
CL_Vector ul (get_upper_left_corner ());
Index: rect_editorobj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/rect_editorobj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rect_editorobj.hxx 6 Sep 2002 17:33:29 -0000 1.4
+++ rect_editorobj.hxx 11 Sep 2002 12:45:58 -0000 1.5
@@ -38,7 +38,7 @@
virtual int get_height () =0;
/** Draw the caputre rectangle around the object */
- virtual void draw_mark (EditorView * view);
+ virtual void draw_mark (EditorNS::EditorView * view);
/** Return true when the object is under the given coordinates */
virtual bool is_over (const CL_Vector&);
Index: scroll_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/scroll_map.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- scroll_map.cxx 1 Jul 2002 12:46:22 -0000 1.3
+++ scroll_map.cxx 11 Sep 2002 12:45:58 -0000 1.4
@@ -22,6 +22,8 @@
#include "editor.hxx"
#include "object_manager.hxx"
+namespace EditorNS {
+
EditorEvent* ScrollMap::editor_event;
ScrollMap::ScrollMap()
@@ -109,6 +111,8 @@
y_pos + height,
1.0, 1.0, 1.0, 1.0);*/
}
+
+} // namespace EditorNS
/* EOF */
Index: scroll_map.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/scroll_map.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- scroll_map.hxx 23 Aug 2002 15:49:54 -0000 1.3
+++ scroll_map.hxx 11 Sep 2002 12:45:58 -0000 1.4
@@ -23,10 +23,13 @@
#include "../boost/smart_ptr.hpp"
#include "editor_view.hxx"
-class EditorEvent;
class CL_Key;
class CL_InputDevice;
+namespace EditorNS {
+
+class EditorEvent;
+
class ScrollMap
{
private:
@@ -50,6 +53,8 @@
ScrollMap (const ScrollMap&);
ScrollMap operator= (const ScrollMap&);
};
+
+} // namespace EditorNS
#endif
Index: selection.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/selection.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- selection.cxx 16 Aug 2002 13:03:36 -0000 1.12
+++ selection.cxx 11 Sep 2002 12:45:58 -0000 1.13
@@ -24,9 +24,10 @@
#include "selection.hxx"
#include "../math.hxx"
-using namespace Pingus;
using namespace std;
+namespace EditorNS {
+
void
EditorSelection::move(float x, float y)
{
@@ -157,5 +158,7 @@
(*i)->draw_mark(view);
}
}
+
+} // namespace EditorNS
/* EOF */
Index: selection.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/selection.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- selection.hxx 23 Aug 2002 15:49:54 -0000 1.8
+++ selection.hxx 11 Sep 2002 12:45:58 -0000 1.9
@@ -23,6 +23,9 @@
#include "object_manager.hxx"
class CL_Vector;
+
+namespace EditorNS {
+
class EditorView;
class EditorSelection
@@ -75,6 +78,8 @@
EditorSelection (const EditorSelection&);
EditorSelection operator= (const EditorSelection&);
};
+
+} // namespace EditorNS
#endif
Index: sprite_editorobj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/sprite_editorobj.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sprite_editorobj.cxx 10 Sep 2002 14:33:07 -0000 1.5
+++ sprite_editorobj.cxx 11 Sep 2002 12:45:58 -0000 1.6
@@ -74,7 +74,7 @@
}
void
-SpriteEditorObj::draw(EditorView * view)
+SpriteEditorObj::draw(EditorNS::EditorView * view)
{
assert (pos_ref);
view->draw (sprite, *pos_ref);
Index: sprite_editorobj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/sprite_editorobj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sprite_editorobj.hxx 10 Sep 2002 14:33:07 -0000 1.5
+++ sprite_editorobj.hxx 11 Sep 2002 12:45:58 -0000 1.6
@@ -58,7 +58,7 @@
virtual CL_Vector get_upper_left_corner();
- virtual void draw (EditorView *);
+ virtual void draw (EditorNS::EditorView *);
virtual void set_position_offset (const CL_Vector& offset);
Index: status_line.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/status_line.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- status_line.cxx 4 Sep 2002 14:55:12 -0000 1.7
+++ status_line.cxx 11 Sep 2002 12:45:58 -0000 1.8
@@ -27,6 +27,8 @@
#include "status_line.hxx"
#include "editorobj.hxx"
+namespace EditorNS {
+
StatusLine::StatusLine()
{
font = PingusResource::load_font("Fonts/courier_small", "fonts");
@@ -71,6 +73,8 @@
{
current_objs = c_objs;
}
+
+} // namespace EditorNS
/* EOF */
Index: status_line.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/status_line.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- status_line.hxx 23 Aug 2002 15:49:55 -0000 1.8
+++ status_line.hxx 11 Sep 2002 12:45:58 -0000 1.9
@@ -24,7 +24,11 @@
#include <vector>
class CL_Font;
+
class EditorObj;
+
+namespace EditorNS {
+
class EditorView;
class StatusLine
@@ -44,6 +48,8 @@
StatusLine (const StatusLine&);
StatusLine operator= (const StatusLine&);
};
+
+} // namespace EditorNS
#endif
Index: thumb_cache.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/thumb_cache.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- thumb_cache.cxx 4 Sep 2002 14:55:12 -0000 1.9
+++ thumb_cache.cxx 11 Sep 2002 12:45:58 -0000 1.10
@@ -30,7 +30,7 @@
#include "../math.hxx"
#include "thumb_cache.hxx"
-using namespace Pingus;
+namespace EditorNS {
const unsigned int thumbcache_version = 3;
@@ -188,5 +188,7 @@
return Blitter::scale_surface (sur, width, height);
}
}
+
+} // namespace EditorNS
/* EOF */
Index: thumb_cache.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/thumb_cache.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- thumb_cache.hxx 23 Aug 2002 15:49:55 -0000 1.6
+++ thumb_cache.hxx 11 Sep 2002 12:45:58 -0000 1.7
@@ -25,6 +25,8 @@
class CL_Surface;
+namespace EditorNS {
+
/** This class is used inside the SurfaceSelector to load thumbnails
of surfaces for selection */
class ThumbCache
@@ -47,10 +49,8 @@
ThumbCache operator= (const ThumbCache&);
};
+} // namespace EditorNS
+
#endif
/* EOF */
-
-
-
-
Index: weather_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/weather_obj.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- weather_obj.cxx 10 Sep 2002 14:33:07 -0000 1.7
+++ weather_obj.cxx 11 Sep 2002 12:45:58 -0000 1.8
@@ -50,7 +50,7 @@
}
void
-WeatherObj::draw (EditorView * view)
+WeatherObj::draw (EditorNS::EditorView * view)
{
//std::cout << "Dragging: " << dragging << std::endl;
Index: weather_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/weather_obj.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- weather_obj.hxx 6 Sep 2002 17:33:29 -0000 1.6
+++ weather_obj.hxx 11 Sep 2002 12:45:58 -0000 1.7
@@ -37,7 +37,7 @@
virtual void drag ();
virtual void drop ();
- virtual void draw (EditorView * view);
+ virtual void draw (EditorNS::EditorView * view);
virtual void write_xml(std::ostream& xml);
virtual EditorObj* duplicate();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editor action_window.cxx,1.8,1.9 action_window.hxx,1.6,1.7 editor.cxx,1.29,1.30 editor.hxx,1.15,1.16 editor_event.cxx,1.31,1.32 editor_event.hxx,1.13,1.14 editor_groundpiece_obj.cxx,1.11,1.12 editor_groundpiece_obj.hxx,1.8,1.9 editor_view.cxx,1.2,1.3 editor_view.hxx,1.4,1.5 editorobj.cxx,1.4,1.5 editorobj.hxx,1.14,1.15 editorobj_group.cxx,1.4,1.5 editorobj_group.hxx,1.9,1.10 entrance_window.cxx,1.3,1.4 entrance_window.hxx,1.5,1.6 groundpiece_window.cxx,1.7,1.8 groundpiece_window.hxx,1.7,1.8 level_property_window.cxx,1.9,1.10 level_property_window.hxx,1.6,1.7 object_manager.cxx,1.27,1.28 object_manager.hxx,1.16,1.17 object_selector.cxx,1.12,1.13 object_selector.hxx,1.9,1.10 panel.cxx,1.4,1.5 panel.hxx,1.6,1.7 panel_icons.cxx,1.4,1.5 panel_icons.hxx,1.5,1.6 plfobj.cxx,1.11,1.12 plfobj.hxx,1.9,1.10 property_frame.cxx,1.1,1.2 property_frame.hxx,1.4,1.5 property_window.cxx,1.9,1.10 property_window.hxx,1.6,1.7 rect_editorobj.cxx,1.4,1.5 rect_editorobj.hxx,1.4,1.5 scroll_map.cxx,1.3,1.4 scroll_map.hxx,1.3,1.4 selection.cxx,1.12,1.13 selection.hxx,1.8,1.9 sprite_editorobj.cxx,1.5,1.6 sprite_editorobj.hxx,1.5,1.6 status_line.cxx,1.7,1.8 status_line.hxx,1.8,1.9 thumb_cache.cxx,1.9,1.10 thumb_cache.hxx,1.6,1.7 weather_obj.cxx,1.7,1.8 weather_obj.hxx,1.6,1.7,
grumbel <=
- Prev 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
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/input controller.cxx,1.22,1.23
- Previous 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
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/input controller.cxx,1.22,1.23
- Index(es):