[Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.12,1.13 action_data.cxx,1.5,1.6 blitter.cxx,1.14,1.15 button_panel.cxx,1.13,1.14 capture_rectangle.cxx,1.6,1.7 client.cxx,1.20,1.21 credits.cxx,1.10,1.11 entrance.cxx,1.6,1.7 exit_menu.cxx,1.7,1.8 game_session.cxx,1.8,1.9 groundpiece_data.cxx,1.9,1.10 gui_screen.cxx,1.7,1.8 intro.cxx,1.3,1.4 level_desc.cxx,1.7,1.8 liquid.cxx,1.4,1.5 multiplayer_client.cxx,1.3,1.4 multiplayer_client_child.cxx,1.10,1.11 pingu.cxx,1.24,1.25 pingu.hxx,1.15,1.16 pingu_action.hxx,1.14,1.15 pingu_map.cxx,1.2,1.3 pingus_main.cxx,1.14,1.15 pingus_menu.cxx,1.7,1.8 pingus_menu_manager.cxx,1.12,1.13 playfield.cxx,1.21,1.22 playfield_view.cxx,1.2,1.3 res_descriptor.cxx,1.10,1.11 screen_manager.cxx,1.15,1.16 server.cxx,1.13,1.14 smallmap.cxx,1.15,1.16 sound_real.cxx,1.7,1.8 story.cxx,1.10,1.11 surface_button.cxx,1.14,1.15 true_server.cxx,1.5,1.6 view.cxx,1.10,1.11 weather_data.cxx,1.3,1.4 world.cxx,1.21,1.22 worldobj.cxx,1.6,1.7 worldobj_data_factory.cxx,1.9,1.10 xml_helper.cxx,1.16,1.17

[torangan]

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

Modified Files:
        action_button.cxx action_data.cxx blitter.cxx button_panel.cxx 
        capture_rectangle.cxx client.cxx credits.cxx entrance.cxx 
        exit_menu.cxx game_session.cxx groundpiece_data.cxx 
        gui_screen.cxx intro.cxx level_desc.cxx liquid.cxx 
        multiplayer_client.cxx multiplayer_client_child.cxx pingu.cxx 
        pingu.hxx pingu_action.hxx pingu_map.cxx pingus_main.cxx 
        pingus_menu.cxx pingus_menu_manager.cxx playfield.cxx 
        playfield_view.cxx res_descriptor.cxx screen_manager.cxx 
        server.cxx smallmap.cxx sound_real.cxx story.cxx 
        surface_button.cxx true_server.cxx view.cxx weather_data.cxx 
        world.cxx worldobj.cxx worldobj_data_factory.cxx 
        xml_helper.cxx 
Log Message:
- splitted IceBlock / ConveyorBelt
- removed unrequired includes (ignoring system headers)


Index: action_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_button.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- action_button.cxx   6 Sep 2002 17:33:29 -0000       1.12
+++ action_button.cxx   14 Sep 2002 19:06:33 -0000      1.13
@@ -17,7 +17,6 @@
 //  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/Display/display.h>
 #include <ClanLib/Display/Font/font.h>
 #include <ClanLib/Display/Input/mouse.h>
@@ -26,7 +25,6 @@
 #include "pingus_resource.hxx"
 #include "action_button.hxx"
 #include "server.hxx"
-#include "world.hxx"
 #include "string_converter.hxx"
 
 using namespace Actions;

Index: action_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_data.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- action_data.cxx     25 Aug 2002 09:08:48 -0000      1.5
+++ action_data.cxx     14 Sep 2002 19:06:33 -0000      1.6
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "pingu_enums.hxx"
 #include "action_data.hxx"
 
 using namespace Actions;

Index: blitter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/blitter.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- blitter.cxx 11 Sep 2002 12:45:57 -0000      1.14
+++ blitter.cxx 14 Sep 2002 19:06:33 -0000      1.15
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
-#include <iostream>
 #include <ClanLib/Display/SurfaceProviders/canvas.h>
 #include <ClanLib/Display/Display/palette.h>
 #include "pingus_error.hxx"

Index: button_panel.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/button_panel.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- button_panel.cxx    5 Sep 2002 12:24:01 -0000       1.13
+++ button_panel.cxx    14 Sep 2002 19:06:33 -0000      1.14
@@ -18,13 +18,9 @@
 //  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 "globals.hxx"
 #include "button_panel.hxx"
-#include "client.hxx"
 #include "server.hxx"
-#include "world.hxx"
 #include "plf.hxx"
 
 using namespace Actions;

Index: capture_rectangle.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/capture_rectangle.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- capture_rectangle.cxx       4 Sep 2002 14:55:11 -0000       1.6
+++ capture_rectangle.cxx       14 Sep 2002 19:06:33 -0000      1.7
@@ -20,7 +20,6 @@
 #include <ClanLib/Core/Math/cl_vector.h>
 #include <ClanLib/Display/Font/font.h>
 #include "pingu.hxx"
-#include "string_converter.hxx"
 #include "pingus_resource.hxx"
 #include "capture_rectangle.hxx"
 #include "pingu_action.hxx"

Index: client.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/client.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- client.cxx  5 Sep 2002 12:24:01 -0000       1.20
+++ client.cxx  14 Sep 2002 19:06:33 -0000      1.21
@@ -18,17 +18,14 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
+#include <ClanLib/Core/System/system.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 <ClanLib/Core/System/system.h>
 #include "globals.hxx"
 #include "playfield.hxx"
 #include "timer.hxx"
 #include "pingus_resource.hxx"
 #include "sound.hxx"
-#include "option_menu.hxx"
 #include "time_display.hxx"
 #include "pingus_counter.hxx"
 #include "smallmap.hxx"
@@ -40,10 +37,7 @@
 #include "button_panel.hxx"
 #include "screen_manager.hxx"
 
-// GUI
-#include "gui/surface_button.hxx"
-
-Client::Client(Server * s)
+Client::Client (Server * s)
   : server       (s),
     skip_frame   (0),
     do_replay    (false),

Index: credits.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/credits.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- credits.cxx 4 Sep 2002 14:55:11 -0000       1.10
+++ credits.cxx 14 Sep 2002 19:06:33 -0000      1.11
@@ -19,11 +19,7 @@
 
 #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 "delta_manager.hxx"
-#include "display.hxx"
 #include "sound.hxx"
 #include "pingus_resource.hxx"
 #include "credits.hxx"

Index: entrance.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/entrance.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- entrance.cxx        4 Sep 2002 22:10:47 -0000       1.6
+++ entrance.cxx        14 Sep 2002 19:06:33 -0000      1.7
@@ -22,7 +22,6 @@
 #include "pingu_holder.hxx"
 #include "globals.hxx"
 #include "entrance.hxx"
-#include "game_time.hxx"
 #include "pingu.hxx"
 #include "game_time.hxx"
 

Index: exit_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/exit_menu.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- exit_menu.cxx       6 Sep 2002 17:33:29 -0000       1.7
+++ exit_menu.cxx       14 Sep 2002 19:06:33 -0000      1.8
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Input/input.h>
 #include "pingus_menu_manager.hxx"
 #include "pingus_resource.hxx"
 

Index: game_session.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/game_session.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- game_session.cxx    5 Sep 2002 12:24:01 -0000       1.8
+++ game_session.cxx    14 Sep 2002 19:06:33 -0000      1.9
@@ -22,7 +22,6 @@
 #include "game_session.hxx"
 #include "game_session_result.hxx"
 #include "plf.hxx"
-#include "screen_manager.hxx"
 
 PingusGameSession::PingusGameSession (std::string arg_filename)
   : filename (arg_filename),

Index: groundpiece_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/groundpiece_data.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- groundpiece_data.cxx        10 Sep 2002 21:03:32 -0000      1.9
+++ groundpiece_data.cxx        14 Sep 2002 19:06:33 -0000      1.10
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <fstream>
-#include "xml_helper.hxx"
 #include "editor/editor_groundpiece_obj.hxx"
 #include "xml_helper.hxx"
 

Index: gui_screen.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/gui_screen.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gui_screen.cxx      5 Sep 2002 12:24:02 -0000       1.7
+++ gui_screen.cxx      14 Sep 2002 19:06:33 -0000      1.8
@@ -20,7 +20,6 @@
 #include <iostream>
 #include "globals.hxx"
 #include "debug.hxx"
-#include "gui/gui_manager.hxx"
 #include "input/button_event.hxx"
 #include "input/axis_event.hxx"
 #include "gui_screen.hxx"

Index: intro.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/intro.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- intro.cxx   16 Aug 2002 17:15:31 -0000      1.3
+++ intro.cxx   14 Sep 2002 19:06:33 -0000      1.4
@@ -20,8 +20,6 @@
 #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 "pingus_menu_manager.hxx"
 #include "pingus_resource.hxx"
 

Index: level_desc.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/level_desc.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- level_desc.cxx      4 Sep 2002 14:55:11 -0000       1.7
+++ level_desc.cxx      14 Sep 2002 19:06:33 -0000      1.8
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
-#include <ClanLib/Core/System/system.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Font/font.h>
 #include "display.hxx"

Index: liquid.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/liquid.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- liquid.cxx  4 Sep 2002 19:40:19 -0000       1.4
+++ liquid.cxx  14 Sep 2002 19:06:33 -0000      1.5
@@ -17,7 +17,6 @@
 //  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 "graphic_context.hxx"
 #include "world.hxx"
 #include "pingus_resource.hxx"

Index: multiplayer_client.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiplayer_client.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- multiplayer_client.cxx      9 Aug 2002 22:02:13 -0000       1.3
+++ multiplayer_client.cxx      14 Sep 2002 19:06:33 -0000      1.4
@@ -17,8 +17,6 @@
 //  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 "smallmap_image.hxx"
 #include "multiplayer_client.hxx"
 
 MultiplayerClient::MultiplayerClient (Server * s,

Index: multiplayer_client_child.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiplayer_client_child.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- multiplayer_client_child.cxx        4 Sep 2002 14:55:11 -0000       1.10
+++ multiplayer_client_child.cxx        14 Sep 2002 19:06:33 -0000      1.11
@@ -19,12 +19,8 @@
 
 #include <stdio.h>
 #include <ClanLib/Display/Input/key.h>
-#include "pingu.hxx"
 #include "server.hxx"
-
-#include "string_converter.hxx"
 #include "multiplayer_client_child.hxx"
-#include "pingu_enums.hxx"
 
 MultiplayerClientChild::MultiplayerClientChild (Server * s, const CL_Rect& 
arg_rect)
   : server (s),

Index: pingu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- pingu.cxx   5 Sep 2002 11:26:35 -0000       1.24
+++ pingu.cxx   14 Sep 2002 19:06:33 -0000      1.25
@@ -20,18 +20,14 @@
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
-#include <ClanLib/Display/Font/font.h>
 #include "globals.hxx"
 #include "world.hxx"
-#include "pingu.hxx"
-#include "pingus_resource.hxx"
 #include "sound.hxx"
 #include "col_map.hxx"
 #include "pingu_action.hxx"
 #include "pingu_action_factory.hxx"
 #include "my_gettext.hxx"
 #include "debug.hxx"
-#include "string_converter.hxx"
 #include "worldobj.hxx"
 #include "fonts.hxx"
 

Index: pingu.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- pingu.hxx   5 Sep 2002 11:26:35 -0000       1.15
+++ pingu.hxx   14 Sep 2002 19:06:33 -0000      1.16
@@ -20,7 +20,6 @@
 #ifndef HEADER_PINGUS_PINGU_HXX
 #define HEADER_PINGUS_PINGU_HXX
 
-#include "graphic_context.hxx"
 #include "direction.hxx"
 #include "pingu_enums.hxx"
 
@@ -28,6 +27,7 @@
 class CL_Vector;
 class ActionHolder;
 class PinguAction;
+class GraphicContext;
 
 /** The class for managing one of the many penguins which are walking
     around in the World. All actions are handled by PinguAction

Index: pingu_action.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_action.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- pingu_action.hxx    4 Sep 2002 20:30:28 -0000       1.14
+++ pingu_action.hxx    14 Sep 2002 19:06:33 -0000      1.15
@@ -20,11 +20,11 @@
 #ifndef HEADER_PINGUS_PINGU_ACTION_HXX
 #define HEADER_PINGUS_PINGU_ACTION_HXX
 
-#include "graphic_context.hxx"
 #include "pingu_enums.hxx"
 
-class Pingu;
 class ActionHolder;
+class GraphicContext;
+class Pingu;
 
 enum ActionType
 {

Index: pingu_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_map.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pingu_map.cxx       4 Sep 2002 19:40:19 -0000       1.2
+++ pingu_map.cxx       14 Sep 2002 19:06:33 -0000      1.3
@@ -17,7 +17,6 @@
 //  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 "col_map.hxx"
 #include "pingu_map.hxx"
 

Index: pingus_main.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- pingus_main.cxx     11 Sep 2002 12:45:57 -0000      1.14
+++ pingus_main.cxx     14 Sep 2002 19:06:33 -0000      1.15
@@ -36,7 +36,6 @@
 #  include "win32/getopt.h"
 #endif /* !WIN32 */
 
-#include <ClanLib/core.h>
 #include <ClanLib/Core/System/system.h>
 #include <ClanLib/Display/setupdisplay.h>
 #include <ClanLib/Display/Display/display.h>
@@ -57,10 +56,8 @@
 #include "pingus_main.hxx"
 #include "algo.hxx"
 #include "globals.hxx"
-#include "pingus_resource.hxx"
 #include "system.hxx"
 #include "pingus_error.hxx"
-#include "loading.hxx"
 #include "global_event.hxx"
 #include "config.hxx"
 #include "console.hxx"
@@ -730,7 +727,7 @@
 }
   
 void
-PingusMain::init(int argc, char** argv)
+PingusMain::init (int argc, char** argv)
 {
   char c;
 
@@ -756,7 +753,7 @@
 }
 
 void
-PingusMain::init_clanlib()
+PingusMain::init_clanlib ()
 {
   // Init ClanLib
   if (verbose) 

Index: pingus_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pingus_menu.cxx     17 Aug 2002 00:28:30 -0000      1.7
+++ pingus_menu.cxx     14 Sep 2002 19:06:33 -0000      1.8
@@ -17,23 +17,13 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <ClanLib/Display/Input/input.h>
-#include <ClanLib/Display/Input/keyboard.h>
-#include <ClanLib/Display/Input/inputdevice.h>
-
-#include "globals.hxx"
-#include "alpha_button.hxx"
 #include "surface_button.hxx"
-#include "credits.hxx"
 #include "pingus_resource.hxx"
-#include "pingus_menu.hxx"
-#include "display.hxx"
 #include "sound.hxx"
 #include "debug.hxx"
 #include "pingus_menu_manager.hxx"
-#include "game_delta.hxx"
 
-PingusMenu::PingusMenu(PingusMenuManager* m)
+PingusMenu::PingusMenu (PingusMenuManager* m)
   : PingusSubMenu (m)
 {
   is_init = false;

Index: pingus_menu_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu_manager.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- pingus_menu_manager.cxx     13 Sep 2002 18:28:26 -0000      1.12
+++ pingus_menu_manager.cxx     14 Sep 2002 19:06:33 -0000      1.13
@@ -18,13 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Input/input.h>
-#include <ClanLib/Display/Input/keyboard.h>
-#include "globals.hxx"
-#include "display.hxx"
-#include "delta_manager.hxx"
-#include "fade_out.hxx"
-#include "input/controller.hxx"
 #include "screen_manager.hxx"
 #include "pingus_menu_manager.hxx"
 

Index: playfield.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- playfield.cxx       6 Sep 2002 17:33:29 -0000       1.21
+++ playfield.cxx       14 Sep 2002 19:06:33 -0000      1.22
@@ -27,9 +27,8 @@
 #include "server.hxx"
 #include "pingu.hxx"
 #include "button_panel.hxx"
-#include "pingu_enums.hxx"
 
-Playfield::Playfield(Client* client, PLF* level_data, World* w)
+Playfield::Playfield (Client* client, PLF* level_data, World* w)
   : current_pingu(0), current_view(0)
 {
   world = w;

Index: playfield_view.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield_view.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- playfield_view.cxx  4 Sep 2002 19:40:19 -0000       1.2
+++ playfield_view.cxx  14 Sep 2002 19:06:33 -0000      1.3
@@ -17,9 +17,6 @@
 //  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 "playfield_view.hxx"
 #include "world.hxx"
 

Index: res_descriptor.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/res_descriptor.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- res_descriptor.cxx  11 Sep 2002 12:45:57 -0000      1.10
+++ res_descriptor.cxx  14 Sep 2002 19:06:33 -0000      1.11
@@ -20,7 +20,6 @@
 #include <assert.h>
 #include <iostream>
 #include "res_descriptor.hxx"
-#include "string_converter.hxx"
 #include "pingus_error.hxx"
 
 ResDescriptor::ResDescriptor()

Index: screen_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/screen_manager.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- screen_manager.cxx  5 Sep 2002 12:24:02 -0000       1.15
+++ screen_manager.cxx  14 Sep 2002 19:06:33 -0000      1.16
@@ -22,8 +22,6 @@
 #include "globals.hxx"
 #include "input/controller.hxx"
 #include "delta_manager.hxx"
-#include "game_delta.hxx"
-#include "screen.hxx"
 #include "display.hxx"
 #include "pingus_menu_manager.hxx"
 #include "screen_manager.hxx"

Index: server.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/server.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- server.cxx  4 Sep 2002 14:55:11 -0000       1.13
+++ server.cxx  14 Sep 2002 19:06:33 -0000      1.14
@@ -23,7 +23,6 @@
 #include "system.hxx"
 #include "pingu.hxx"
 #include "server.hxx"
-#include "game_time.hxx"
 #include "pingu_holder.hxx"
 #include "pingus_error.hxx"
 #include "string_converter.hxx"

Index: smallmap.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- smallmap.cxx        11 Sep 2002 12:45:57 -0000      1.15
+++ smallmap.cxx        14 Sep 2002 19:06:33 -0000      1.16
@@ -19,8 +19,6 @@
 
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/SurfaceProviders/canvas.h>
-#include <ClanLib/Display/Input/mouse.h>
-
 #include "pingu_holder.hxx"
 #include "display.hxx"
 #include "playfield.hxx"

Index: sound_real.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/sound_real.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sound_real.cxx      4 Sep 2002 14:55:11 -0000       1.7
+++ sound_real.cxx      14 Sep 2002 19:06:33 -0000      1.8
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-#include <ClanLib/Core/System/cl_assert.h>
 #include <ClanLib/sound.h>
 
 #include "globals.hxx"

Index: story.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/story.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- story.cxx   11 Sep 2002 12:45:57 -0000      1.10
+++ story.cxx   14 Sep 2002 19:06:33 -0000      1.11
@@ -18,14 +18,12 @@
 //  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 "fonts.hxx"
 #include "pingus_resource.hxx"
 #include "pingus_menu_manager.hxx"
 #include "screen_manager.hxx"
 #include "worldmap/manager.hxx"
 
-// using NS_Pingus::NS_WorldMap::WorldMapManager;
 using WorldMapNS::WorldMapManager;
 
 Story::Story(PingusMenuManager* manager)

Index: surface_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/surface_button.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- surface_button.cxx  11 Sep 2002 12:45:57 -0000      1.14
+++ surface_button.cxx  14 Sep 2002 19:06:33 -0000      1.15
@@ -17,7 +17,6 @@
 //  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 "globals.hxx"

Index: true_server.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/true_server.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- true_server.cxx     3 Aug 2002 12:00:58 -0000       1.5
+++ true_server.cxx     14 Sep 2002 19:06:33 -0000      1.6
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Core/System/system.h>
-#include "game_time.hxx"
 #include "globals.hxx"
 #include "plf.hxx"
 #include "true_server.hxx"

Index: view.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/view.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- view.cxx    5 Sep 2002 12:24:02 -0000       1.10
+++ view.cxx    14 Sep 2002 19:06:33 -0000      1.11
@@ -18,8 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <assert.h>
-#include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Core/Math/cl_vector.h>
 #include "view.hxx"
 #include "world.hxx"
 #include "client.hxx"

Index: weather_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/weather_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- weather_data.cxx    23 Aug 2002 15:49:51 -0000      1.3
+++ weather_data.cxx    14 Sep 2002 19:06:33 -0000      1.4
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include "editor/editorobj.hxx"
 #include "weather_data.hxx"
 
 WeatherData

Index: world.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- world.cxx   4 Sep 2002 19:40:19 -0000       1.21
+++ world.cxx   14 Sep 2002 19:06:33 -0000      1.22
@@ -26,11 +26,9 @@
 #include "spot_map.hxx"
 #include "view.hxx"
 #include "world.hxx"
-#include "game_time.hxx"
 #include "particles/particle_holder.hxx"
 #include "particles/weather_generator.hxx"
 #include "pingu.hxx"
-#include "worldobj_data.hxx"
 #include "game_time.hxx"
 
 using namespace std;

Index: worldobj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- worldobj.cxx        4 Sep 2002 19:40:19 -0000       1.6
+++ worldobj.cxx        14 Sep 2002 19:06:33 -0000      1.7
@@ -20,7 +20,6 @@
 
 #include <typeinfo>
 #include <iostream>
-#include "world.hxx"
 #include "worldobj.hxx"
 #include "graphic_context.hxx"
 

Index: worldobj_data_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_data_factory.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- worldobj_data_factory.cxx   14 Sep 2002 13:35:38 -0000      1.9
+++ worldobj_data_factory.cxx   14 Sep 2002 19:06:33 -0000      1.10
@@ -28,17 +28,16 @@
 #include "backgrounds/thunderstorm_background_data.hxx"
 
 // Special Objects
-#include "worldobjs/ice_block.hxx"
-#include "worldobjs/conveyor_belt.hxx"
-
 #include "hotspot_data.hxx"
 #include "entrance_data.hxx"
 #include "worldobj_data_factory.hxx"
 
 #include "worldobjsdata/bumper_data.hxx"
+#include "worldobjsdata/conveyor_belt_data.hxx"
 #include "worldobjsdata/fake_exit_data.hxx"
 #include "worldobjsdata/guillotine_data.hxx"
 #include "worldobjsdata/hammer_data.hxx"
+#include "worldobjsdata/ice_block_data.hxx"
 #include "worldobjsdata/info_box_data.hxx"
 #include "worldobjsdata/laser_exit_data.hxx"
 #include "worldobjsdata/smasher_data.hxx"

Index: xml_helper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_helper.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- xml_helper.cxx      11 Sep 2002 12:45:57 -0000      1.16
+++ xml_helper.cxx      14 Sep 2002 19:06:33 -0000      1.17
@@ -22,7 +22,6 @@
 #include "string_converter.hxx"
 #include "color.hxx"
 #include "res_descriptor.hxx"
-#include "resource_modifier.hxx"
 #include "xml_helper.hxx"
 
 // Hack: if xmlIsBlankNode() is not present, we define an empty dummy