[Pingus-CVS] CVS: Games/Pingus/src ActionButton.cc,1.30,1.31 Console.hh,1.15,1.16 Display.cc,1.9,1.10 Display.hh,1.11,1.12 Entrance.hh,1.18,1.19 EntranceData.cc,1.3,1.4 EntranceData.hh,1.7,1.8 Exit.hh,1.20,1.21 ExitData.cc,1.6,1.7 FPSCounter.hh,1.4,1.5 FadeOut.cc,1.9,1.10 GameCounter.hh,1.5,1.6 GamepadController.cc,1.13,1.14 GamepadController.hh,1.6,1.7 GenericMain.hh,1.6,1.7 GlobalEvent.hh,1.4,1.5 GroundpieceData.hh,1.11,1.12 Hotspot.hh,1.9,1.10 HotspotData.hh,1.5,1.6 HurryUp.cc,1.10,1.11 HurryUp.hh,1.5,1.6 Intro.hh,1.15,1.16 LayerManager.hh,1.6,1.7 Liquid.hh,1.12,1.13 LiquidData.hh,1.8,1.9 MultiLineText.cc,1.3,1.4 MultiLineText.hh,1.3,1.4 MultiplayerClient.hh,1.7,1.8 MultiplayerConfig.cc,1.5,1.6 OptionMenu.hh,1.11,1.12 Pingu.hh,1.39,1.40 Server.cc,1.24,1.25 WorldObjGroupData.cc,1.2,1.3

[torangan]

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

Modified Files:
        ActionButton.cc Console.hh Display.cc Display.hh Entrance.hh 
        EntranceData.cc EntranceData.hh Exit.hh ExitData.cc 
        FPSCounter.hh FadeOut.cc GameCounter.hh GamepadController.cc 
        GamepadController.hh GenericMain.hh GlobalEvent.hh 
        GroundpieceData.hh Hotspot.hh HotspotData.hh HurryUp.cc 
        HurryUp.hh Intro.hh LayerManager.hh Liquid.hh LiquidData.hh 
        MultiLineText.cc MultiLineText.hh MultiplayerClient.hh 
        MultiplayerConfig.cc OptionMenu.hh Pingu.hh Server.cc 
        WorldObjGroupData.cc 
Log Message:
reduced header dependencies


Index: ActionButton.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ActionButton.cc,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ActionButton.cc     7 Jun 2002 09:42:16 -0000       1.30
+++ ActionButton.cc     7 Jun 2002 20:35:14 -0000       1.31
@@ -25,6 +25,7 @@
 #include "ActionButton.hh"
 #include "ActionHolder.hh"
 #include "Server.hh"
+#include "StringConverter.hh"
 
 Button::Button()
 {

Index: Console.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Console.hh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Console.hh  7 Jun 2002 13:25:02 -0000       1.15
+++ Console.hh  7 Jun 2002 20:35:14 -0000       1.16
@@ -26,6 +26,7 @@
 #include "Display.hh"
 
 //#include <ClanLib/core.h>
+#include <ClanLib/display.h>
 
 #define CONSOLE_BUFFER_SIZE 100
 

Index: Display.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Display.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Display.cc  2 Dec 2001 21:43:47 -0000       1.9
+++ Display.cc  7 Jun 2002 20:35:14 -0000       1.10
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <ClanLib/core.h>
+#include <ClanLib/display.h>
 
 #include "globals.hh"
 #include "Display.hh"

Index: Display.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Display.hh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Display.hh  6 Jun 2002 14:05:44 -0000       1.11
+++ Display.hh  7 Jun 2002 20:35:14 -0000       1.12
@@ -20,9 +20,10 @@
 #ifndef DISPLAY_HH
 #define DISPLAY_HH
 
-#include <ClanLib/core.h>
-#include <ClanLib/display.h>
 #include <list>
+
+class DisplayHook;
+class CL_MouseCursorProvider;
 
 /** A flip display hook can be used to attach an event to a
     flip_screen(). An example usage for this is a software mouse

Index: Entrance.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Entrance.hh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Entrance.hh 13 Aug 2001 21:35:37 -0000      1.18
+++ Entrance.hh 7 Jun 2002 20:35:14 -0000       1.19
@@ -20,13 +20,11 @@
 #ifndef ENTRANCE_HH
 #define ENTRANCE_HH
 
-#include <string>
-#include <ClanLib/core.h>
 #include <ClanLib/display.h>
-#include "Pingu.hh"
 #include "WorldObj.hh"
-#include "ActionHolder.hh"
 #include "EntranceData.hh"
+
+class Pingu;
 
 /** A abstract representation of an entrance, the implementation
     currently sucks and needs to be rewritten */

Index: EntranceData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/EntranceData.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- EntranceData.cc     15 Jan 2002 10:48:48 -0000      1.3
+++ EntranceData.cc     7 Jun 2002 20:35:14 -0000       1.4
@@ -23,6 +23,8 @@
 #include "editor/PLFObj.hh"
 #include "EntranceData.hh"
 #include "PingusError.hh"
+#include "StringConverter.hh"
+
 
 boost::shared_ptr<WorldObjData> 
 EntranceData::create(xmlDocPtr doc, xmlNodePtr cur)

Index: EntranceData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/EntranceData.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- EntranceData.hh     15 Jan 2002 10:48:48 -0000      1.7
+++ EntranceData.hh     7 Jun 2002 20:35:14 -0000       1.8
@@ -21,11 +21,16 @@
 #define ENTRANCE_DATA_HH
 
 #include <string>
-#include <fstream>
 
 #include "WorldObjData.hh"
-#include "Position.hh"
 #include "ResDescriptor.hh"
+
+namespace std {
+  template <class T> class char_traits;
+  template <class T1, class T2> struct basic_ofstream;
+  typedef struct basic_ofstream<char, char_traits<char> > ofstream;
+}
+
 
 class EntranceData : public WorldObjData
 {

Index: Exit.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Exit.hh,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Exit.hh     1 Jun 2002 17:55:29 -0000       1.20
+++ Exit.hh     7 Jun 2002 20:35:14 -0000       1.21
@@ -20,14 +20,8 @@
 #ifndef EXIT_HH
 #define EXIT_HH
 
-#include <sstream>
-#include <ClanLib/core.h>
-
 #include "WorldObj.hh"
 #include "ExitData.hh"
-#include "Pingu.hh"
-#include "AnimCounter.hh"
-#include "ActionHolder.hh"
 #include "Sprite.hh"
 
 class Exit : public ExitData,

Index: ExitData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ExitData.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ExitData.cc 15 Jan 2002 10:48:49 -0000      1.6
+++ ExitData.cc 7 Jun 2002 20:35:14 -0000       1.7
@@ -20,6 +20,7 @@
 #include "Exit.hh"
 #include "editor/PLFObj.hh"
 #include "ExitData.hh"
+#include "StringConverter.hh"
 
 void 
 ExitData::write_xml(std::ofstream* xml)

Index: FPSCounter.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/FPSCounter.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- FPSCounter.hh       21 Jun 2000 20:30:55 -0000      1.4
+++ FPSCounter.hh       7 Jun 2002 20:35:14 -0000       1.5
@@ -20,8 +20,9 @@
 #ifndef FPSCOUNTER_HH
 #define FPSCOUNTER_HH
 
-#include <ClanLib/core.h>
 #include "Display.hh"
+
+class CL_Font;
 
 ///
 class FPSCounter : public DisplayHook

Index: FadeOut.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/FadeOut.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- FadeOut.cc  1 Jun 2002 18:05:34 -0000       1.9
+++ FadeOut.cc  7 Jun 2002 20:35:14 -0000       1.10
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/core.h>
+#include <ClanLib/display.h>
 #include "Display.hh"
 #include "FadeOut.hh"
 #include "globals.hh"

Index: GameCounter.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/GameCounter.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- GameCounter.hh      18 Jun 2000 17:01:49 -0000      1.5
+++ GameCounter.hh      7 Jun 2002 20:35:14 -0000       1.6
@@ -20,7 +20,6 @@
 #ifndef GAMECOUNTER_HH
 #define GAMECOUNTER_HH
 
-#include "GameTime.hh"
 
 ///
 class GameCounter

Index: GamepadController.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/GamepadController.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- GamepadController.cc        13 Jan 2002 15:24:18 -0000      1.13
+++ GamepadController.cc        7 Jun 2002 20:35:14 -0000       1.14
@@ -17,6 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <ClanLib/display.h>
 #include "PingusError.hh"
 #include "GamepadController.hh"
 

Index: GamepadController.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/GamepadController.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- GamepadController.hh        14 Apr 2001 11:41:21 -0000      1.6
+++ GamepadController.hh        7 Jun 2002 20:35:14 -0000       1.7
@@ -20,9 +20,11 @@
 #ifndef GAMEPADCONTROLLER_HH
 #define GAMEPADCONTROLLER_HH
 
-#include <ClanLib/display.h>
 #include "DeltaManager.hh"
 #include "Controller.hh"
+
+class CL_InputDevice;
+class CL_InputAxis;
 
 /** Controller for the Microsoft Sidewinder Gamepad, might work with
     other, but the button layout might be suboptimal. */

Index: GenericMain.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/GenericMain.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- GenericMain.hh      19 Jan 2002 18:12:54 -0000      1.6
+++ GenericMain.hh      7 Jun 2002 20:35:14 -0000       1.7
@@ -20,7 +20,6 @@
 #ifndef GENERICMAIN_HH
 #define GENERICMAIN_HH
 
-#include <ClanLib/core.h>
 #include <ClanLib/application.h>
 
 class AbstractMain

Index: GlobalEvent.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/GlobalEvent.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- GlobalEvent.hh      9 Aug 2000 14:39:37 -0000       1.4
+++ GlobalEvent.hh      7 Jun 2002 20:35:14 -0000       1.5
@@ -20,7 +20,9 @@
 #ifndef GLOBALEVENT_HH
 #define GLOBALEVENT_HH
 
-#include <ClanLib/core.h>
+class CL_Key;
+class CL_InputDevice;
+
 
 ///
 class GlobalEvent  
@@ -35,8 +37,7 @@
   ///
   virtual void on_button_release(CL_InputDevice *device, const CL_Key &key);
   
-}///
-;
+};
 
 ///
 extern GlobalEvent global_event;

Index: GroundpieceData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/GroundpieceData.hh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- GroundpieceData.hh  15 Jan 2002 10:48:49 -0000      1.11
+++ GroundpieceData.hh  7 Jun 2002 20:35:14 -0000       1.12
@@ -22,12 +22,20 @@
 
 #include <ClanLib/core.h>
 #include <ClanLib/display.h>
-#include <fstream>
 
-#include "boost/smart_ptr.hpp"
 #include "ResDescriptor.hh"
 
 class EditorObj;
+
+namespace std {
+  template <class T> class char_traits;
+  template <class T1, class T2> struct basic_ofstream;
+  typedef struct basic_ofstream<char, char_traits<char> > ofstream;
+}
+
+namespace boost {
+  template <class T> class shared_ptr;
+}
 
 ///
 class GroundpieceData 

Index: Hotspot.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Hotspot.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Hotspot.hh  13 Aug 2001 21:35:37 -0000      1.9
+++ Hotspot.hh  7 Jun 2002 20:35:14 -0000       1.10
@@ -20,10 +20,6 @@
 #ifndef HOTSPOT_HH
 #define HOTSPOT_HH
 
-#include <fstream>
-#include <map>
-#include <string>
-#include <ClanLib/core.h>
 #include <ClanLib/display.h>
 
 #include "WorldObj.hh"

Index: HotspotData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/HotspotData.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- HotspotData.hh      15 Jan 2002 10:48:49 -0000      1.5
+++ HotspotData.hh      7 Jun 2002 20:35:14 -0000       1.6
@@ -20,11 +20,15 @@
 #ifndef HOTSPOT_DATA_HH
 #define HOTSPOT_DATA_HH
 
-#include <fstream>
-
-#include "Position.hh"
 #include "ResDescriptor.hh"
 #include "WorldObjData.hh"
+
+namespace std {
+  template <class T> class char_traits;
+   template <class T1, class T2> struct basic_ofstream;
+  typedef struct basic_ofstream<char, char_traits<char> > ofstream;
+}
+
 
 class HotspotData : public WorldObjData
 {

Index: HurryUp.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/HurryUp.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- HurryUp.cc  1 Jun 2002 18:05:34 -0000       1.10
+++ HurryUp.cc  7 Jun 2002 20:35:14 -0000       1.11
@@ -19,6 +19,7 @@
 
 #include "PingusResource.hh"
 #include "HurryUp.hh"
+#include "Client.hh"
 
 HurryUp::HurryUp()
 {

Index: HurryUp.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/HurryUp.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- HurryUp.hh  8 Apr 2001 14:10:34 -0000       1.5
+++ HurryUp.hh  7 Jun 2002 20:35:14 -0000       1.6
@@ -20,9 +20,10 @@
 #ifndef HURRYUP_HH
 #define HURRYUP_HH
 
-#include <ClanLib/core.h>
 #include "GuiObj.hh"
-#include "Client.hh"
+
+class CL_Font;
+class Client;
 
 /** Hurry up if the time goes over... */
 class HurryUp : public GuiObj

Index: Intro.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Intro.hh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Intro.hh    1 Jun 2002 17:55:29 -0000       1.15
+++ Intro.hh    7 Jun 2002 20:35:14 -0000       1.16
@@ -23,8 +23,6 @@
 #include <ClanLib/core.h>
 #include <ClanLib/display.h>
 
-#include <sstream>
-
 #include "PingusSubMenu.hh"
 
 ///

Index: LayerManager.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/LayerManager.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- LayerManager.hh     27 Apr 2001 20:44:37 -0000      1.6
+++ LayerManager.hh     7 Jun 2002 20:35:14 -0000       1.7
@@ -21,7 +21,6 @@
 #define LAYERMANAGER_HH
 
 #include <vector>
-#include <ClanLib/core.h>
 #include <ClanLib/display.h>
 
 class LayerManager

Index: Liquid.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Liquid.hh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Liquid.hh   13 Aug 2001 21:35:37 -0000      1.12
+++ Liquid.hh   7 Jun 2002 20:35:14 -0000       1.13
@@ -21,7 +21,6 @@
 #define LIQUID_HH
 
 #include <ClanLib/display.h>
-#include "ResDescriptor.hh"
 #include "AnimCounter.hh"
 #include "WorldObj.hh"
 #include "LiquidData.hh"

Index: LiquidData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/LiquidData.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- LiquidData.hh       15 Jan 2002 10:48:49 -0000      1.8
+++ LiquidData.hh       7 Jun 2002 20:35:14 -0000       1.9
@@ -20,11 +20,14 @@
 #ifndef LIQUIDDATA_HH
 #define LIQUIDDATA_HH
 
-#include <fstream>
-
 #include "ResDescriptor.hh"
-#include "Position.hh"
 #include "WorldObjData.hh"
+
+namespace std {
+  template <class T> class char_traits;
+  template <class T1, class T2> struct basic_ofstream;
+  typedef struct basic_ofstream<char, char_traits<char> > ofstream;
+}
 
 ///
 class LiquidData : public WorldObjData

Index: MultiLineText.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiLineText.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MultiLineText.cc    4 Aug 2001 12:46:22 -0000       1.3
+++ MultiLineText.cc    7 Jun 2002 20:35:14 -0000       1.4
@@ -20,6 +20,7 @@
 #include <cassert>
 #include <algorithm>
 #include "MultiLineText.hh"
+#include <ClanLib/display.h>
 
 using namespace std;
 

Index: MultiLineText.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiLineText.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MultiLineText.hh    18 Mar 2001 17:45:04 -0000      1.3
+++ MultiLineText.hh    7 Jun 2002 20:35:14 -0000       1.4
@@ -22,8 +22,8 @@
 
 #include <string>
 #include <vector>
-#include <ClanLib/core.h>
-#include <ClanLib/display.h>
+
+class CL_Font;
 
 ///
 class MultiLineText

Index: MultiplayerClient.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiplayerClient.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- MultiplayerClient.hh        7 Jun 2002 14:50:34 -0000       1.7
+++ MultiplayerClient.hh        7 Jun 2002 20:35:14 -0000       1.8
@@ -22,8 +22,11 @@
 
 #include <vector>
 #include "GuiObj.hh"
-#include "boost/smart_ptr.hpp"
 #include "MultiplayerClientChild.hh"
+
+namespace boost {
+  template <class T> class smart_ptr;
+}
 
 class MultiplayerClient : public GuiObj
 {

Index: MultiplayerConfig.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiplayerConfig.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- MultiplayerConfig.cc        13 Jan 2002 15:24:18 -0000      1.5
+++ MultiplayerConfig.cc        7 Jun 2002 20:35:14 -0000       1.6
@@ -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/core.h>
+#include <ClanLib/display.h>
 #include "Display.hh"
 #include "MultiplayerGame.hh"
 #include "MultiplayerConfig.hh"

Index: OptionMenu.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/OptionMenu.hh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- OptionMenu.hh       14 Jun 2001 11:07:18 -0000      1.11
+++ OptionMenu.hh       7 Jun 2002 20:35:14 -0000       1.12
@@ -22,10 +22,12 @@
 
 #include <vector>
 
-#include <ClanLib/core.h>
 #include <ClanLib/display.h>
 
 #include "PingusSubMenu.hh"
+
+class CL_Key;
+class CL_InputDevice;
 
 ///
 class OptionEntry

Index: Pingu.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Pingu.hh,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Pingu.hh    10 Feb 2002 22:14:06 -0000      1.39
+++ Pingu.hh    7 Jun 2002 20:35:14 -0000       1.40
@@ -24,16 +24,14 @@
 #include <ClanLib/display.h>
 #include "boost/smart_ptr.hpp"
 
-#include "StringConverter.hh"
 #include "WorldObj.hh"
 #include "Direction.hh"
 #include "PinguEnums.hh"
-#include "Sprite.hh"
 #include "PinguAction.hh"
 
 // Forward declarations
 class ActionHolder;
-class PinguAction; 
+class PinguAction;
 
 /** The class for managing one of the many penguins which are walking
     around in the World. All actions are handled by PinguAction

Index: Server.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Server.cc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Server.cc   7 Jun 2002 19:10:33 -0000       1.24
+++ Server.cc   7 Jun 2002 20:35:14 -0000       1.25
@@ -33,6 +33,7 @@
 #include "PinguHolder.hh"
 #include "PingusError.hh"
 #include "PLF.hh"
+#include "StringConverter.hh"
 
 using namespace std;
 

Index: WorldObjGroupData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/WorldObjGroupData.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- WorldObjGroupData.cc        15 Jan 2002 10:48:49 -0000      1.2
+++ WorldObjGroupData.cc        7 Jun 2002 20:35:14 -0000       1.3
@@ -20,11 +20,8 @@
 #include "editor/EditorObj.hh"
 #include "editor/EditorObjGroup.hh"
 #include "WorldObj.hh"
-#include "generic/ListHelper.hh"
 #include "WorldObjGroupData.hh"
 
-
-using namespace ListHelper;
 
 void 
 WorldObjGroupData::add (boost::shared_ptr<WorldObjData> data)