[Pingus-CVS] r3741 - in trunk/pingus/src: . components

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-08 11:55:36 +0200 (Tue, 08 Jul 2008)
New Revision: 3741

Modified:
   trunk/pingus/src/components/menu_button.cpp
   trunk/pingus/src/pingus_main.cpp
   trunk/pingus/src/pingus_menu.cpp
   trunk/pingus/src/story_screen.cpp
Log:
Fixed some includes

Modified: trunk/pingus/src/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/components/menu_button.cpp 2008-07-08 09:48:01 UTC (rev 
3740)
+++ trunk/pingus/src/components/menu_button.cpp 2008-07-08 09:55:36 UTC (rev 
3741)
@@ -16,10 +16,11 @@
 
 #include "../globals.hpp"
 #include "../debug.hpp"
+#include "../fonts.hpp"
 #include "../sound/sound.hpp"
 #include "../resource.hpp"
-#include "../pingus_menu_manager.hpp"
 #include "../gettext.h"
+#include "../pingus_menu.hpp"
 
 #include "menu_button.hpp"
 

Modified: trunk/pingus/src/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus_main.cpp    2008-07-08 09:48:01 UTC (rev 3740)
+++ trunk/pingus/src/pingus_main.cpp    2008-07-08 09:55:36 UTC (rev 3741)
@@ -26,6 +26,8 @@
 #include "string_util.hpp"
 #include "demo_session.hpp"
 #include "sexpr_file_reader.hpp"
+#include "fonts.hpp"
+#include "pingus_menu.hpp"
 
 #if defined(__APPLE__)
 /* Can't use the include, some type names conflict.
@@ -68,7 +70,6 @@
 #include "savegame_manager.hpp"
 #include "stat_manager.hpp"
 #include "debug.hpp"
-#include "pingus_menu_manager.hpp"
 #include "resource.hpp"
 #include "pingu_action_factory.hpp"
 #include "credits.hpp"

Modified: trunk/pingus/src/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus_menu.cpp    2008-07-08 09:48:01 UTC (rev 3740)
+++ trunk/pingus/src/pingus_menu.cpp    2008-07-08 09:55:36 UTC (rev 3741)
@@ -28,13 +28,13 @@
 #include "worldmap/worldmap.hpp"
 #include "worldmap/worldmap_screen.hpp"
 #include "screen/screen_manager.hpp"
-#include "pingus_menu_manager.hpp"
 #include "gui/gui_manager.hpp"
 #include "plf_res_mgr.hpp"
 #include "path_manager.hpp"
 #include "pathname.hpp"
 #include "editor/editor_screen.hpp"
 #include "credits.hpp"
+#include "pingus_menu.hpp"
 
 PingusMenu::PingusMenu()
 {

Modified: trunk/pingus/src/story_screen.cpp
===================================================================
--- trunk/pingus/src/story_screen.cpp   2008-07-08 09:48:01 UTC (rev 3740)
+++ trunk/pingus/src/story_screen.cpp   2008-07-08 09:55:36 UTC (rev 3741)
@@ -23,7 +23,6 @@
 #include "screen/screen_manager.hpp"
 #include "gui/component.hpp"
 #include "math.hpp"
-#include "pingus_menu_manager.hpp"
 #include "fonts.hpp"
 #include "story_screen.hpp"
 #include "res_descriptor.hpp"
@@ -32,6 +31,7 @@
 #include "worldmap/worldmap_story.hpp"
 #include "stat_manager.hpp"
 #include "credits.hpp"
+#include "display/display.hpp"
 #include "sound/sound.hpp"
 
 class StoryScreenComponent : public GUI::Component