pingus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pingus-CVS] CVS: Games/Pingus/src ActionButton.cc,1.32,1.33 ActionButto


From: torangan
Subject: [Pingus-CVS] CVS: Games/Pingus/src ActionButton.cc,1.32,1.33 ActionButton.hh,1.22,1.23 AlphaButton.cc,1.5,1.6 AnimCounter.cc,1.3,1.4 ButtonPanel.cc,1.30,1.31 ButtonPanel.hh,1.16,1.17 CaptureRectangle.cc,1.21,1.22 Client.cc,1.83,1.84 Client.hh,1.39,1.40 ColMap.cc,1.31,1.32 Console.cc,1.20,1.21 Console.hh,1.16,1.17 Controller.cc,1.11,1.12 Controller.hh,1.12,1.13 Credits.cc,1.20,1.21 Credits.hh,1.8,1.9 DebugGui.cc,1.10,1.11 DeltaManager.hh,1.2,1.3 Display.cc,1.10,1.11 Entrance.hh,1.20,1.21 EntranceData.cc,1.9,1.10 EntranceData.hh,1.11,1.12 ExitData.cc,1.12,1.13 ExitData.hh,1.9,1.10 ExitMenu.cc,1.5,1.6 FPSCounter.cc,1.6,1.7 FVec.hh,1.6,1.7 FadeOut.cc,1.10,1.11 GamepadController.cc,1.14,1.15 GenericMain.cc,1.19,1.20 GlobalEvent.cc,1.17,1.18 GroundpieceData.cc,1.4,1.5 GroundpieceData.hh,1.14,1.15 GuiObj.cc,1.7,1.8 Hotspot.hh,1.10,1.11 HotspotData.cc,1.8,1.9 HotspotData.hh,1.9,1.10 HurryUp.cc,1.13,1.14 Intro.cc,1.23,1.24 Intro.hh,1.16,1.17 KeyboardController.cc,1.2,1.3 LayerManager.hh,1.8,1.9 Liquid.cc,1.18,1.19 Liquid.hh,1.13,1.14 LiquidData.cc,1.9,1.10 LiquidData.hh,1.12,1.13 Loading.cc,1.8,1.9 Loading.hh,1.6,1.7 MouseController.cc,1.8,1.9 MultiLineText.cc,1.4,1.5 MultiplayerClient.cc,1.5,1.6 MultiplayerClientChild.cc,1.13,1.14 MultiplayerConfig.cc,1.6,1.7 MultiplayerGame.cc,1.9,1.10 OptionMenu.cc,1.44,1.45 OptionMenu.hh,1.12,1.13 PLFPreview.cc,1.10,1.11 PLFPreview.hh,1.6,1.7 Pingu.cc,1.76,1.77 Pingu.hh,1.42,1.43 PinguActionFactory.cc,1.7,1.8 PinguBmpMap.cc,1.7,1.8 PinguBmpMap.hh,1.6,1.7 PinguInfo.cc,1.12,1.13 PinguMap.cc,1.8,1.9 PingusCounter.cc,1.12,1.13 PingusCounter.hh,1.6,1.7 PingusCounterBar.cc,1.8,1.9 PingusCounterBar.hh,1.3,1.4 PingusLevelDesc.cc,1.28,1.29 PingusLevelResult.cc,1.27,1.28 PingusMain.cc,1.62,1.63 PingusMain.hh,1.10,1.11 PingusMapManager.cc,1.3,1.4 PingusMapManager.hh,1.5,1.6 PingusMenu.cc,1.56,1.57 PingusMenuManager.cc,1.9,1.10 PingusMessageBox.cc,1.6,1.7 PingusResource.cc,1.25,1.26 PingusResource.hh,1.11,1.12 PingusSoundReal.cc,1.20,1.21 PingusSpotMap.cc,1.53,1.54 PingusSpotMap.hh,1.21,1.22 Playfield.cc,1.37,1.38 PlayfieldView.cc,1.9,1.10 PlayfieldView.hh,1.7,1.8 Position.hh,1.8,1.9 Screenshot.cc,1.12,1.13 Screenshot.hh,1.7,1.8 SmallMap.cc,1.43,1.44 SmallMapImage.cc,1.10,1.11 SmallMapImage.hh,1.3,1.4 Sprite.cc,1.16,1.17 Sprite.hh,1.15,1.16 Story.cc,1.15,1.16 Story.hh,1.4,1.5 StringConverter.cc,1.6,1.7 SurfaceButton.cc,1.38,1.39 SurfaceButton.hh,1.23,1.24 System.cc,1.40,1.41 TargetProvider.cc,1.2,1.3 TargetProvider.hh,1.3,1.4 Theme.cc,1.35,1.36 ThemeSelector.cc,1.58,1.59 ThemeSelector.hh,1.16,1.17 TimeDisplay.cc,1.11,1.12 Timer.cc,1.1,1.2 Trap.hh,1.22,1.23 TrapData.cc,1.12,1.13 TrapData.hh,1.15,1.16 TrueServer.cc,1.32,1.33 USBMouseController.cc,1.3,1.4 View.cc,1.21,1.22 View.hh,1.13,1.14 WorldObjGroupData.hh,1.4,1.5 XMLhelper.cc,1.17,1.18 blitter.cc,1.36,1.37 blitter.hh,1.12,1.13
Date: 10 Jun 2002 11:00:32 -0000

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

Modified Files:
        ActionButton.cc ActionButton.hh AlphaButton.cc AnimCounter.cc 
        ButtonPanel.cc ButtonPanel.hh CaptureRectangle.cc Client.cc 
        Client.hh ColMap.cc Console.cc Console.hh Controller.cc 
        Controller.hh Credits.cc Credits.hh DebugGui.cc 
        DeltaManager.hh Display.cc Entrance.hh EntranceData.cc 
        EntranceData.hh ExitData.cc ExitData.hh ExitMenu.cc 
        FPSCounter.cc FVec.hh FadeOut.cc GamepadController.cc 
        GenericMain.cc GlobalEvent.cc GroundpieceData.cc 
        GroundpieceData.hh GuiObj.cc Hotspot.hh HotspotData.cc 
        HotspotData.hh HurryUp.cc Intro.cc Intro.hh 
        KeyboardController.cc LayerManager.hh Liquid.cc Liquid.hh 
        LiquidData.cc LiquidData.hh Loading.cc Loading.hh 
        MouseController.cc MultiLineText.cc MultiplayerClient.cc 
        MultiplayerClientChild.cc MultiplayerConfig.cc 
        MultiplayerGame.cc OptionMenu.cc OptionMenu.hh PLFPreview.cc 
        PLFPreview.hh Pingu.cc Pingu.hh PinguActionFactory.cc 
        PinguBmpMap.cc PinguBmpMap.hh PinguInfo.cc PinguMap.cc 
        PingusCounter.cc PingusCounter.hh PingusCounterBar.cc 
        PingusCounterBar.hh PingusLevelDesc.cc PingusLevelResult.cc 
        PingusMain.cc PingusMain.hh PingusMapManager.cc 
        PingusMapManager.hh PingusMenu.cc PingusMenuManager.cc 
        PingusMessageBox.cc PingusResource.cc PingusResource.hh 
        PingusSoundReal.cc PingusSpotMap.cc PingusSpotMap.hh 
        Playfield.cc PlayfieldView.cc PlayfieldView.hh Position.hh 
        Screenshot.cc Screenshot.hh SmallMap.cc SmallMapImage.cc 
        SmallMapImage.hh Sprite.cc Sprite.hh Story.cc Story.hh 
        StringConverter.cc SurfaceButton.cc SurfaceButton.hh System.cc 
        TargetProvider.cc TargetProvider.hh Theme.cc ThemeSelector.cc 
        ThemeSelector.hh TimeDisplay.cc Timer.cc Trap.hh TrapData.cc 
        TrapData.hh TrueServer.cc USBMouseController.cc View.cc 
        View.hh WorldObjGroupData.hh XMLhelper.cc blitter.cc 
        blitter.hh 
Log Message:
replaced ClanLib/core.h and ClanLib/display.h with the really required headers


Index: ActionButton.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ActionButton.cc,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ActionButton.cc     8 Jun 2002 23:11:07 -0000       1.32
+++ ActionButton.cc     10 Jun 2002 11:00:25 -0000      1.33
@@ -19,6 +19,10 @@
 
 #include <cstdio>
 
+#include <ClanLib/Core/Math/cl_vector.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Display/Input/mouse.h>
 #include "algo.hh"
 #include "globals.hh"
 #include "PingusResource.hh"

Index: ActionButton.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ActionButton.hh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ActionButton.hh     8 Jun 2002 23:11:07 -0000       1.22
+++ ActionButton.hh     10 Jun 2002 11:00:25 -0000      1.23
@@ -20,13 +20,14 @@
 #ifndef ACTIONBUTTON_HH
 #define ACTIONBUTTON_HH
 
+#include <ClanLib/Display/Display/surface.h>
 #include <string>
-#include <ClanLib/core.h>
-#include <ClanLib/display.h>
 #include "AnimCounter.hh"
 
 class Server;
 class ActionHolder;
+class CL_Font;
+class CL_Vector;
 
 // ----------------- snip --------------------
 ///
@@ -202,3 +203,7 @@
 #endif /* ACTIONBUTTON */
 
 /* EOF */
+
+
+
+

Index: AlphaButton.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/AlphaButton.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- AlphaButton.cc      27 Jun 2000 16:05:16 -0000      1.5
+++ AlphaButton.cc      10 Jun 2002 11:00:25 -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 <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Display/Input/mouse.h>
 #include "PingusResource.hh"
 
 #include "AlphaButton.hh"

Index: AnimCounter.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/AnimCounter.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- AnimCounter.cc      7 Jun 2002 09:42:16 -0000       1.3
+++ AnimCounter.cc      10 Jun 2002 11:00:25 -0000      1.4
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "AnimCounter.hh"
-#include <ClanLib/core.h>
+#include <ClanLib/Core/System/system.h>
 
 AnimCounter::AnimCounter()
 {
@@ -70,3 +70,6 @@
 }
 
 /* EOF */
+
+
+

Index: ButtonPanel.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ButtonPanel.cc,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ButtonPanel.cc      9 Jun 2002 20:59:43 -0000       1.30
+++ ButtonPanel.cc      10 Jun 2002 11:00:25 -0000      1.31
@@ -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 <ClanLib/Core/System/system.h>
+#include <ClanLib/Display/Input/mouse.h>
+#include <ClanLib/Display/Display/display.h>
 #include "PingusResource.hh"
 #include "globals.hh"
 #include "Pingu.hh"

Index: ButtonPanel.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ButtonPanel.hh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ButtonPanel.hh      9 Jun 2002 20:59:43 -0000       1.16
+++ ButtonPanel.hh      10 Jun 2002 11:00:25 -0000      1.17
@@ -21,11 +21,13 @@
 #define BUTTON_PANEL_HH
 
 #include <vector>
+#include <ClanLib/Display/Display/surface.h>
 #include "boost/smart_ptr.hpp"
 
 #include "GuiObj.hh"
 #include "ActionButton.hh"
 
+class CL_Key;
 class Client;
 class PLF;
 class World;

Index: CaptureRectangle.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/CaptureRectangle.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- CaptureRectangle.cc 9 Jun 2002 11:18:50 -0000       1.21
+++ CaptureRectangle.cc 10 Jun 2002 11:00:25 -0000      1.22
@@ -21,6 +21,7 @@
 #include <cstdio>
 #include <cassert>
 
+#include <ClanLib/Display/Font/font.h>
 #include "globals.hh"
 #include "Pingu.hh"
 #include "StringConverter.hh"

Index: Client.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Client.cc,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- Client.cc   9 Jun 2002 20:59:43 -0000       1.83
+++ Client.cc   10 Jun 2002 11:00:25 -0000      1.84
@@ -18,6 +18,10 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Display/mousecursor_provider.h>
+#include <ClanLib/Display/Input/input.h>
+#include <ClanLib/Display/Input/keyboard.h>
 #include "globals.hh"
 #include "Client.hh"
 #include "FadeOut.hh"

Index: Client.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Client.hh,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Client.hh   9 Jun 2002 20:59:43 -0000       1.39
+++ Client.hh   10 Jun 2002 11:00:25 -0000      1.40
@@ -20,15 +20,16 @@
 #ifndef CLIENT_HH
 #define CLIENT_HH
 
-#include <ClanLib/core.h>
-#include <ClanLib/display.h>
-
+#include <ClanLib/Signals/slot.h>
+#include <ClanLib/Display/Input/inputdevice.h>
 #include <string>
 #include <vector>
 #include "boost/smart_ptr.hpp"
 
 #include "Result.hh"
 
+class CL_Key;
+class CL_Vector;
 class ButtonPanel;
 class Controller;
 class Cursor;
@@ -157,3 +158,7 @@
 #endif
 
 /* EOF */
+
+
+
+

Index: ColMap.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ColMap.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ColMap.cc   8 Jun 2002 23:11:07 -0000       1.31
+++ ColMap.cc   10 Jun 2002 11:00:25 -0000      1.32
@@ -23,6 +23,8 @@
 #include <cstdio>
 #include <cstdlib>
 
+#include <ClanLib/Display/Display/surfaceprovider.h>
+#include <ClanLib/Display/SurfaceProviders/canvas.h>
 #include "algo.hh"
 #include "globals.hh"
 #include "PingusResource.hh"

Index: Console.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Console.cc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Console.cc  5 Jun 2002 17:51:08 -0000       1.20
+++ Console.cc  10 Jun 2002 11:00:25 -0000      1.21
@@ -22,6 +22,8 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <assert.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
 #include "PingusResource.hh"
 #include "Console.hh"
 

Index: Console.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Console.hh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Console.hh  7 Jun 2002 20:35:14 -0000       1.16
+++ Console.hh  10 Jun 2002 11:00:25 -0000      1.17
@@ -25,8 +25,7 @@
 #include <iostream>
 #include "Display.hh"
 
-//#include <ClanLib/core.h>
-#include <ClanLib/display.h>
+class CL_Font;
 
 #define CONSOLE_BUFFER_SIZE 100
 
@@ -114,3 +113,7 @@
 #endif
 
 /* EOF */
+
+
+
+

Index: Controller.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Controller.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Controller.cc       7 Jun 2002 14:50:34 -0000       1.11
+++ Controller.cc       10 Jun 2002 11:00:25 -0000      1.12
@@ -17,10 +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/signals.h>
+#include <ClanLib/Display/Input/inputbutton.h>
+#include <ClanLib/Display/Input/keyboard.h>
+#include <ClanLib/Display/Display/display.h>
 #include "PingusError.hh"
 #include "Controller.hh"
-#include <ClanLib/display.h>
-#include <ClanLib/signals.h>
 
 /* Headers needed for i18n / gettext */
 #include <clocale>
@@ -164,3 +166,4 @@
 }
 
 /* EOF */
+

Index: Controller.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Controller.hh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Controller.hh       7 Jun 2002 14:50:34 -0000       1.12
+++ Controller.hh       10 Jun 2002 11:00:25 -0000      1.13
@@ -20,7 +20,11 @@
 #ifndef CONTROLLER_HH
 #define CONTROLLER_HH
 
-#include <ClanLib/core.h>
+#include <ClanLib/Signals/slot.h>
+#include <ClanLib/Signals/signal_v1.h>
+#include <ClanLib/Core/Math/rect.h>
+#include <ClanLib/Core/Math/cl_vector.h>
+#include <ClanLib/Core/System/keep_alive.h>
 #include "boost/smart_ptr.hpp"
 
 template <class T> class CL_Signal_v1;
@@ -141,3 +145,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: Credits.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Credits.cc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Credits.cc  5 Dec 2001 09:15:50 -0000       1.20
+++ Credits.cc  10 Jun 2002 11:00:25 -0000      1.21
@@ -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 <iostream>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Input/keyboard.h>
+#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Display/Input/key.h>
 #include "DeltaManager.hh"
 #include "Display.hh"
 #include "PingusSound.hh"

Index: Credits.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Credits.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Credits.hh  7 Jun 2002 13:25:02 -0000       1.8
+++ Credits.hh  10 Jun 2002 11:00:25 -0000      1.9
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <vector>
-#include <ClanLib/display.h>
+#include <ClanLib/Display/Display/surface.h>
 
 class CL_Font;
 
@@ -67,3 +67,4 @@
 #endif
 
 /* EOF */
+

Index: DebugGui.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/DebugGui.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- DebugGui.cc 8 Jun 2002 23:11:07 -0000       1.10
+++ DebugGui.cc 10 Jun 2002 11:00:25 -0000      1.11
@@ -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 "PingusResource.hh"
 
 #include "DebugGui.hh"

Index: DeltaManager.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/DeltaManager.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DeltaManager.hh     4 Apr 2001 10:21:16 -0000       1.2
+++ DeltaManager.hh     10 Jun 2002 11:00:25 -0000      1.3
@@ -20,7 +20,7 @@
 #ifndef DELTAMANAGER_HH
 #define DELTAMANAGER_HH
 
-#include <ClanLib/core.h>
+#include <ClanLib/Core/System/system.h>
 
 class DeltaManager
 {
@@ -52,3 +52,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: Display.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Display.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Display.cc  7 Jun 2002 20:35:14 -0000       1.10
+++ Display.cc  10 Jun 2002 11:00:25 -0000      1.11
@@ -17,10 +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 <iostream>
 #include <algorithm>
-#include <ClanLib/core.h>
-#include <ClanLib/display.h>
-
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Display/mousecursor.h>
 #include "globals.hh"
 #include "Display.hh"
 
@@ -111,3 +111,7 @@
 }
 
 /* EOF */
+
+
+
+

Index: Entrance.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Entrance.hh,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Entrance.hh 8 Jun 2002 16:08:16 -0000       1.20
+++ Entrance.hh 10 Jun 2002 11:00:25 -0000      1.21
@@ -20,7 +20,7 @@
 #ifndef ENTRANCE_HH
 #define ENTRANCE_HH
 
-#include <ClanLib/display.h>
+#include <ClanLib/Display/Display/surface.h>
 #include "WorldObj.hh"
 #include "EntranceData.hh"
 
@@ -49,3 +49,4 @@
 #endif
 
 /* EOF */
+

Index: EntranceData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/EntranceData.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- EntranceData.cc     9 Jun 2002 13:29:26 -0000       1.9
+++ EntranceData.cc     10 Jun 2002 11:00:25 -0000      1.10
@@ -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 "entrances/WoodThing.hh"
 #include "entrances/Cloud.hh"
 #include "editor/PLFObj.hh"

Index: EntranceData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/EntranceData.hh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- EntranceData.hh     9 Jun 2002 13:03:11 -0000       1.11
+++ EntranceData.hh     10 Jun 2002 11:00:25 -0000      1.12
@@ -65,3 +65,5 @@
 #endif
 
 /* EOF */
+
+

Index: ExitData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ExitData.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ExitData.cc 9 Jun 2002 13:29:26 -0000       1.12
+++ ExitData.cc 10 Jun 2002 11:00:25 -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 "Exit.hh"
 #include "editor/PLFObj.hh"
 #include "StringConverter.hh"

Index: ExitData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ExitData.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ExitData.hh 9 Jun 2002 13:03:11 -0000       1.9
+++ ExitData.hh 10 Jun 2002 11:00:25 -0000      1.10
@@ -20,7 +20,7 @@
 #ifndef EXIT_DATA_HH
 #define EXIT_DATA_HH
 
-#include <ClanLib/core.h>
+#include <ClanLib/Core/Math/cl_vector.h>
 #include "ResDescriptor.hh"
 #include "WorldObjData.hh"
 
@@ -62,3 +62,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: ExitMenu.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ExitMenu.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ExitMenu.cc 8 Jun 2002 23:11:07 -0000       1.5
+++ ExitMenu.cc 10 Jun 2002 11:00:25 -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 <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Input/key.h>
+#include <ClanLib/Display/Input/input.h>
 #include "PingusMenuManager.hh"
 #include "PingusResource.hh"
 

Index: FPSCounter.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/FPSCounter.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FPSCounter.cc       5 Dec 2001 09:15:50 -0000       1.6
+++ FPSCounter.cc       10 Jun 2002 11:00:25 -0000      1.7
@@ -18,7 +18,9 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <cstdio>
-#include <ClanLib/core.h>
+#include <ClanLib/Core/System/system.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
 #include "PingusResource.hh"
 #include "FPSCounter.hh"
 
@@ -89,3 +91,6 @@
 }
 
 /* EOF */
+
+
+

Index: FVec.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/FVec.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FVec.hh     1 Jun 2002 18:05:34 -0000       1.6
+++ FVec.hh     10 Jun 2002 11:00:25 -0000      1.7
@@ -23,7 +23,7 @@
 #define FVEC_HH
 
 #include <vector>
-#include <ClanLib/core.h>
+#include <ClanLib/Core/Math/cl_vector.h>
 
 /// Gravity
 extern CL_Vector grav;
@@ -107,4 +107,7 @@
 #endif /* FVEC_HH */
 
 /* EOF */
+
+
+
 

Index: FadeOut.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/FadeOut.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- FadeOut.cc  7 Jun 2002 20:35:14 -0000       1.10
+++ FadeOut.cc  10 Jun 2002 11:00:25 -0000      1.11
@@ -17,8 +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 <ClanLib/core.h>
-#include <ClanLib/display.h>
+#include <iostream>
+#include <ClanLib/Core/System/system.h>
+#include <ClanLib/Display/Display/display.h>
 #include "Display.hh"
 #include "FadeOut.hh"
 #include "globals.hh"
@@ -152,3 +153,7 @@
 }
 
 /* EOF */
+
+
+
+

Index: GamepadController.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/GamepadController.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- GamepadController.cc        7 Jun 2002 20:35:14 -0000       1.14
+++ GamepadController.cc        10 Jun 2002 11:00:25 -0000      1.15
@@ -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/display.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Input/inputdevice.h>
+#include <ClanLib/Display/Input/inputbutton.h>
+#include <ClanLib/Display/Input/inputaxis.h>
 #include "PingusError.hh"
 #include "GamepadController.hh"
 
@@ -122,3 +125,4 @@
 }
 
 /* EOF */
+

Index: GenericMain.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/GenericMain.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- GenericMain.cc      8 Jun 2002 23:11:07 -0000       1.19
+++ GenericMain.cc      10 Jun 2002 11:00:25 -0000      1.20
@@ -20,7 +20,7 @@
 
 #include <iostream>
 
-#include <ClanLib/core.h>
+#include <ClanLib/Core/System/setupcore.h>
 #include <ClanLib/jpeg.h>
 #include <ClanLib/png.h>
 
@@ -96,3 +96,6 @@
 }
 
 /* EOF */
+
+
+

Index: GlobalEvent.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/GlobalEvent.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- GlobalEvent.cc      1 Jun 2002 18:05:34 -0000       1.17
+++ GlobalEvent.cc      10 Jun 2002 11:00:25 -0000      1.18
@@ -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 <ClanLib/Display/Input/input.h>
+#include <ClanLib/Display/Input/keyboard.h>
+#include <ClanLib/Display/Input/key.h>
 #include "Screenshot.hh"
 #include "Console.hh"
 #include "FPSCounter.hh"

Index: GroundpieceData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/GroundpieceData.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- GroundpieceData.cc  8 Jun 2002 20:19:53 -0000       1.4
+++ GroundpieceData.cc  10 Jun 2002 11:00:25 -0000      1.5
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <list>
+#include <fstream>
 #include "XMLhelper.hh"
 #include "editor/EditorGroundpieceObj.hh"
 #include "boost/smart_ptr.hpp"

Index: GroundpieceData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/GroundpieceData.hh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- GroundpieceData.hh  8 Jun 2002 23:11:07 -0000       1.14
+++ GroundpieceData.hh  10 Jun 2002 11:00:25 -0000      1.15
@@ -20,8 +20,8 @@
 #ifndef GROUNDPIECEDATA_HH
 #define GROUNDPIECEDATA_HH
 
-#include <ClanLib/core.h>
-#include <ClanLib/display.h>
+#include <ClanLib/Core/Math/cl_vector.h>
+#include <ClanLib/Display/Display/surface.h>
 
 #include "ResDescriptor.hh"
 
@@ -65,3 +65,7 @@
 #endif
 
 /* EOF */
+
+
+
+

Index: GuiObj.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/GuiObj.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- GuiObj.cc   1 Jun 2002 18:05:34 -0000       1.7
+++ GuiObj.cc   10 Jun 2002 11:00:25 -0000      1.8
@@ -17,8 +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.h>
-#include <ClanLib/display.h>
+#include <ClanLib/Display/Display/display.h>
 #include "GuiObj.hh"
 
 GuiObj::GuiObj()
@@ -63,3 +62,7 @@
 }
 
 /* EOF */
+
+
+
+

Index: Hotspot.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Hotspot.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Hotspot.hh  7 Jun 2002 20:35:14 -0000       1.10
+++ Hotspot.hh  10 Jun 2002 11:00:25 -0000      1.11
@@ -20,7 +20,7 @@
 #ifndef HOTSPOT_HH
 #define HOTSPOT_HH
 
-#include <ClanLib/display.h>
+#include <ClanLib/Display/Display/surface.h>
 
 #include "WorldObj.hh"
 #include "AnimCounter.hh"
@@ -44,3 +44,4 @@
 #endif
 
 /* EOF */
+

Index: HotspotData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/HotspotData.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- HotspotData.cc      9 Jun 2002 13:03:11 -0000       1.8
+++ HotspotData.cc      10 Jun 2002 11:00:25 -0000      1.9
@@ -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 "EditorHotspot.hh"
 #include "HotspotData.hh"
 #include "XMLhelper.hh"

Index: HotspotData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/HotspotData.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- HotspotData.hh      9 Jun 2002 13:03:11 -0000       1.9
+++ HotspotData.hh      10 Jun 2002 11:00:25 -0000      1.10
@@ -20,7 +20,7 @@
 #ifndef HOTSPOT_DATA_HH
 #define HOTSPOT_DATA_HH
 
-#include <ClanLib/core.h>
+#include <ClanLib/Core/Math/cl_vector.h>
 #include "ResDescriptor.hh"
 #include "WorldObjData.hh"
 
@@ -59,3 +59,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: HurryUp.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/HurryUp.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- HurryUp.cc  8 Jun 2002 20:19:53 -0000       1.13
+++ HurryUp.cc  10 Jun 2002 11:00:25 -0000      1.14
@@ -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 <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Core/System/system.h>
 #include "PingusResource.hh"
 #include "HurryUp.hh"
 #include "Client.hh"

Index: Intro.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Intro.cc,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Intro.cc    8 Jun 2002 23:11:07 -0000       1.23
+++ Intro.cc    10 Jun 2002 11:00:25 -0000      1.24
@@ -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 <ClanLib/Core/System/system.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Display/Input/input.h>
+#include <ClanLib/Display/Input/keyboard.h>
 #include "PingusMenuManager.hh"
 #include "PingusResource.hh"
 #include "Display.hh"

Index: Intro.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Intro.hh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Intro.hh    7 Jun 2002 20:35:14 -0000       1.16
+++ Intro.hh    10 Jun 2002 11:00:26 -0000      1.17
@@ -20,8 +20,12 @@
 #ifndef INTRO_HH
 #define INTRO_HH
 
-#include <ClanLib/core.h>
-#include <ClanLib/display.h>
+#include <ClanLib/Core/Math/cl_vector.h>
+#include <ClanLib/Display/Display/surface.h>
+
+class CL_Key;
+class CL_Font;
+class CL_InputDevice;
 
 #include "PingusSubMenu.hh"
 
@@ -51,3 +55,7 @@
 #endif
 
 /* EOF */
+
+
+
+

Index: KeyboardController.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/KeyboardController.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- KeyboardController.cc       6 Jun 2002 15:55:54 -0000       1.2
+++ KeyboardController.cc       10 Jun 2002 11:00:26 -0000      1.3
@@ -17,8 +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 <ClanLib/Display/Input/key.h>
+#include <ClanLib/Display/Input/keyboard.h>        
 #include "KeyboardController.hh"
-#include <ClanLib/display.h>
 
 KeyboardController::KeyboardController (int owner_id)
   : Controller (owner_id)
@@ -76,3 +77,4 @@
 }
 
 /* EOF */
+

Index: LayerManager.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/LayerManager.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- LayerManager.hh     9 Jun 2002 14:04:10 -0000       1.8
+++ LayerManager.hh     10 Jun 2002 11:00:26 -0000      1.9
@@ -22,7 +22,7 @@
 
 #include <math.h>
 #include <vector>
-#include <ClanLib/display.h>
+#include <ClanLib/Display/Display/surface.h>
 
 class LayerManager
 {
@@ -73,3 +73,4 @@
 #endif
 
 /* EOF */
+

Index: Liquid.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Liquid.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Liquid.cc   8 Jun 2002 23:11:07 -0000       1.18
+++ Liquid.cc   10 Jun 2002 11:00:26 -0000      1.19
@@ -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/display.h>
 #include "World.hh"
 #include "PingusResource.hh"
 #include "ColMap.hh"

Index: Liquid.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Liquid.hh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Liquid.hh   7 Jun 2002 20:35:14 -0000       1.13
+++ Liquid.hh   10 Jun 2002 11:00:26 -0000      1.14
@@ -20,7 +20,7 @@
 #ifndef LIQUID_HH
 #define LIQUID_HH
 
-#include <ClanLib/display.h>
+#include <ClanLib/Display/Display/surface.h>
 #include "AnimCounter.hh"
 #include "WorldObj.hh"
 #include "LiquidData.hh"
@@ -46,3 +46,4 @@
 #endif
 
 /* EOF */
+

Index: LiquidData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/LiquidData.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- LiquidData.cc       9 Jun 2002 13:03:11 -0000       1.9
+++ LiquidData.cc       10 Jun 2002 11:00:26 -0000      1.10
@@ -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 "boost/smart_ptr.hpp"
 #include "Liquid.hh"
 #include "editor/PLFObj.hh"

Index: LiquidData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/LiquidData.hh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- LiquidData.hh       9 Jun 2002 13:03:11 -0000       1.12
+++ LiquidData.hh       10 Jun 2002 11:00:26 -0000      1.13
@@ -71,3 +71,5 @@
 #endif
 
 /* EOF */
+
+

Index: Loading.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Loading.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Loading.cc  14 Dec 2000 21:35:54 -0000      1.8
+++ Loading.cc  10 Jun 2002 11:00:26 -0000      1.9
@@ -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 "PingusResource.hh"
 #include "Display.hh"
 #include "Loading.hh"

Index: Loading.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Loading.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Loading.hh  8 Jun 2002 20:19:53 -0000       1.6
+++ Loading.hh  10 Jun 2002 11:00:26 -0000      1.7
@@ -20,7 +20,7 @@
 #ifndef LOADING_HH
 #define LOADING_HH
 
-#include <ClanLib/display.h>
+#include <ClanLib/Display/Display/surface.h>
 
 class CL_Font;
 
@@ -55,3 +55,4 @@
 #endif
 
 /* EOF */
+

Index: MouseController.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MouseController.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- MouseController.cc  27 Jul 2001 15:00:47 -0000      1.8
+++ MouseController.cc  10 Jun 2002 11:00:26 -0000      1.9
@@ -17,7 +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.h>
+#include <ClanLib/Display/Input/mouse.h>
+#include <ClanLib/Display/Input/keyboard.h>
 #include "MouseController.hh"
 
 /* All this should be rewritten to have a MultiplexButton, a KeyboardButton, 
etc. */
@@ -154,3 +155,4 @@
 }
   
 /* EOF */
+

Index: MultiLineText.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiLineText.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MultiLineText.cc    7 Jun 2002 20:35:14 -0000       1.4
+++ MultiLineText.cc    10 Jun 2002 11:00:26 -0000      1.5
@@ -19,8 +19,8 @@
 
 #include <cassert>
 #include <algorithm>
+#include <ClanLib/Display/Font/font.h>
 #include "MultiLineText.hh"
-#include <ClanLib/display.h>
 
 using namespace std;
 
@@ -139,3 +139,4 @@
 }
 
 /* EOF */
+

Index: MultiplayerClient.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiplayerClient.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- MultiplayerClient.cc        7 Jun 2002 14:50:34 -0000       1.5
+++ MultiplayerClient.cc        10 Jun 2002 11:00:26 -0000      1.6
@@ -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/display.h>
 #include "SmallMapImage.hh"
 #include "MultiplayerClient.hh"
 

Index: MultiplayerClientChild.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiplayerClientChild.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- MultiplayerClientChild.cc   9 Jun 2002 20:59:43 -0000       1.13
+++ MultiplayerClientChild.cc   10 Jun 2002 11:00:26 -0000      1.14
@@ -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/Math/cl_vector.h>
+#include <ClanLib/Display/Input/key.h>
 #include "MultiplayerClientChild.hh"
+#include "Pingu.hh"
 
 using boost::shared_ptr;
 

Index: MultiplayerConfig.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiplayerConfig.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- MultiplayerConfig.cc        7 Jun 2002 20:35:14 -0000       1.6
+++ MultiplayerConfig.cc        10 Jun 2002 11:00:26 -0000      1.7
@@ -17,8 +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 <ClanLib/core.h>
-#include <ClanLib/display.h>
+#include <iostream>
+#include <ClanLib/Core/System/system.h>
+#include <ClanLib/Display/Display/display.h>
 #include "Display.hh"
 #include "MultiplayerGame.hh"
 #include "MultiplayerConfig.hh"
@@ -50,3 +51,7 @@
 }
 
 /* EOF */
+
+
+
+

Index: MultiplayerGame.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiplayerGame.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- MultiplayerGame.cc  9 Jun 2002 20:59:43 -0000       1.9
+++ MultiplayerGame.cc  10 Jun 2002 11:00:26 -0000      1.10
@@ -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/Input/input.h>
+#include <ClanLib/Display/Display/display.h>
 #include "PathManager.hh"
 #include "TrueServer.hh"
 #include "MultiplayerClient.hh"

Index: OptionMenu.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/OptionMenu.cc,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- OptionMenu.cc       8 Jun 2002 23:11:07 -0000       1.44
+++ OptionMenu.cc       10 Jun 2002 11:00:26 -0000      1.45
@@ -19,6 +19,13 @@
 
 #include <cstdio>
 
+#include <ClanLib/Core/System/system.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Display/Input/mouse.h>
+#include <ClanLib/Display/Input/input.h>
+#include <ClanLib/Display/Input/keyboard.h>
+#include <ClanLib/Display/Display/mousecursor_provider.h>
 #include "globals.hh"
 #include "PingusResource.hh"
 #include "StringConverter.hh"

Index: OptionMenu.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/OptionMenu.hh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- OptionMenu.hh       7 Jun 2002 20:35:14 -0000       1.12
+++ OptionMenu.hh       10 Jun 2002 11:00:26 -0000      1.13
@@ -21,9 +21,6 @@
 #define OPTIONMENU_HH
 
 #include <vector>
-
-#include <ClanLib/display.h>
-
 #include "PingusSubMenu.hh"
 
 class CL_Key;
@@ -137,3 +134,4 @@
 #endif
 
 /* EOF */
+

Index: PLFPreview.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PLFPreview.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- PLFPreview.cc       7 Jun 2002 19:10:33 -0000       1.10
+++ PLFPreview.cc       10 Jun 2002 11:00:26 -0000      1.11
@@ -20,7 +20,6 @@
 #include <iostream>
 
 #include "PingusSpotMap.hh"
-//#include "PinguBmpMap.hh"
 #include "PingusResource.hh"
 
 #include "PLFPreview.hh"

Index: PLFPreview.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PLFPreview.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PLFPreview.hh       7 Jun 2002 19:10:33 -0000       1.6
+++ PLFPreview.hh       10 Jun 2002 11:00:26 -0000      1.7
@@ -20,8 +20,6 @@
 #ifndef PLFPREVIEW_HH
 #define PLFPREVIEW_HH
 
-#include <ClanLib/core.h>
-
 class PLF;
 
 /// A class to load and manage a small level preview surface
@@ -40,3 +38,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: Pingu.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Pingu.cc,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- Pingu.cc    9 Jun 2002 11:18:50 -0000       1.76
+++ Pingu.cc    10 Jun 2002 11:00:26 -0000      1.77
@@ -21,6 +21,7 @@
 #include <cstdio>
 #include <cmath>
 
+#include <ClanLib/Display/Font/font.h>
 #include "boost/smart_ptr.hpp"
 #include "actions/Drown.hh"
 #include "actions/Splashed.hh"

Index: Pingu.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Pingu.hh,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Pingu.hh    9 Jun 2002 00:56:25 -0000       1.42
+++ Pingu.hh    10 Jun 2002 11:00:26 -0000      1.43
@@ -20,14 +20,15 @@
 #ifndef PINGU_HH
 #define PINGU_HH
 
-#include <ClanLib/core.h>
-#include <ClanLib/display.h>
+#include <vector>
+#include <ClanLib/Core/Math/cl_vector.h>
 #include "boost/smart_ptr.hpp"
 
 #include "Direction.hh"
 #include "PinguAction.hh"
 
 // Forward declarations
+class CL_Font;
 class ActionHolder;
 class PinguAction;
 
@@ -189,3 +190,7 @@
 #endif /* PINGU_HH */
 
 /* EOF */
+
+
+
+

Index: PinguActionFactory.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguActionFactory.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- PinguActionFactory.cc       9 Jun 2002 13:03:11 -0000       1.7
+++ PinguActionFactory.cc       10 Jun 2002 11:00:26 -0000      1.8
@@ -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 "PingusError.hh"
 
 #include "actions/RocketLauncher.hh"

Index: PinguBmpMap.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguBmpMap.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- PinguBmpMap.cc      8 Jun 2002 20:19:53 -0000       1.7
+++ PinguBmpMap.cc      10 Jun 2002 11:00:26 -0000      1.8
@@ -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 "PinguBmpMap.hh"
 #include "globals.hh"
 #include "PingusError.hh"

Index: PinguBmpMap.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguBmpMap.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PinguBmpMap.hh      8 Jun 2002 20:19:53 -0000       1.6
+++ PinguBmpMap.hh      10 Jun 2002 11:00:27 -0000      1.7
@@ -20,7 +20,7 @@
 #ifndef PINGUBMPMAP_HH
 #define PINGUBMPMAP_HH
 
-#include <ClanLib/display.h>
+#include <ClanLib/Display/Display/surface.h>
 
 #include "PinguMap.hh"
 
@@ -58,3 +58,4 @@
 #endif
 
 /* EOF */
+

Index: PinguInfo.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguInfo.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- PinguInfo.cc        9 Jun 2002 00:56:25 -0000       1.12
+++ PinguInfo.cc        10 Jun 2002 11:00:27 -0000      1.13
@@ -19,6 +19,8 @@
 
 #include <cstdio>
 
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
 #include "algo.hh"
 #include "PinguAction.hh"
 #include "PingusResource.hh"

Index: PinguMap.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguMap.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- PinguMap.cc 1 Jun 2002 18:05:35 -0000       1.8
+++ PinguMap.cc 10 Jun 2002 11:00:27 -0000      1.9
@@ -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/display.h>
 #include "ColMap.hh"
 #include "PinguMap.hh"
 

Index: PingusCounter.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusCounter.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- PingusCounter.cc    8 Jun 2002 23:11:07 -0000       1.12
+++ PingusCounter.cc    10 Jun 2002 11:00:27 -0000      1.13
@@ -19,6 +19,8 @@
 
 #include <cstdio>
 
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
 #include "globals.hh"
 #include "PingusResource.hh"
 #include "PingusCounter.hh"

Index: PingusCounter.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusCounter.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PingusCounter.hh    8 Jun 2002 20:19:53 -0000       1.6
+++ PingusCounter.hh    10 Jun 2002 11:00:27 -0000      1.7
@@ -20,8 +20,6 @@
 #ifndef PINGUSCOUNTER_HH
 #define PINGUSCOUNTER_HH
 
-#include <ClanLib/core.h>
-
 #include "GuiObj.hh"
 
 class World;
@@ -52,3 +50,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: PingusCounterBar.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusCounterBar.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- PingusCounterBar.cc 8 Jun 2002 23:11:07 -0000       1.8
+++ PingusCounterBar.cc 10 Jun 2002 11:00:27 -0000      1.9
@@ -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/Display/display.h>
 #include "PingusCounterBar.hh"
 #include "Server.hh"
 #include "World.hh"

Index: PingusCounterBar.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusCounterBar.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PingusCounterBar.hh 8 Jun 2002 20:19:53 -0000       1.3
+++ PingusCounterBar.hh 10 Jun 2002 11:00:27 -0000      1.4
@@ -20,7 +20,7 @@
 #ifndef PINGUSCOUNTERBAR_HH
 #define PINGUSCOUNTERBAR_HH
 
-#include <ClanLib/core.h>
+#include <ClanLib/Core/Math/rect.h>
 #include "GuiObj.hh"
 
 class Server;
@@ -44,3 +44,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: PingusLevelDesc.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusLevelDesc.cc,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- PingusLevelDesc.cc  9 Jun 2002 20:59:43 -0000       1.28
+++ PingusLevelDesc.cc  10 Jun 2002 11:00:27 -0000      1.29
@@ -20,6 +20,9 @@
 #include <iostream>
 #include <cstdio>
 
+#include <ClanLib/Core/System/system.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
 #include "Display.hh"
 #include "PingusResource.hh"
 #include "PingusLevelDesc.hh"

Index: PingusLevelResult.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusLevelResult.cc,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- PingusLevelResult.cc        9 Jun 2002 20:59:43 -0000       1.27
+++ PingusLevelResult.cc        10 Jun 2002 11:00:27 -0000      1.28
@@ -19,6 +19,10 @@
 
 #include <cstdio>
 
+#include <ClanLib/Core/System/system.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Display/Input/mouse.h>
 #include "globals.hh"
 #include "PingusResource.hh"
 #include "PingusLevelResult.hh"

Index: PingusMain.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMain.cc,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- PingusMain.cc       9 Jun 2002 00:56:25 -0000       1.62
+++ PingusMain.cc       10 Jun 2002 11:00:27 -0000      1.63
@@ -36,6 +36,10 @@
 #  include "win32/getopt.h"
 #endif /* !WIN32 */
 
+#include <ClanLib/Core/System/system.h>
+#include <ClanLib/Display/setupdisplay.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Input/input.h>
 #include <ClanLib/jpeg.h>
 
 #ifdef HAVE_LIBCLANGL
@@ -47,7 +51,6 @@
 #include <clocale>
 #include "my_gettext.hh"
 
-// #include "efence.h"
 
 #include "PathManager.hh"
 #include "PingusMain.hh"
@@ -69,12 +72,10 @@
 #include "editor/Editor.hh"
 
 #include "PingusMenuManager.hh"
-//#include "Story.hh"
-
 #include "PingusSound.hh"
 #include "PingusSoundDummy.hh"
 
-#  include "PingusSoundReal.hh"
+#include "PingusSoundReal.hh"
 
 void
 signal_handler(int signo)

Index: PingusMain.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMain.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- PingusMain.hh       17 Feb 2002 14:16:27 -0000      1.10
+++ PingusMain.hh       10 Jun 2002 11:00:27 -0000      1.11
@@ -21,7 +21,7 @@
 #define PINGUS_HH
 
 #include <string>
-#include <ClanLib/core.h>
+#include <ClanLib/Signals/slot.h>
 
 #include "GenericMain.hh"
 
@@ -75,3 +75,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: PingusMapManager.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMapManager.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PingusMapManager.cc 1 Jun 2002 18:05:35 -0000       1.3
+++ PingusMapManager.cc 10 Jun 2002 11:00:27 -0000      1.4
@@ -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/surface.h>
+#include <ClanLib/Display/Display/surfaceprovider.h>
 #include "PingusMapManager.hh"
 
 std::string PingusMapManager::directory;

Index: PingusMapManager.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMapManager.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PingusMapManager.hh 8 Jun 2002 20:19:54 -0000       1.5
+++ PingusMapManager.hh 10 Jun 2002 11:00:27 -0000      1.6
@@ -21,13 +21,14 @@
 #define PINGUSMAPMANAGER_HH
 
 #include <string>
-#include <ClanLib/display.h>
 
 /* Support to assert macro under MS's compiler */
 #ifdef WIN32
     #include <assert.h>
 #endif
 
+class CL_Surface;
+
 class PingusMapManager
 {
 private:
@@ -41,3 +42,4 @@
 #endif
 
 /* EOF */
+

Index: PingusMenu.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMenu.cc,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- PingusMenu.cc       8 Jun 2002 23:11:08 -0000       1.56
+++ PingusMenu.cc       10 Jun 2002 11:00:27 -0000      1.57
@@ -17,10 +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/Display/Input/input.h>
+#include <ClanLib/Display/Input/keyboard.h>
+#include <ClanLib/Display/Input/inputdevice.h>
 #include "globals.hh"
 #include "AlphaButton.hh"
 #include "Credits.hh"
-// #include "FileSelector.hh"
 #include "PingusResource.hh"
 #include "PingusMessageBox.hh"
 #include "PingusError.hh"

Index: PingusMenuManager.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMenuManager.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- PingusMenuManager.cc        8 Jun 2002 23:11:08 -0000       1.9
+++ PingusMenuManager.cc        10 Jun 2002 11:00:27 -0000      1.10
@@ -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/Input/input.h>
+#include <ClanLib/Display/Input/keyboard.h>
 #include "globals.hh"
 #include "Display.hh"
 #include "DeltaManager.hh"

Index: PingusMessageBox.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMessageBox.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PingusMessageBox.cc 28 Jun 2000 19:49:18 -0000      1.6
+++ PingusMessageBox.cc 10 Jun 2002 11:00:27 -0000      1.7
@@ -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/core.h>
+#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 "Display.hh"
 #include "PingusResource.hh"
 #include "PingusMessageBox.hh"
@@ -49,3 +53,6 @@
 }
 
 /* EOF */
+
+
+

Index: PingusResource.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusResource.cc,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- PingusResource.cc   22 Jan 2002 22:48:05 -0000      1.25
+++ PingusResource.cc   10 Jun 2002 11:00:27 -0000      1.26
@@ -20,7 +20,7 @@
 #include <assert.h>
 #include <iostream>
 #include <ClanLib/png.h>
-
+#include <ClanLib/Display/Font/font.h>
 #include "System.hh"
 #include "PathManager.hh"
 #include "PingusError.hh"

Index: PingusResource.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusResource.hh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- PingusResource.hh   8 Jun 2002 23:11:08 -0000       1.11
+++ PingusResource.hh   10 Jun 2002 11:00:27 -0000      1.12
@@ -22,10 +22,11 @@
 
 #include <map>
 
-#include <ClanLib/display.h>
+#include <ClanLib/Display/Display/surface.h>
 #include "ResDescriptor.hh"
 
 class CL_Font;
+class CL_ResourceManager;
 
 /** General Resource Managing class, it provides wrappers around
     CL_Surface::load(), CL_Font::load() and friends.  This class is
@@ -62,3 +63,4 @@
 #endif
 
 /* EOF */
+

Index: PingusSoundReal.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusSoundReal.cc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- PingusSoundReal.cc  8 Jun 2002 23:11:08 -0000       1.20
+++ PingusSoundReal.cc  10 Jun 2002 11:00:27 -0000      1.21
@@ -19,8 +19,7 @@
 
 #include <iostream>
 
-// Needed cause of missing include in some sound file...
-#include <ClanLib/core.h>
+#include <ClanLib/Core/System/cl_assert.h>
 #include <ClanLib/sound.h>
 
 #include "globals.hh"
@@ -185,3 +184,6 @@
 
 
 /* EOF */
+
+
+

Index: PingusSpotMap.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusSpotMap.cc,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- PingusSpotMap.cc    8 Jun 2002 20:19:54 -0000       1.53
+++ PingusSpotMap.cc    10 Jun 2002 11:00:27 -0000      1.54
@@ -17,9 +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 <algorithm>
-//#include <cstdio>
-
+#include <ClanLib/Display/Display/surfaceprovider.h>
+#include <ClanLib/Display/SurfaceProviders/canvas.h>
+#include <ClanLib/Display/Display/display.h>
 #include "PingusResource.hh"
 #include "PLF.hh"
 #include "PingusError.hh"

Index: PingusSpotMap.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusSpotMap.hh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- PingusSpotMap.hh    8 Jun 2002 23:11:08 -0000       1.21
+++ PingusSpotMap.hh    10 Jun 2002 11:00:27 -0000      1.22
@@ -22,13 +22,14 @@
 #define PingusSpotMap_HH
 
 #include <vector>
-
+#include <ClanLib/Display/Display/surface.h>
 #include "globals.hh"
 #include "PinguMap.hh"
 #include "GroundpieceData.hh"
 
 class PLF;
 class ColMap;
+class CL_Canvas;
 
 class MapTileSurface
 {

Index: Playfield.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Playfield.cc,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- Playfield.cc        9 Jun 2002 20:59:43 -0000       1.37
+++ Playfield.cc        10 Jun 2002 11:00:27 -0000      1.38
@@ -21,6 +21,7 @@
 #include <cstdio>
 #include <cassert>
 
+#include <ClanLib/Display/Display/display.h>
 #include "Controller.hh"
 #include "algo.hh"
 #include "globals.hh"

Index: PlayfieldView.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PlayfieldView.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- PlayfieldView.cc    8 Jun 2002 23:11:08 -0000       1.9
+++ PlayfieldView.cc    10 Jun 2002 11:00:27 -0000      1.10
@@ -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 <ClanLib/Core/Math/rect.h>
+#include <ClanLib/Core/Math/cl_vector.h>
+#include <ClanLib/Display/Display/display.h>
 #include "PlayfieldView.hh"
 #include "World.hh"
 

Index: PlayfieldView.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PlayfieldView.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- PlayfieldView.hh    8 Jun 2002 20:19:54 -0000       1.7
+++ PlayfieldView.hh    10 Jun 2002 11:00:27 -0000      1.8
@@ -21,9 +21,11 @@
 #define PLAYFIELDVIEW_HH
 
 #include "GuiObj.hh"
-#include "Pingu.hh"
 
+class CL_Rect;
+class CL_Vector;
 class World;
+class Pingu;
 
 class PlayfieldView : public GuiObj
 {

Index: Position.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Position.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Position.hh 8 Jun 2002 20:19:54 -0000       1.8
+++ Position.hh 10 Jun 2002 11:00:27 -0000      1.9
@@ -21,7 +21,6 @@
 #define POSITION_HH
 
 #include <iosfwd>
-#include <ClanLib/core.h>
 
 /**
  * z_position contains aliases for the integers that specify 
@@ -72,6 +71,9 @@
 #endif
 
 /* EOF */
+
+
+
 
 
 

Index: Screenshot.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Screenshot.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Screenshot.cc       5 Dec 2001 09:15:51 -0000       1.12
+++ Screenshot.cc       10 Jun 2002 11:00:27 -0000      1.13
@@ -19,8 +19,11 @@
 
 #include <cstdio>
 #include <time.h>
+#include <fstream>
+#include <iostream>
 
-
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Display/target.h>
 #include "globals.hh"
 #include "System.hh"
 #include "Screenshot.hh"

Index: Screenshot.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Screenshot.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Screenshot.hh       18 Mar 2001 17:45:04 -0000      1.7
+++ Screenshot.hh       10 Jun 2002 11:00:27 -0000      1.8
@@ -20,8 +20,9 @@
 #ifndef SCREENSHOT_HH
 #define SCREENSHOT_HH
 
-#include <ClanLib/core.h>
-#include <ClanLib/display.h>
+#include <string>
+
+class CL_Target;
 
 /** Simple class to get a screenshot and save it as pnm */
 class Screenshot
@@ -45,3 +46,7 @@
 #endif
 
 /* EOF */
+
+
+
+

Index: SmallMap.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SmallMap.cc,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- SmallMap.cc 8 Jun 2002 23:11:08 -0000       1.43
+++ SmallMap.cc 10 Jun 2002 11:00:27 -0000      1.44
@@ -18,6 +18,10 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <vector>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/SurfaceProviders/canvas.h>
+#include <ClanLib/Display/Input/key.h>
+#include <ClanLib/Display/Input/mouse.h>
 #include "ExitData.hh"
 #include "EntranceData.hh"
 

Index: SmallMapImage.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SmallMapImage.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- SmallMapImage.cc    8 Jun 2002 20:19:54 -0000       1.10
+++ SmallMapImage.cc    10 Jun 2002 11:00:27 -0000      1.11
@@ -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/SurfaceProviders/canvas.h>
 #include "blitter.hh"
 #include "PingusResource.hh"
 #include "World.hh"

Index: SmallMapImage.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SmallMapImage.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SmallMapImage.hh    8 Jun 2002 20:19:54 -0000       1.3
+++ SmallMapImage.hh    10 Jun 2002 11:00:27 -0000      1.4
@@ -20,7 +20,7 @@
 #ifndef SMALLMAPIMAGE_HH
 #define SMALLMAPIMAGE_HH
 
-#include <ClanLib/display.h>
+#include <ClanLib/Display/Display/surface.h>
 #include <ClanLib/Core/Math/cl_vector.h>
 #include "GuiObj.hh"
 
@@ -46,3 +46,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: Sprite.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Sprite.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Sprite.cc   8 Jun 2002 20:19:54 -0000       1.16
+++ Sprite.cc   10 Jun 2002 11:00:27 -0000      1.17
@@ -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 <ClanLib/Core/Math/cl_vector.h>
 #include "PingusResource.hh"
 #include "Sprite.hh"
@@ -255,3 +256,5 @@
 }
 
 /* EOF */
+
+

Index: Sprite.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Sprite.hh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Sprite.hh   8 Jun 2002 20:19:54 -0000       1.15
+++ Sprite.hh   10 Jun 2002 11:00:27 -0000      1.16
@@ -20,7 +20,7 @@
 #ifndef SPRITE_HH
 #define SPRITE_HH
 
-#include <ClanLib/display.h>
+#include <ClanLib/Display/Display/surface.h>
 
 class CL_Vector;
 class ResDescriptor;
@@ -139,3 +139,4 @@
 #endif
 
 /* EOF */
+

Index: Story.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Story.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Story.cc    8 Jun 2002 23:11:08 -0000       1.15
+++ Story.cc    10 Jun 2002 11:00:27 -0000      1.16
@@ -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 "Display.hh"
 #include "DeltaManager.hh"
 #include "PingusResource.hh"

Index: Story.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Story.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Story.hh    27 Jul 2001 19:35:36 -0000      1.4
+++ Story.hh    10 Jun 2002 11:00:27 -0000      1.5
@@ -20,8 +20,10 @@
 #ifndef STORY_HH
 #define STORY_HH
 
+#include <ClanLib/Display/Display/surface.h>
 #include "PingusSubMenu.hh"
 
+class CL_Font;
 class PingusMenuManager;
 
 /** This class displays the story of the Pingus. */

Index: StringConverter.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/StringConverter.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- StringConverter.cc  7 Apr 2001 21:03:42 -0000       1.6
+++ StringConverter.cc  10 Jun 2002 11:00:27 -0000      1.7
@@ -19,7 +19,6 @@
 
 #include <cstdio>
 #include "StringConverter.hh"
-//#include "PingusError.hh"
 
 int 
 StringConverter::to_int(const std::string& str)

Index: SurfaceButton.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SurfaceButton.cc,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- SurfaceButton.cc    8 Jun 2002 20:19:54 -0000       1.38
+++ SurfaceButton.cc    10 Jun 2002 11:00:27 -0000      1.39
@@ -17,7 +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 <ClanLib/Display/Input/mouse.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
 #include "PingusSound.hh"
 #include "globals.hh"
 #include "PingusResource.hh"

Index: SurfaceButton.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SurfaceButton.hh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- SurfaceButton.hh    8 Jun 2002 20:19:54 -0000       1.23
+++ SurfaceButton.hh    10 Jun 2002 11:00:27 -0000      1.24
@@ -21,12 +21,8 @@
 #define SURFACEBUTTON_HH
 
 #include <string>
-
-#include <ClanLib/core.h>
-
 #include "worldmap/PingusWorldMapManager.hh"
 #include "MultiplayerConfig.hh"
-// #include "FileSelector.hh"
 
 class PingusMenu;
 
@@ -170,3 +166,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: System.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/System.cc,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- System.cc   2 Jun 2002 21:09:11 -0000       1.40
+++ System.cc   10 Jun 2002 11:00:27 -0000      1.41
@@ -34,7 +34,6 @@
 #include <cstdio>
 #include <iostream>
 
-//#include "PingusError.hh" 
 #include "globals.hh"
 #include "StringConverter.hh"
 #include "System.hh"

Index: TargetProvider.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/TargetProvider.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TargetProvider.cc   30 Sep 2000 21:34:42 -0000      1.2
+++ TargetProvider.cc   10 Jun 2002 11:00:27 -0000      1.3
@@ -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/SurfaceProviders/canvas.h>
 #include "TargetProvider.hh"
 
 CL_Canvas* 

Index: TargetProvider.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/TargetProvider.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TargetProvider.hh   18 Mar 2001 17:45:04 -0000      1.3
+++ TargetProvider.hh   10 Jun 2002 11:00:27 -0000      1.4
@@ -20,8 +20,11 @@
 #ifndef TARGETPROVIDER_HH
 #define TARGETPROVIDER_HH
 
-#include <ClanLib/core.h>
-#include <ClanLib/display.h>
+#include <ClanLib/Display/Display/surfaceprovider.h>
+
+class CL_Target;
+class CL_Palette;
+class CL_Canvas;
 
 class TargetProvider : public CL_SurfaceProvider
 {
@@ -55,3 +58,7 @@
 #endif
 
 /* EOF */
+
+
+
+

Index: Theme.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Theme.cc,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Theme.cc    9 Jun 2002 11:18:50 -0000       1.35
+++ Theme.cc    10 Jun 2002 11:00:27 -0000      1.36
@@ -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/error.h>
+#include <ClanLib/Core/System/system.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Display/Input/keyboard.h>
+#include <ClanLib/Display/Input/key.h>
 #include "PathManager.hh"
 #include "System.hh"
 #include "PingusResource.hh"

Index: ThemeSelector.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ThemeSelector.cc,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- ThemeSelector.cc    9 Jun 2002 14:04:10 -0000       1.58
+++ ThemeSelector.cc    10 Jun 2002 11:00:27 -0000      1.59
@@ -17,6 +17,14 @@
 //  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 <ClanLib/Display/Input/input.h>
+#include <ClanLib/Display/Input/key.h>
+#include <ClanLib/Display/Input/keyboard.h>
+#include <ClanLib/Display/Input/mouse.h>
+#include <ClanLib/Core/System/system.h>
+#include <ClanLib/Display/Display/mousecursor_provider.h>
 #include <config.h>
 #include "globals.hh"
 #include "ThemeSelector.hh"

Index: ThemeSelector.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ThemeSelector.hh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ThemeSelector.hh    8 Jun 2002 20:19:54 -0000       1.16
+++ ThemeSelector.hh    10 Jun 2002 11:00:27 -0000      1.17
@@ -20,14 +20,17 @@
 #ifndef THEMESELECTOR_HH
 #define THEMESELECTOR_HH
 
-#include <ClanLib/core.h>
-#include <ClanLib/display.h>
-
 #include <vector>
 #include <string>
+#include <ClanLib/Signals/slot.h>
+#include <ClanLib/Display/Display/surface.h>
 
+class CL_Key;
+class CL_Font;
+class CL_InputDevice;
 class Theme;
 class AlphaButton;
+
 ///
 class ListItem
 {
@@ -149,3 +152,7 @@
 #endif
 
 /* EOF */
+
+
+
+

Index: TimeDisplay.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/TimeDisplay.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- TimeDisplay.cc      9 Jun 2002 14:04:10 -0000       1.11
+++ TimeDisplay.cc      10 Jun 2002 11:00:27 -0000      1.12
@@ -18,7 +18,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <cstdio>
-
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Font/font.h>
 #include "globals.hh"
 #include "GameTime.hh"
 #include "PingusResource.hh"

Index: Timer.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Timer.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Timer.cc    23 May 2000 21:08:43 -0000      1.1
+++ Timer.cc    10 Jun 2002 11:00:27 -0000      1.2
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <cassert>
-#include <ClanLib/core.h>
+#include <ClanLib/Core/System/system.h>
 #include "Timer.hh"
 
 Timer::Timer()
@@ -43,3 +43,6 @@
 }
 
 /* EOF */
+
+
+

Index: Trap.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Trap.hh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Trap.hh     8 Jun 2002 20:19:54 -0000       1.22
+++ Trap.hh     10 Jun 2002 11:00:27 -0000      1.23
@@ -20,7 +20,7 @@
 #ifndef TRAP_HH
 #define TRAP_HH
 
-#include <ClanLib/display.h>
+#include <ClanLib/Display/Display/surface.h>
 #include "GameCounter.hh"
 #include "WorldObj.hh"
 #include "TrapData.hh"
@@ -53,3 +53,4 @@
 #endif
 
 /* EOF */
+

Index: TrapData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/TrapData.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- TrapData.cc 9 Jun 2002 14:04:10 -0000       1.12
+++ TrapData.cc 10 Jun 2002 11:00:27 -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 "traps/smasher.hh"
 #include "traps/hammer.hh"
 #include "traps/FakeExit.hh"

Index: TrapData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/TrapData.hh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- TrapData.hh 9 Jun 2002 14:04:10 -0000       1.15
+++ TrapData.hh 10 Jun 2002 11:00:27 -0000      1.16
@@ -21,7 +21,7 @@
 #define TRAP_DATA_HH
 
 #include <config.h>
-#include <ClanLib/core.h>
+#include <ClanLib/Core/Math/cl_vector.h>
 #include "WorldObjData.hh"
 
 class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
@@ -61,3 +61,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: TrueServer.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/TrueServer.cc,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- TrueServer.cc       9 Jun 2002 14:28:03 -0000       1.32
+++ TrueServer.cc       10 Jun 2002 11:00:27 -0000      1.33
@@ -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/Core/System/system.h>
 #include "GameTime.hh"
 #include "Timer.hh"
 #include "globals.hh"

Index: USBMouseController.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/USBMouseController.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- USBMouseController.cc       6 Jun 2002 15:55:54 -0000       1.3
+++ USBMouseController.cc       10 Jun 2002 11:00:27 -0000      1.4
@@ -17,9 +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 <ClanLib/Display/Display/display.h>
 #include "PingusError.hh"
 #include "USBMouseController.hh"
-#include <ClanLib/display.h>
 
 USBMouseController::USBMouseController (int /*arg_owner_id*/, std::string 
mousedev)
 {
@@ -99,3 +99,4 @@
 }
 
 /* EOF */
+

Index: View.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/View.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- View.cc     9 Jun 2002 20:59:43 -0000       1.21
+++ View.cc     10 Jun 2002 11:00:27 -0000      1.22
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <cassert>
-
+#include <ClanLib/Display/Display/display.h>
 #include "Pingu.hh"
 #include "MouseController.hh"
 #include "View.hh"

Index: View.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/View.hh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- View.hh     9 Jun 2002 20:59:43 -0000       1.13
+++ View.hh     10 Jun 2002 11:00:27 -0000      1.14
@@ -20,12 +20,12 @@
 #ifndef VIEW_HH
 #define VIEW_HH
 
+#include <ClanLib/Display/Display/cliprect.h>
 #include "Range.hh"
 #include "Controller.hh"
 #include "CaptureRectangle.hh"
 
 class Pingu;
-
 class World;
 
 /** A class to controll the rentering of the playfield, each display on 

Index: WorldObjGroupData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/WorldObjGroupData.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- WorldObjGroupData.hh        9 Jun 2002 14:04:10 -0000       1.4
+++ WorldObjGroupData.hh        10 Jun 2002 11:00:28 -0000      1.5
@@ -20,8 +20,9 @@
 #ifndef WORLDOBJGROUPDATA_HH
 #define WORLDOBJGROUPDATA_HH
 
-#include "WorldObjData.hh"
+#include <vector>
 #include <iostream>
+#include "WorldObjData.hh"
 
 
 class WorldObjGroupData : public WorldObjData

Index: XMLhelper.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/XMLhelper.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- XMLhelper.cc        8 Jun 2002 21:43:36 -0000       1.17
+++ XMLhelper.cc        10 Jun 2002 11:00:28 -0000      1.18
@@ -17,8 +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 <ClanLib/Core/Math/cl_vector.h>
 #include <fstream>
+#include <iostream>
+#include <ClanLib/Core/Math/cl_vector.h>
 #include "StringConverter.hh"
 #include "XMLhelper.hh"
 #include "Color.hh"
@@ -306,3 +307,5 @@
 }
 
 /* EOF */
+
+

Index: blitter.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/blitter.cc,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- blitter.cc  22 Jan 2002 22:48:05 -0000      1.36
+++ blitter.cc  10 Jun 2002 11:00:28 -0000      1.37
@@ -18,8 +18,13 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <algorithm>
+#include <iostream>
 #include <cstdio>
 #include <assert.h>
+#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/Display/surfaceprovider.h>
+#include <ClanLib/Display/SurfaceProviders/canvas.h>
+#include <ClanLib/Display/Display/palette.h>
 #include "PingusError.hh"
 #include "Color.hh"
 #include "StringConverter.hh"

Index: blitter.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/blitter.hh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- blitter.hh  7 Jun 2002 13:25:02 -0000       1.12
+++ blitter.hh  10 Jun 2002 11:00:28 -0000      1.13
@@ -20,9 +20,8 @@
 #ifndef BLITTER_HH
 #define BLITTER_HH
 
-#include <ClanLib/display.h>
-
 class CL_Canvas;
+class CL_Surface;
 class CL_SurfaceProvider;
 
 /** A bunch of blitting and creation functions to operate on
@@ -90,3 +89,4 @@
 #endif 
 
 /* EOF */
+




reply via email to

[Prev in Thread] Current Thread [Next in Thread]