[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editor Editor.cc,1.41,1.42 Editor.hh,
From: |
torangan |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editor Editor.cc,1.41,1.42 Editor.hh,1.18,1.19 EditorEvent.cc,1.58,1.59 EditorEvent.hh,1.13,1.14 EditorHelpScreen.cc,1.4,1.5 EditorHelpScreen.hh,1.1,1.2 EditorObj.hh,1.39,1.40 EditorObjGroup.cc,1.13,1.14 EditorObjGroup.hh,1.9,1.10 EditorView.cc,1.12,1.13 EditorView.hh,1.6,1.7 ObjectManager.hh,1.24,1.25 ObjectSelector.cc,1.60,1.61 ObjectSelector.hh,1.28,1.29 Panel.hh,1.7,1.8 PanelIcons.cc,1.13,1.14 ScrollMap.cc,1.8,1.9 StatusLine.cc,1.10,1.11 |
Date: |
7 Jun 2002 20:35:18 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv5843/editor
Modified Files:
Editor.cc Editor.hh EditorEvent.cc EditorEvent.hh
EditorHelpScreen.cc EditorHelpScreen.hh EditorObj.hh
EditorObjGroup.cc EditorObjGroup.hh EditorView.cc
EditorView.hh ObjectManager.hh ObjectSelector.cc
ObjectSelector.hh Panel.hh PanelIcons.cc ScrollMap.cc
StatusLine.cc
Log Message:
reduced header dependencies
Index: Editor.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/Editor.cc,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Editor.cc 4 Jun 2002 13:43:18 -0000 1.41
+++ Editor.cc 7 Jun 2002 20:35:14 -0000 1.42
@@ -35,6 +35,8 @@
#include "ScrollMap.hh"
#include "StatusLine.hh"
#include "ObjectSelector.hh"
+#include "ObjectManager.hh"
+#include "../ActionData.hh"
Editor* Editor::instance_ = 0;
Index: Editor.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/Editor.hh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Editor.hh 4 Jun 2002 13:43:18 -0000 1.18
+++ Editor.hh 7 Jun 2002 20:35:14 -0000 1.19
@@ -21,12 +21,9 @@
#define EDITOR_HH
#include <string>
-#include <list>
#include <ClanLib/core.h>
#include "EditorHelpScreen.hh"
-#include "../PSMParser.hh"
-#include "../PLF.hh"
///
class EditorView;
Index: EditorEvent.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorEvent.cc,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- EditorEvent.cc 29 Jan 2002 20:43:18 -0000 1.58
+++ EditorEvent.cc 7 Jun 2002 20:35:14 -0000 1.59
@@ -38,6 +38,7 @@
#include "ScrollMap.hh"
#include "Panel.hh"
#include "ObjectSelector.hh"
+#include "Editor.hh"
EditorEvent::EditorEvent()
: is_enabled (0)
Index: EditorEvent.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorEvent.hh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- EditorEvent.hh 19 May 2001 20:58:42 -0000 1.13
+++ EditorEvent.hh 7 Jun 2002 20:35:14 -0000 1.14
@@ -20,15 +20,12 @@
#ifndef EDITOREVENT_HH
#define EDITOREVENT_HH
-#include <ClanLib/core.h>
-
-#include "Editor.hh"
-#include "ObjectManager.hh"
-
+class CL_Key;
+class CL_Font;
+class CL_InputDevice;
+class Editor;
class ObjectManager;
-///
-class Editor;
class EditorEvent //: public CL_Event_ButtonPress, public
CL_Event_ButtonRelease
{
Index: EditorHelpScreen.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorHelpScreen.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- EditorHelpScreen.cc 1 Jun 2002 18:05:36 -0000 1.4
+++ EditorHelpScreen.cc 7 Jun 2002 20:35:14 -0000 1.5
@@ -20,6 +20,7 @@
#include "../my_gettext.hh"
#include "../PingusResource.hh"
#include "EditorHelpScreen.hh"
+#include <ClanLib/display.h>
EditorHelpScreen::EditorHelpScreen ()
: font (PingusResource::load_font("Fonts/pingus_small", "fonts")),
Index: EditorHelpScreen.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorHelpScreen.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- EditorHelpScreen.hh 19 Jan 2002 14:29:59 -0000 1.1
+++ EditorHelpScreen.hh 7 Jun 2002 20:35:14 -0000 1.2
@@ -20,7 +20,7 @@
#ifndef EDITORHELPSCREEN_HH
#define EDITORHELPSCREEN_HH
-#include <ClanLib/display.h>
+class CL_Font;
class EditorHelpScreen
{
Index: EditorObj.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorObj.hh,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- EditorObj.hh 7 Jun 2002 14:50:34 -0000 1.39
+++ EditorObj.hh 7 Jun 2002 20:35:14 -0000 1.40
@@ -21,9 +21,6 @@
#define EDITOROBJ_HH
#include <string>
-#include <fstream>
-
-#include "../boost/smart_ptr.hpp"
using namespace std;
@@ -31,6 +28,17 @@
class CL_Vector;
class EditorView;
class Editor;
+
+// looks strange, but it's just a predeclaration of ofstream
+namespace std {
+ template <class T> class char_traits;
+ template <class T1, class T2> struct basic_ofstream;
+ typedef struct basic_ofstream<char, char_traits<char> > ofstream;
+}
+
+namespace boost {
+ template <class T> class shared_ptr;
+}
/** Interface for all objects which can be shown in the editor */
class EditorObj
Index: EditorObjGroup.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorObjGroup.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- EditorObjGroup.cc 7 Jun 2002 14:50:34 -0000 1.13
+++ EditorObjGroup.cc 7 Jun 2002 20:35:14 -0000 1.14
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <fstream>
#include "EditorObjGroup.hh"
/******************/
Index: EditorObjGroup.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorObjGroup.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- EditorObjGroup.hh 7 Jun 2002 14:50:34 -0000 1.9
+++ EditorObjGroup.hh 7 Jun 2002 20:35:14 -0000 1.10
@@ -22,7 +22,7 @@
#include <ClanLib/core.h>
#include "../boost/smart_ptr.hpp"
-#include "RectEditorObj.hh"
+#include "EditorObj.hh"
#include <list>
class EditorObjGroup : public EditorObj
Index: EditorView.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorView.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- EditorView.cc 4 Jun 2002 13:43:18 -0000 1.12
+++ EditorView.cc 7 Jun 2002 20:35:14 -0000 1.13
@@ -19,6 +19,7 @@
#include "../Sprite.hh"
#include "EditorView.hh"
+#include <ClanLib/display.h>
EditorView::EditorView (int x1, int y1, int x2, int y2,
int /*x_offset*/, int /*y_offset*/)
Index: EditorView.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorView.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- EditorView.hh 4 Jun 2002 13:43:19 -0000 1.6
+++ EditorView.hh 7 Jun 2002 20:35:14 -0000 1.7
@@ -21,9 +21,9 @@
#define EDITORVIEW_HH
#include <ClanLib/core.h>
-#include <ClanLib/display.h>
class Sprite;
+class CL_Surface;
class EditorView
{
Index: ObjectManager.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ObjectManager.hh,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ObjectManager.hh 7 Jun 2002 14:50:34 -0000 1.24
+++ ObjectManager.hh 7 Jun 2002 20:35:14 -0000 1.25
@@ -20,14 +20,15 @@
#ifndef OBJECTMANAGER_HH
#define OBJECTMANAGER_HH
-#include <iostream>
-#include <fstream>
-
-#include "../ActionData.hh"
#include "../Color.hh"
+#include "../ActionData.hh"
+#include "../boost/smart_ptr.hpp"
+#include "EditorObj.hh"
+class PLF;
class EditorView;
-class EditorObj;
+
+
/// Manager for all level objects.
class ObjectManager
Index: ObjectSelector.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ObjectSelector.cc,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- ObjectSelector.cc 4 Jun 2002 13:43:19 -0000 1.60
+++ ObjectSelector.cc 7 Jun 2002 20:35:14 -0000 1.61
@@ -27,10 +27,17 @@
#include "StringReader.hh"
#include "WeatherObj.hh"
#include "ObjectSelector.hh"
+#include "SurfaceSelector.hh"
#include "ThumbCache.hh"
+#include "EditorGroundpieceObj.hh"
+#include "PLFObj.hh"
#include "../my_gettext.hh"
#include "../System.hh"
#include "../EditorHotspot.hh"
+#include "../TrapData.hh"
+#include "../EntranceData.hh"
+#include "../ExitData.hh"
+#include "../LiquidData.hh"
#include "../backgrounds/StarfieldBackground.hh"
#include "../backgrounds/SurfaceBackgroundData.hh"
Index: ObjectSelector.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ObjectSelector.hh,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ObjectSelector.hh 4 Jun 2002 13:43:19 -0000 1.28
+++ ObjectSelector.hh 7 Jun 2002 20:35:14 -0000 1.29
@@ -23,14 +23,10 @@
#include <config.h>
#include <list>
#include <string>
-#include <iostream>
-
-#include "EditorObj.hh"
-#include "PLFObj.hh"
-#include "EditorGroundpieceObj.hh"
-#include "SurfaceSelector.hh"
+#include "../GroundpieceData.hh"
class EditorObj;
+class surface_obj;
///
class ObjectSelector
Index: Panel.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/Panel.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Panel.hh 11 Jun 2001 08:45:22 -0000 1.7
+++ Panel.hh 7 Jun 2002 20:35:14 -0000 1.8
@@ -23,7 +23,8 @@
#include <vector>
#include <ClanLib/core.h>
-#include "EditorEvent.hh"
+class CL_Font;
+class Editor;
///
class EditorEvent;
Index: PanelIcons.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/PanelIcons.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- PanelIcons.cc 13 Aug 2001 21:35:37 -0000 1.13
+++ PanelIcons.cc 7 Jun 2002 20:35:14 -0000 1.14
@@ -20,6 +20,8 @@
#include "../my_gettext.hh"
#include "../PingusResource.hh"
#include "PanelIcons.hh"
+#include "Editor.hh"
+#include "EditorEvent.hh"
PanelIconLoad::PanelIconLoad()
{
Index: ScrollMap.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ScrollMap.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ScrollMap.cc 1 Jun 2002 18:05:36 -0000 1.8
+++ ScrollMap.cc 7 Jun 2002 20:35:14 -0000 1.9
@@ -17,8 +17,11 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <ClanLib/display.h>
#include "ScrollMap.hh"
#include "../Display.hh"
+#include "Editor.hh"
+#include "ObjectManager.hh"
EditorEvent* ScrollMap::editor_event;
Index: StatusLine.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/StatusLine.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- StatusLine.cc 7 Jun 2002 14:50:35 -0000 1.10
+++ StatusLine.cc 7 Jun 2002 20:35:14 -0000 1.11
@@ -19,6 +19,7 @@
#include <cstdio>
#include "../PingusResource.hh"
+#include "../boost/smart_ptr.hpp"
#include "EditorView.hh"
#include "StatusLine.hh"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editor Editor.cc,1.41,1.42 Editor.hh,1.18,1.19 EditorEvent.cc,1.58,1.59 EditorEvent.hh,1.13,1.14 EditorHelpScreen.cc,1.4,1.5 EditorHelpScreen.hh,1.1,1.2 EditorObj.hh,1.39,1.40 EditorObjGroup.cc,1.13,1.14 EditorObjGroup.hh,1.9,1.10 EditorView.cc,1.12,1.13 EditorView.hh,1.6,1.7 ObjectManager.hh,1.24,1.25 ObjectSelector.cc,1.60,1.61 ObjectSelector.hh,1.28,1.29 Panel.hh,1.7,1.8 PanelIcons.cc,1.13,1.14 ScrollMap.cc,1.8,1.9 StatusLine.cc,1.10,1.11,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src ActionButton.cc,1.30,1.31 Console.hh,1.15,1.16 Display.cc,1.9,1.10 Display.hh,1.11,1.12 Entrance.hh,1.18,1.19 EntranceData.cc,1.3,1.4 EntranceData.hh,1.7,1.8 Exit.hh,1.20,1.21 ExitData.cc,1.6,1.7 FPSCounter.hh,1.4,1.5 FadeOut.cc,1.9,1.10 GameCounter.hh,1.5,1.6 GamepadController.cc,1.13,1.14 GamepadController.hh,1.6,1.7 GenericMain.hh,1.6,1.7 GlobalEvent.hh,1.4,1.5 GroundpieceData.hh,1.11,1.12 Hotspot.hh,1.9,1.10 HotspotData.hh,1.5,1.6 HurryUp.cc,1.10,1.11 HurryUp.hh,1.5,1.6 Intro.hh,1.15,1.16 LayerManager.hh,1.6,1.7 Liquid.hh,1.12,1.13 LiquidData.hh,1.8,1.9 MultiLineText.cc,1.3,1.4 MultiLineText.hh,1.3,1.4 MultiplayerClient.hh,1.7,1.8 MultiplayerConfig.cc,1.5,1.6 OptionMenu.hh,1.11,1.12 Pingu.hh,1.39,1.40 Server.cc,1.24,1.25 WorldObjGroupData.cc,1.2,1.3
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus configure.in,1.58,1.59
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src ActionButton.cc,1.30,1.31 Console.hh,1.15,1.16 Display.cc,1.9,1.10 Display.hh,1.11,1.12 Entrance.hh,1.18,1.19 EntranceData.cc,1.3,1.4 EntranceData.hh,1.7,1.8 Exit.hh,1.20,1.21 ExitData.cc,1.6,1.7 FPSCounter.hh,1.4,1.5 FadeOut.cc,1.9,1.10 GameCounter.hh,1.5,1.6 GamepadController.cc,1.13,1.14 GamepadController.hh,1.6,1.7 GenericMain.hh,1.6,1.7 GlobalEvent.hh,1.4,1.5 GroundpieceData.hh,1.11,1.12 Hotspot.hh,1.9,1.10 HotspotData.hh,1.5,1.6 HurryUp.cc,1.10,1.11 HurryUp.hh,1.5,1.6 Intro.hh,1.15,1.16 LayerManager.hh,1.6,1.7 Liquid.hh,1.12,1.13 LiquidData.hh,1.8,1.9 MultiLineText.cc,1.3,1.4 MultiLineText.hh,1.3,1.4 MultiplayerClient.hh,1.7,1.8 MultiplayerConfig.cc,1.5,1.6 OptionMenu.hh,1.11,1.12 Pingu.hh,1.39,1.40 Server.cc,1.24,1.25 WorldObjGroupData.cc,1.2,1.3
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus configure.in,1.58,1.59
- Index(es):