[Pingus-CVS] CVS: Games/Pingus/src client.cxx,1.22,1.23 exit_menu.cxx,1.8,1.9 gui_screen.cxx,1.8,1.9 gui_screen.hxx,1.8,1.9 pingu_action_factory.hxx,1.5,1.6 pingus_main.cxx,1.16,1.17 pingus_menu.cxx,1.8,1.9 sound_real.hxx,1.4,1.5 theme.hxx,1.3,1.4

[torangan]

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

Modified Files:
        client.cxx exit_menu.cxx gui_screen.cxx gui_screen.hxx 
        pingu_action_factory.hxx pingus_main.cxx pingus_menu.cxx 
        sound_real.hxx theme.hxx 
Log Message:
-some header cleanup


Index: client.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/client.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- client.cxx  17 Sep 2002 23:11:26 -0000      1.22
+++ client.cxx  19 Sep 2002 13:30:08 -0000      1.23
@@ -36,6 +36,7 @@
 #include "server.hxx"
 #include "button_panel.hxx"
 #include "screen_manager.hxx"
+#include "gui/gui_manager.hxx"
 
 Client::Client (Server * s)
   : server       (s),

Index: exit_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/exit_menu.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- exit_menu.cxx       14 Sep 2002 19:06:33 -0000      1.8
+++ exit_menu.cxx       19 Sep 2002 13:30:08 -0000      1.9
@@ -20,6 +20,7 @@
 #include <ClanLib/Display/Display/display.h>
 #include "pingus_menu_manager.hxx"
 #include "pingus_resource.hxx"
+#include "gui/gui_manager.hxx"
 
 class ExitMenuYesButton : public GUI::Component
 {

Index: gui_screen.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/gui_screen.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gui_screen.cxx      14 Sep 2002 19:06:33 -0000      1.8
+++ gui_screen.cxx      19 Sep 2002 13:30:08 -0000      1.9
@@ -23,6 +23,7 @@
 #include "input/button_event.hxx"
 #include "input/axis_event.hxx"
 #include "gui_screen.hxx"
+#include "gui/gui_manager.hxx"
 
 using namespace GUI;
 

Index: gui_screen.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/gui_screen.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gui_screen.hxx      5 Sep 2002 12:24:02 -0000       1.8
+++ gui_screen.hxx      19 Sep 2002 13:30:08 -0000      1.9
@@ -21,7 +21,6 @@
 #define HEADER_PINGUS_GUISCREEN_HXX
 
 #include "screen.hxx"
-#include "gui/gui_manager.hxx"
 
 namespace GUI
 {

Index: pingu_action_factory.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_action_factory.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pingu_action_factory.hxx    25 Aug 2002 09:08:48 -0000      1.5
+++ pingu_action_factory.hxx    19 Sep 2002 13:30:08 -0000      1.6
@@ -24,6 +24,7 @@
 #include <string>
 #include "pingu.hxx"
 
+class PinguAction;
 class PinguActionAbstractFactory;
 
 class PinguActionFactory

Index: pingus_main.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- pingus_main.cxx     16 Sep 2002 22:36:48 -0000      1.16
+++ pingus_main.cxx     19 Sep 2002 13:30:08 -0000      1.17
@@ -36,6 +36,7 @@
 #  include "win32/getopt.h"
 #endif /* !WIN32 */
 
+#include <ClanLib/Core/System/error.h>
 #include <ClanLib/Core/System/system.h>
 #include <ClanLib/Display/setupdisplay.h>
 #include <ClanLib/Display/Display/display.h>

Index: pingus_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pingus_menu.cxx     14 Sep 2002 19:06:33 -0000      1.8
+++ pingus_menu.cxx     19 Sep 2002 13:30:08 -0000      1.9
@@ -22,6 +22,7 @@
 #include "sound.hxx"
 #include "debug.hxx"
 #include "pingus_menu_manager.hxx"
+#include "gui/gui_manager.hxx"
 
 PingusMenu::PingusMenu (PingusMenuManager* m)
   : PingusSubMenu (m)
@@ -42,12 +43,12 @@
       background = PingusResource::load_surface("misc/logo", "core");
 
       // FIXME: Lilla... memory leak
-      gui_manager->add(new OptionsButton (this));
-      gui_manager->add(new CreditButton (this));
-      gui_manager->add(new QuitButton (this));
-      gui_manager->add(new MultiplayerButton (this));
-      gui_manager->add(new ThemeButton (this));
-      gui_manager->add(new StoryButton (this));
+      gui_manager->add(new OptionsButton(this));
+      gui_manager->add(new CreditButton(this));
+      gui_manager->add(new QuitButton(this));
+      gui_manager->add(new MultiplayerButton(this));
+      gui_manager->add(new ThemeButton(this));
+      gui_manager->add(new StoryButton(this));
       gui_manager->add(editor_button);
     }
 

Index: sound_real.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/sound_real.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sound_real.hxx      23 Aug 2002 15:49:50 -0000      1.4
+++ sound_real.hxx      19 Sep 2002 13:30:08 -0000      1.5
@@ -24,7 +24,6 @@
 
 #include <map>
 #include <vector>
-#include <ClanLib/Core/System/error.h>
 #include "audio.hxx"
 #include "sound.hxx"
 

Index: theme.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/theme.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- theme.hxx   23 Aug 2002 15:49:51 -0000      1.3
+++ theme.hxx   19 Sep 2002 13:30:08 -0000      1.4
@@ -21,6 +21,7 @@
 #ifndef HEADER_PINGUS_THEME_HXX
 #define HEADER_PINGUS_THEME_HXX
 
+#include <ClanLib/Display/Display/surface.h>
 #include "multiline_text.hxx"
 #include "plt_xml.hxx"