[Pingus-CVS] CVS: Games/Pingus/src/editor Editor.cc,1.43,1.44 Editor.hh,1.19,1.20 EditorEvent.cc,1.60,1.61 EditorHelpScreen.cc,1.6,1.7 EditorObjGroup.hh,1.10,1.11 EditorView.cc,1.14,1.15 EditorView.hh,1.7,1.8 ObjectManager.cc,1.65,1.66 ObjectManager.hh,1.25,1.26 ObjectSelector.cc,1.62,1.63 Panel.cc,1.16,1.17 Panel.hh,1.8,1.9 PanelIcons.cc,1.14,1.15 RectEditorObj.cc,1.3,1.4 ScrollMap.cc,1.9,1.10 ScrollMap.hh,1.6,1.7 SpriteEditorObj.cc,1.3,1.4 SpriteEditorObj.hh,1.4,1.5 StartPos.cc,1.12,1.13 StatusLine.cc,1.11,1.12 StringReader.cc,1.13,1.14 StringReader.hh,1.7,1.8 SurfaceSelector.cc,1.12,1.13 ThumbCache.cc,1.5,1.6 ThumbCache.hh,1.5,1.6 WeatherObj.cc,1.14,1.15

[torangan]

Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv1661/editor

Modified Files:
        Editor.cc Editor.hh EditorEvent.cc EditorHelpScreen.cc 
        EditorObjGroup.hh EditorView.cc EditorView.hh ObjectManager.cc 
        ObjectManager.hh ObjectSelector.cc Panel.cc Panel.hh 
        PanelIcons.cc RectEditorObj.cc ScrollMap.cc ScrollMap.hh 
        SpriteEditorObj.cc SpriteEditorObj.hh StartPos.cc 
        StatusLine.cc StringReader.cc StringReader.hh 
        SurfaceSelector.cc ThumbCache.cc ThumbCache.hh WeatherObj.cc 
Log Message:
replaced ClanLib/core.h and ClanLib/display.h with the really required headers


Index: Editor.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/Editor.cc,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- Editor.cc   8 Jun 2002 23:11:08 -0000       1.43
+++ Editor.cc   10 Jun 2002 11:00:28 -0000      1.44
@@ -19,6 +19,15 @@
 
 #include <cstdio>
 
+#include <ClanLib/Core/System/system.h>
+#include <ClanLib/Core/Math/rect.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Input/input.h>
+#include <ClanLib/Display/Display/mousecursor_provider.h>
+#include <ClanLib/Display/Input/mouse.h>
+#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Display/Input/inputbuffer.h>
+#include <ClanLib/Display/Input/keyboard.h>
 #include "../algo.hh"
 #include "../globals.hh"
 #include "../PingusError.hh"

Index: Editor.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/Editor.hh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Editor.hh   7 Jun 2002 20:35:14 -0000       1.19
+++ Editor.hh   10 Jun 2002 11:00:28 -0000      1.20
@@ -21,7 +21,7 @@
 #define EDITOR_HH
 
 #include <string>
-#include <ClanLib/core.h>
+#include <ClanLib/Signals/slot.h>
 
 #include "EditorHelpScreen.hh"
 
@@ -102,4 +102,7 @@
 #endif
 
 /* EOF */
+
+
+
 

Index: EditorEvent.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorEvent.cc,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- EditorEvent.cc      8 Jun 2002 23:11:08 -0000       1.60
+++ EditorEvent.cc      10 Jun 2002 11:00:28 -0000      1.61
@@ -17,7 +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/Input/input.h>
+#include <ClanLib/Display/Input/keyboard.h>
+#include <ClanLib/Core/System/error.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Input/mouse.h>
 #include "../globals.hh"
 #include "../PingusGameSession.hh"
 #include "../PingusMessageBox.hh"

Index: EditorHelpScreen.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorHelpScreen.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- EditorHelpScreen.cc 8 Jun 2002 23:11:08 -0000       1.6
+++ EditorHelpScreen.cc 10 Jun 2002 11:00:28 -0000      1.7
@@ -17,6 +17,8 @@
 //  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/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
 #include "../my_gettext.hh"
 #include "../PingusResource.hh"
 #include "EditorHelpScreen.hh"

Index: EditorObjGroup.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorObjGroup.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- EditorObjGroup.hh   7 Jun 2002 20:35:14 -0000       1.10
+++ EditorObjGroup.hh   10 Jun 2002 11:00:28 -0000      1.11
@@ -20,7 +20,7 @@
 #ifndef EDITOROBJGROUP_HH
 #define EDITOROBJGROUP_HH
 
-#include <ClanLib/core.h>
+#include <ClanLib/Core/Math/cl_vector.h>
 #include "../boost/smart_ptr.hpp"
 #include "EditorObj.hh"
 #include <list>
@@ -58,3 +58,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: EditorView.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorView.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- EditorView.cc       8 Jun 2002 23:11:08 -0000       1.14
+++ EditorView.cc       10 Jun 2002 11:00:28 -0000      1.15
@@ -17,8 +17,13 @@
 //  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/Core/Math/rect.h>
+#include <ClanLib/Display/Display/display.h>
 #include "../Sprite.hh"
 #include "EditorView.hh"
+
+using std::min;
+using std::max;
 
 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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- EditorView.hh       7 Jun 2002 20:35:14 -0000       1.7
+++ EditorView.hh       10 Jun 2002 11:00:28 -0000      1.8
@@ -20,9 +20,10 @@
 #ifndef EDITORVIEW_HH
 #define EDITORVIEW_HH
 
-#include <ClanLib/core.h>
+#include <ClanLib/Core/Math/cl_vector.h>
 
 class Sprite;
+class CL_Rect;
 class CL_Surface;
 
 class EditorView
@@ -90,3 +91,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: ObjectManager.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ObjectManager.cc,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- ObjectManager.cc    10 Jun 2002 10:32:03 -0000      1.65
+++ ObjectManager.cc    10 Jun 2002 11:00:28 -0000      1.66
@@ -19,6 +19,9 @@
 
 #include <iostream>
 
+#include <ClanLib/Core/Math/rect.h>
+#include <ClanLib/Display/Input/keyboard.h>
+#include <ClanLib/Display/Input/key.h>
 #include "../globals.hh"
 #include "../algo.hh"
 #include "../System.hh"

Index: ObjectManager.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ObjectManager.hh,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ObjectManager.hh    7 Jun 2002 20:35:14 -0000       1.25
+++ ObjectManager.hh    10 Jun 2002 11:00:28 -0000      1.26
@@ -20,6 +20,7 @@
 #ifndef OBJECTMANAGER_HH
 #define OBJECTMANAGER_HH
 
+#include <map>
 #include "../Color.hh"
 #include "../ActionData.hh"
 #include "../boost/smart_ptr.hpp"

Index: ObjectSelector.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ObjectSelector.cc,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- ObjectSelector.cc   8 Jun 2002 23:11:08 -0000       1.62
+++ ObjectSelector.cc   10 Jun 2002 11:00:28 -0000      1.63
@@ -17,6 +17,12 @@
 //  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/Core/System/system.h>
+#include <ClanLib/Display/Input/mouse.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Core/Resources/resource_manager.h>
+#include <ClanLib/Display/Input/inputbuffer.h>
 #include "../Console.hh"
 #include "../globals.hh"
 #include "../PingusResource.hh"

Index: Panel.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/Panel.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Panel.cc    8 Jun 2002 23:11:08 -0000       1.16
+++ Panel.cc    10 Jun 2002 11:00:28 -0000      1.17
@@ -17,6 +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 <iostream>
+#include <ClanLib/Core/System/system.h>
+#include <ClanLib/Display/Input/mouse.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
 #include "../globals.hh"
 #include "../PingusResource.hh"
 #include "PanelIcons.hh"

Index: Panel.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/Panel.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Panel.hh    7 Jun 2002 20:35:14 -0000       1.8
+++ Panel.hh    10 Jun 2002 11:00:28 -0000      1.9
@@ -21,7 +21,6 @@
 #define PANEL_HH
 
 #include <vector>
-#include <ClanLib/core.h>
 
 class CL_Font;
 class Editor;
@@ -98,3 +97,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: PanelIcons.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/PanelIcons.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- PanelIcons.cc       7 Jun 2002 20:35:14 -0000       1.14
+++ PanelIcons.cc       10 Jun 2002 11:00:28 -0000      1.15
@@ -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 <iostream>
 #include "../my_gettext.hh"
 #include "../PingusResource.hh"
 #include "PanelIcons.hh"

Index: RectEditorObj.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/RectEditorObj.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- RectEditorObj.cc    8 Jun 2002 23:11:08 -0000       1.3
+++ RectEditorObj.cc    10 Jun 2002 11:00:28 -0000      1.4
@@ -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 <ClanLib/Core/Math/rect.h>
 #include "../my_gettext.hh"
 #include "../boost/smart_ptr.hpp"
 #include "EditorView.hh"

Index: ScrollMap.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ScrollMap.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ScrollMap.cc        7 Jun 2002 20:35:14 -0000       1.9
+++ ScrollMap.cc        10 Jun 2002 11:00:28 -0000      1.10
@@ -17,7 +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 <ClanLib/display.h>
+#include <ClanLib/Display/Display/display.h>
 #include "ScrollMap.hh"
 #include "../Display.hh"
 #include "Editor.hh"
@@ -112,3 +112,4 @@
 }
 
 /* EOF */
+

Index: ScrollMap.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ScrollMap.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ScrollMap.hh        8 Jun 2002 20:19:54 -0000       1.6
+++ ScrollMap.hh        10 Jun 2002 11:00:28 -0000      1.7
@@ -24,6 +24,8 @@
 #include "EditorView.hh"
 
 class EditorEvent;
+class CL_Key;
+class CL_InputDevice;
 
 class ScrollMap
 {

Index: SpriteEditorObj.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/SpriteEditorObj.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SpriteEditorObj.cc  7 Jun 2002 14:50:35 -0000       1.3
+++ SpriteEditorObj.cc  10 Jun 2002 11:00:28 -0000      1.4
@@ -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 <ClanLib/Display/Display/surfaceprovider.h>
 #include "EditorView.hh"
 #include "SpriteEditorObj.hh"
 

Index: SpriteEditorObj.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/SpriteEditorObj.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- SpriteEditorObj.hh  8 Jun 2002 20:19:54 -0000       1.4
+++ SpriteEditorObj.hh  10 Jun 2002 11:00:28 -0000      1.5
@@ -20,7 +20,7 @@
 #ifndef SPRITEEDITOROBJ_HH
 #define SPRITEEDITOROBJ_HH
 
-#include <ClanLib/core.h>
+#include <ClanLib/Core/Math/cl_vector.h>
 #include "../Sprite.hh"
 #include "RectEditorObj.hh"
 
@@ -64,3 +64,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: StartPos.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/StartPos.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- StartPos.cc 8 Jun 2002 21:43:36 -0000       1.12
+++ StartPos.cc 10 Jun 2002 11:00:28 -0000      1.13
@@ -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 "../XMLhelper.hh"
 #include "../PingusResource.hh"
 #include "../boost/smart_ptr.hpp"

Index: StatusLine.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/StatusLine.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- StatusLine.cc       7 Jun 2002 20:35:14 -0000       1.11
+++ StatusLine.cc       10 Jun 2002 11:00:28 -0000      1.12
@@ -18,6 +18,9 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <cstdio>
+#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Display/Input/mouse.h>
+#include <ClanLib/Display/Display/display.h>
 #include "../PingusResource.hh"
 #include "../boost/smart_ptr.hpp"
 #include "EditorView.hh"

Index: StringReader.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/StringReader.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- StringReader.cc     8 Jun 2002 23:11:08 -0000       1.13
+++ StringReader.cc     10 Jun 2002 11:00:28 -0000      1.14
@@ -17,6 +17,12 @@
 //  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/Core/System/system.h>
+#include <ClanLib/Display/Input/key.h>
+#include <ClanLib/Display/Input/inputdevice.h>
+#include <ClanLib/Display/Input/inputbuffer.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
 #include "../Console.hh"
 #include "../PingusResource.hh"
 #include "StringReader.hh"

Index: StringReader.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/StringReader.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- StringReader.hh     4 Jun 2002 13:43:19 -0000       1.7
+++ StringReader.hh     10 Jun 2002 11:00:28 -0000      1.8
@@ -22,7 +22,6 @@
 
 #include <list>
 #include <string>
-#include <ClanLib/core.h>
 
 ///
 class StringReader
@@ -69,3 +68,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: SurfaceSelector.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/SurfaceSelector.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- SurfaceSelector.cc  22 Nov 2001 20:08:38 -0000      1.12
+++ SurfaceSelector.cc  10 Jun 2002 11:00:28 -0000      1.13
@@ -17,7 +17,10 @@
 //  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/core.h>
+#include <iostream>
+#include <ClanLib/Core/System/system.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Input/mouse.h>
 #include "../Display.hh"
 #include "../PingusResource.hh"
 #include "SurfaceSelector.hh"
@@ -190,3 +193,6 @@
 }
 
 /* EOF */
+
+
+

Index: ThumbCache.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ThumbCache.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ThumbCache.cc       4 Jun 2002 13:43:19 -0000       1.5
+++ ThumbCache.cc       10 Jun 2002 11:00:28 -0000      1.6
@@ -17,6 +17,9 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <iostream>
+#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/SurfaceProviders/canvas.h>
 #include "../globals.hh"
 #include "../blitter.hh"
 #include "../System.hh"

Index: ThumbCache.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ThumbCache.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ThumbCache.hh       4 Jun 2002 13:43:19 -0000       1.5
+++ ThumbCache.hh       10 Jun 2002 11:00:28 -0000      1.6
@@ -21,8 +21,6 @@
 #define THUMBCACHE_HH
 
 #include <string>
-#include <ClanLib/core.h>
-#include <ClanLib/display.h>
 
 /** This class is used inside the SurfaceSelector to load thumbnails
     of surfaces for selection */
@@ -44,3 +42,7 @@
 #endif
 
 /* EOF */
+
+
+
+

Index: WeatherObj.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/WeatherObj.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- WeatherObj.cc       9 Jun 2002 14:04:10 -0000       1.14
+++ WeatherObj.cc       10 Jun 2002 11:00:28 -0000      1.15
@@ -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 "../XMLhelper.hh"
 #include "../PingusResource.hh"
 #include "../boost/smart_ptr.hpp"