[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.132,1.133 action_button
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.132,1.133 action_button.cxx,1.26,1.27 client.cxx,1.39,1.40 client.hxx,1.26,1.27 col_map.cxx,1.15,1.16 console.hxx,1.11,1.12 credits.cxx,1.15,1.16 credits.hxx,1.10,1.11 demo_session.cxx,1.4,1.5 demo_session.hxx,1.3,1.4 fade_out.cxx,1.6,1.7 fonts.hxx,1.2,1.3 fps_counter.hxx,1.5,1.6 game_session.cxx,1.25,1.26 game_session.hxx,1.14,1.15 level_desc.cxx,1.9,1.10 level_result.cxx,1.8,1.9 loading.cxx,1.2,1.3 math.hxx,1.5,1.6 option_menu.cxx,1.12,1.13 pingu_info.cxx,1.7,1.8 pingus_main.cxx,1.46,1.47 pingus_menu_manager.cxx,1.18,1.19 pingus_sub_menu.hxx,1.7,1.8 playfield_view.hxx,1.7,1.8 smallmap.cxx,1.29,1.30 spot_map.cxx,1.23,1.24 surface_button.cxx,1.20,1.21 theme.cxx,1.11,1.12 theme_selector.cxx,1.8,1.9 view.hxx,1.10,1.11 worldobj.cxx,1.10,1.11 |
Date: |
19 Feb 2003 09:50:39 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv22817
Modified Files:
Makefile.am action_button.cxx client.cxx client.hxx
col_map.cxx console.hxx credits.cxx credits.hxx
demo_session.cxx demo_session.hxx fade_out.cxx fonts.hxx
fps_counter.hxx game_session.cxx game_session.hxx
level_desc.cxx level_result.cxx loading.cxx math.hxx
option_menu.cxx pingu_info.cxx pingus_main.cxx
pingus_menu_manager.cxx pingus_sub_menu.hxx playfield_view.hxx
smallmap.cxx spot_map.cxx surface_button.cxx theme.cxx
theme_selector.cxx view.hxx worldobj.cxx
Log Message:
moved a whole bunch of files around
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.am,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- Makefile.am 18 Feb 2003 15:04:47 -0000 1.132
+++ Makefile.am 19 Feb 2003 09:50:34 -0000 1.133
@@ -81,8 +81,6 @@
action_data.cxx \
action_holder.cxx \
action_holder.hxx \
-algo.cxx \
-algo.hxx \
alpha_button.cxx \
alpha_button.hxx \
blitter.cxx \
@@ -109,8 +107,6 @@
counter.hxx \
credits.cxx \
credits.hxx \
-cursor.cxx \
-cursor.hxx \
debug.cxx \
debug.hxx \
debug_stream.cxx \
@@ -124,10 +120,6 @@
demo_session.cxx \
direction.cxx \
direction.hxx \
-display.cxx \
-display.hxx \
-display_graphic_context.hxx \
-display_graphic_context.cxx \
exit_menu.cxx \
exit_menu.hxx \
fade_out.cxx \
@@ -140,7 +132,6 @@
fps_counter.hxx \
game_counter.cxx \
game_counter.hxx \
-game_delta.hxx \
game_event.hxx \
game_session.cxx \
game_session.hxx \
@@ -156,18 +147,13 @@
goal_manager.cxx \
groundtype.hxx \
groundtype.cxx \
-graphic_context.hxx \
gui_obj.hxx \
gui_obj.cxx \
-gui_screen.cxx \
-gui_screen.hxx \
html_browser.cxx \
html_browser.hxx \
hurry_up.cxx \
hurry_up.hxx \
input_event.hxx \
-input_debug_screen.hxx \
-input_debug_screen.cxx \
indexed_canvas.hxx \
indexed_canvas.cxx \
intro.cxx \
@@ -252,11 +238,6 @@
result.hxx \
screenshot.cxx \
screenshot.hxx \
-screen.hxx \
-screen_manager.hxx \
-screen_manager.cxx \
-screen_ptr.hxx \
-screen_ptr.cxx \
server.cxx \
server.hxx \
server_event.hxx \
Index: action_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_button.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- action_button.cxx 29 Dec 2002 23:29:00 -0000 1.26
+++ action_button.cxx 19 Feb 2003 09:50:34 -0000 1.27
@@ -27,7 +27,7 @@
#include "action_button.hxx"
#include "true_server.hxx"
#include "world.hxx"
-#include "graphic_context.hxx"
+#include "gui/graphic_context.hxx"
#include "string_converter.hxx"
using namespace Actions;
Index: client.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/client.cxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- client.cxx 18 Feb 2003 15:04:47 -0000 1.39
+++ client.cxx 19 Feb 2003 09:50:34 -0000 1.40
@@ -31,7 +31,7 @@
#include "plf.hxx"
#include "hurry_up.hxx"
#include "path_manager.hxx"
-#include "cursor.hxx"
+#include "gui/cursor.hxx"
#include "true_server.hxx"
#include "button_panel.hxx"
#include "gui/gui_manager.hxx"
Index: client.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/client.hxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- client.hxx 20 Dec 2002 20:45:50 -0000 1.26
+++ client.hxx 19 Feb 2003 09:50:35 -0000 1.27
@@ -22,8 +22,8 @@
#include <ClanLib/Signals/slot.h>
#include <ClanLib/Display/Input/inputdevice.h>
+#include "gui/gui_screen.hxx"
#include "result.hxx"
-#include "gui_screen.hxx"
#include "sprite.hxx"
namespace Input {
Index: col_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/col_map.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- col_map.cxx 18 Feb 2003 18:41:58 -0000 1.15
+++ col_map.cxx 19 Feb 2003 09:50:35 -0000 1.16
@@ -19,7 +19,7 @@
#include <iostream>
#include <ClanLib/Display/SurfaceProviders/canvas.h>
-#include "graphic_context.hxx"
+#include "gui/graphic_context.hxx"
#include "globals.hxx"
#include "col_map.hxx"
#include "my_gettext.hxx"
Index: console.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/console.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- console.hxx 27 Sep 2002 11:26:43 -0000 1.11
+++ console.hxx 19 Feb 2003 09:50:35 -0000 1.12
@@ -22,7 +22,7 @@
#include <string>
#include <iostream>
-#include "display.hxx"
+#include "gui/display.hxx"
class CL_Font;
Index: credits.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/credits.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- credits.cxx 18 Feb 2003 18:41:58 -0000 1.15
+++ credits.cxx 19 Feb 2003 09:50:35 -0000 1.16
@@ -20,10 +20,10 @@
#include <iostream>
#include <ClanLib/Display/Display/display.h>
#include <ClanLib/Display/Font/font.h>
+#include "gui/screen_manager.hxx"
#include "sound/sound.hxx"
#include "pingus_resource.hxx"
#include "credits.hxx"
-#include "screen_manager.hxx"
#include "my_gettext.hxx"
Credits* Credits::instance_ = 0;
Index: credits.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/credits.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- credits.hxx 5 Nov 2002 03:02:48 -0000 1.10
+++ credits.hxx 19 Feb 2003 09:50:35 -0000 1.11
@@ -23,7 +23,7 @@
#include <string>
#include <vector>
#include <ClanLib/Display/Display/surface.h>
-#include "gui_screen.hxx"
+#include "gui/gui_screen.hxx"
class CL_Font;
class GameDelta;
Index: demo_session.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/demo_session.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- demo_session.cxx 29 Dec 2002 23:29:00 -0000 1.4
+++ demo_session.cxx 19 Feb 2003 09:50:35 -0000 1.5
@@ -25,7 +25,7 @@
#include "demo_player.hxx"
#include "pingus_counter.hxx"
#include "gui/gui_manager.hxx"
-#include "graphic_context.hxx"
+#include "gui/graphic_context.hxx"
#include "demo_session.hxx"
DemoSession::DemoSession(const std::string& filename)
Index: demo_session.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/demo_session.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- demo_session.hxx 28 Dec 2002 16:57:38 -0000 1.3
+++ demo_session.hxx 19 Feb 2003 09:50:35 -0000 1.4
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_DEMO_SESSION_HXX
#define HEADER_PINGUS_DEMO_SESSION_HXX
-#include "gui_screen.hxx"
+#include "gui/gui_screen.hxx"
class Server;
class XMLPDF;
Index: fade_out.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/fade_out.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fade_out.cxx 29 Dec 2002 23:29:00 -0000 1.6
+++ fade_out.cxx 19 Feb 2003 09:50:35 -0000 1.7
@@ -20,7 +20,7 @@
#include <iostream>
#include <ClanLib/Core/System/system.h>
#include <ClanLib/Display/Display/display.h>
-#include "display.hxx"
+#include "gui/display.hxx"
#include "fade_out.hxx"
#include "globals.hxx"
#include "math.hxx"
Index: fonts.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/fonts.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fonts.hxx 2 Nov 2002 21:12:16 -0000 1.2
+++ fonts.hxx 19 Feb 2003 09:50:35 -0000 1.3
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_FONTS_HXX
#define HEADER_PINGUS_FONTS_HXX
-#include "graphic_context.hxx"
+#include "gui/graphic_context.hxx"
namespace Fonts {
Index: fps_counter.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/fps_counter.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fps_counter.hxx 27 Sep 2002 11:26:43 -0000 1.5
+++ fps_counter.hxx 19 Feb 2003 09:50:35 -0000 1.6
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_FPS_COUNTER_HXX
#define HEADER_PINGUS_FPS_COUNTER_HXX
-#include "display.hxx"
+#include "gui/display.hxx"
class CL_Font;
Index: game_session.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/game_session.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- game_session.cxx 15 Jan 2003 21:16:41 -0000 1.25
+++ game_session.cxx 19 Feb 2003 09:50:36 -0000 1.26
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include "gui/screen_manager.hxx"
#include "client.hxx"
#include "true_server.hxx"
#include "game_session.hxx"
@@ -25,7 +26,6 @@
#include "timer.hxx"
#include "plf.hxx"
#include "globals.hxx"
-#include "screen_manager.hxx"
PingusGameSession::PingusGameSession (std::string arg_filename)
: filename (arg_filename)
Index: game_session.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/game_session.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- game_session.hxx 26 Oct 2002 17:27:52 -0000 1.14
+++ game_session.hxx 19 Feb 2003 09:50:36 -0000 1.15
@@ -21,7 +21,7 @@
#define HEADER_PINGUS_GAME_SESSION_HXX
#include <string>
-#include "screen.hxx"
+#include "gui/screen.hxx"
class Client;
class TrueServer;
Index: level_desc.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/level_desc.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- level_desc.cxx 18 Feb 2003 18:41:58 -0000 1.9
+++ level_desc.cxx 19 Feb 2003 09:50:36 -0000 1.10
@@ -20,7 +20,7 @@
#include <stdio.h>
#include <ClanLib/Display/Display/display.h>
#include <ClanLib/Display/Font/font.h>
-#include "display.hxx"
+#include "gui/display.hxx"
#include "pingus_resource.hxx"
#include "level_desc.hxx"
#include "system.hxx"
Index: level_result.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/level_result.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- level_result.cxx 18 Feb 2003 18:41:58 -0000 1.8
+++ level_result.cxx 19 Feb 2003 09:50:36 -0000 1.9
@@ -22,9 +22,10 @@
#include <ClanLib/Display/Display/display.h>
#include <ClanLib/Display/Font/font.h>
#include <ClanLib/Display/Input/mouse.h>
+
+#include "gui/display.hxx"
#include "pingus_resource.hxx"
#include "level_result.hxx"
-#include "display.hxx"
#include "sound/sound.hxx"
#include "world.hxx"
#include "pingu_holder.hxx"
Index: loading.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/loading.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- loading.cxx 23 Aug 2002 15:49:49 -0000 1.2
+++ loading.cxx 19 Feb 2003 09:50:36 -0000 1.3
@@ -20,7 +20,7 @@
#include <ClanLib/Display/Display/display.h>
#include <ClanLib/Display/Font/font.h>
#include "pingus_resource.hxx"
-#include "display.hxx"
+#include "gui/display.hxx"
#include "loading.hxx"
Loading loading_screen;
Index: math.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/math.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- math.hxx 26 Nov 2002 21:30:37 -0000 1.5
+++ math.hxx 19 Feb 2003 09:50:36 -0000 1.6
@@ -17,9 +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.
-#ifndef MATH_HXX
-#define MATH_HXX
+#ifndef HEADER_PINGUS_MATH_HXX
+#define HEADER_PINGUS_MATH_HXX
+#include <stdlib.h>
#include "pingus.hxx"
/** A collection of small math helper functions, some of them might be
@@ -54,6 +55,12 @@
T mid (const T& a, const T& b, const T& c)
{
return max((a), min((b), (c)));
+}
+
+inline
+double frand()
+{
+ return double(rand()) / (RAND_MAX+1.0);
}
} // namespace Math
Index: option_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/option_menu.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- option_menu.cxx 18 Feb 2003 18:41:59 -0000 1.12
+++ option_menu.cxx 19 Feb 2003 09:50:36 -0000 1.13
@@ -24,11 +24,12 @@
#include <ClanLib/Display/Input/input.h>
#include <ClanLib/Display/Input/keyboard.h>
#include <ClanLib/Display/Display/mousecursor_provider.h>
+
+#include "gui/display.hxx"
#include "globals.hxx"
#include "pingus_resource.hxx"
#include "string_converter.hxx"
#include "pingus_menu_manager.hxx"
-#include "display.hxx"
#include "cheat.hxx"
#include "my_gettext.hxx"
Index: pingu_info.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_info.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pingu_info.cxx 18 Feb 2003 18:41:59 -0000 1.7
+++ pingu_info.cxx 19 Feb 2003 09:50:36 -0000 1.8
@@ -20,10 +20,10 @@
#include <stdio.h>
#include <ClanLib/Display/Display/display.h>
#include <ClanLib/Display/Font/font.h>
-#include "algo.hxx"
#include "pingus_resource.hxx"
#include "pingu_info.hxx"
#include "pingu.hxx"
+#include "string_converter.hxx"
#include "my_gettext.hxx"
PinguInfo::PinguInfo()
@@ -59,7 +59,7 @@
font->print_left(x_pos + CL_Display::get_width() - 185,
y_pos + CL_Display::get_height() - 30,
- tolowerstr(str));
+ string_downcase(str));
} else {
font->print_left(x_pos + CL_Display::get_width() - 200,
y_pos + CL_Display::get_height() - 50,
Index: pingus_main.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- pingus_main.cxx 18 Feb 2003 21:38:08 -0000 1.46
+++ pingus_main.cxx 19 Feb 2003 09:50:36 -0000 1.47
@@ -57,9 +57,10 @@
#include "my_gettext.hxx"
+#include "gui/screen_manager.hxx"
+#include "gui/input_debug_screen.hxx"
#include "path_manager.hxx"
#include "pingus_main.hxx"
-#include "algo.hxx"
#include "globals.hxx"
#include "system.hxx"
#include "pingus_error.hxx"
@@ -72,11 +73,9 @@
#include "demo_session.hxx"
#include "debug.hxx"
#include "editor/editor.hxx"
-#include "screen_manager.hxx"
#include "action_data.hxx"
#include "fonts.hxx"
#include "xml_helper.hxx"
-#include "input_debug_screen.hxx"
#include "pingus_menu_manager.hxx"
#include "pingus_resource.hxx"
#include "pingu_action_factory.hxx"
Index: pingus_menu_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu_manager.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- pingus_menu_manager.cxx 18 Feb 2003 17:04:13 -0000 1.18
+++ pingus_menu_manager.cxx 19 Feb 2003 09:50:36 -0000 1.19
@@ -19,7 +19,7 @@
#include <iostream>
#include <ClanLib/Display/Display/display.h>
-#include "screen_manager.hxx"
+#include "gui/screen_manager.hxx"
#include "sound/sound.hxx"
#include "pingus_menu_manager.hxx"
Index: pingus_sub_menu.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_sub_menu.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pingus_sub_menu.hxx 27 Sep 2002 11:26:44 -0000 1.7
+++ pingus_sub_menu.hxx 19 Feb 2003 09:50:36 -0000 1.8
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_PINGUS_SUB_MENU_HXX
#define HEADER_PINGUS_PINGUS_SUB_MENU_HXX
-#include "gui_screen.hxx"
+#include "gui/gui_screen.hxx"
class CL_Key;
class CL_InputDevice;
Index: playfield_view.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield_view.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- playfield_view.hxx 28 Sep 2002 11:52:22 -0000 1.7
+++ playfield_view.hxx 19 Feb 2003 09:50:36 -0000 1.8
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_PLAYFIELD_VIEW_HXX
#define HEADER_PINGUS_PLAYFIELD_VIEW_HXX
-#include "display_graphic_context.hxx"
+#include "gui/display_graphic_context.hxx"
#include "gui_obj.hxx"
class CL_Rect;
Index: smallmap.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap.cxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- smallmap.cxx 29 Dec 2002 23:29:00 -0000 1.29
+++ smallmap.cxx 19 Feb 2003 09:50:36 -0000 1.30
@@ -20,7 +20,7 @@
#include <ClanLib/Display/Display/display.h>
#include <ClanLib/Display/SurfaceProviders/canvas.h>
#include "pingu_holder.hxx"
-#include "display.hxx"
+#include "gui/display.hxx"
#include "playfield.hxx"
#include "world.hxx"
#include "pingus_resource.hxx"
Index: spot_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/spot_map.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- spot_map.cxx 29 Dec 2002 23:29:00 -0000 1.23
+++ spot_map.cxx 19 Feb 2003 09:50:36 -0000 1.24
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <ClanLib/Display/SurfaceProviders/canvas.h>
-#include "graphic_context.hxx"
+#include "gui/graphic_context.hxx"
#include "plf.hxx"
#include "pingus_error.hxx"
#include "blitter.hxx"
Index: surface_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/surface_button.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- surface_button.cxx 18 Feb 2003 18:41:59 -0000 1.20
+++ surface_button.cxx 19 Feb 2003 09:50:36 -0000 1.21
@@ -28,7 +28,7 @@
#include "editor/editor.hxx"
#include "theme_selector.hxx"
#include "surface_button.hxx"
-#include "screen_manager.hxx"
+#include "gui/screen_manager.hxx"
#include "worldmap/manager.hxx"
#include "my_gettext.hxx"
Index: theme.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/theme.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- theme.cxx 29 Dec 2002 23:29:00 -0000 1.11
+++ theme.cxx 19 Feb 2003 09:50:36 -0000 1.12
@@ -32,7 +32,7 @@
#include "globals.hxx"
#include "theme.hxx"
#include "xml_plf.hxx"
-#include "screen_manager.hxx"
+#include "gui/screen_manager.hxx"
Theme::Theme (const std::string& filename_)
: font(PingusResource::load_font("Fonts/pingus_small","fonts")),
Index: theme_selector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/theme_selector.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- theme_selector.cxx 18 Feb 2003 15:04:47 -0000 1.8
+++ theme_selector.cxx 19 Feb 2003 09:50:36 -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 <config.h>
+
#include <iostream>
#include <ClanLib/Display/Display/display.h>
#include <ClanLib/Display/Font/font.h>
@@ -25,12 +27,12 @@
#include <ClanLib/Display/Input/mouse.h>
#include <ClanLib/Core/System/system.h>
#include <ClanLib/Display/Display/mousecursor_provider.h>
-#include <config.h>
+
+#include "gui/display.hxx"
#include "globals.hxx"
#include "theme_selector.hxx"
#include "pingus_error.hxx"
#include "pingus_resource.hxx"
-#include "display.hxx"
#include "loading.hxx"
#include "sound/sound.hxx"
#include "path_manager.hxx"
Index: view.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/view.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- view.hxx 28 Sep 2002 11:52:22 -0000 1.10
+++ view.hxx 19 Feb 2003 09:50:36 -0000 1.11
@@ -23,7 +23,7 @@
#include <ClanLib/Display/Display/cliprect.h>
#include "range.hxx"
#include "capture_rectangle.hxx"
-#include "display_graphic_context.hxx"
+#include "gui/display_graphic_context.hxx"
class Pingu;
class World;
Index: worldobj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- worldobj.cxx 10 Oct 2002 12:25:53 -0000 1.10
+++ worldobj.cxx 19 Feb 2003 09:50:36 -0000 1.11
@@ -21,7 +21,7 @@
#include <typeinfo>
#include <iostream>
#include "worldobj.hxx"
-#include "graphic_context.hxx"
+#include "gui/graphic_context.hxx"
World* WorldObj::world;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.132,1.133 action_button.cxx,1.26,1.27 client.cxx,1.39,1.40 client.hxx,1.26,1.27 col_map.cxx,1.15,1.16 console.hxx,1.11,1.12 credits.cxx,1.15,1.16 credits.hxx,1.10,1.11 demo_session.cxx,1.4,1.5 demo_session.hxx,1.3,1.4 fade_out.cxx,1.6,1.7 fonts.hxx,1.2,1.3 fps_counter.hxx,1.5,1.6 game_session.cxx,1.25,1.26 game_session.hxx,1.14,1.15 level_desc.cxx,1.9,1.10 level_result.cxx,1.8,1.9 loading.cxx,1.2,1.3 math.hxx,1.5,1.6 option_menu.cxx,1.12,1.13 pingu_info.cxx,1.7,1.8 pingus_main.cxx,1.46,1.47 pingus_menu_manager.cxx,1.18,1.19 pingus_sub_menu.hxx,1.7,1.8 playfield_view.hxx,1.7,1.8 smallmap.cxx,1.29,1.30 spot_map.cxx,1.23,1.24 surface_button.cxx,1.20,1.21 theme.cxx,1.11,1.12 theme_selector.cxx,1.8,1.9 view.hxx,1.10,1.11 worldobj.cxx,1.10,1.11,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx,1.15,1.16 basher.cxx,1.25,1.26 blocker.cxx,1.15,1.16 boarder.cxx,1.13,1.14 bomber.cxx,1.28,1.29 bridger.cxx,1.27,1.28 climber.cxx,1.20,1.21 digger.cxx,1.20,1.21 drown.cxx,1.12,1.13 exiter.cxx,1.14,1.15 faller.cxx,1.35,1.36 floater.cxx,1.22,1.23 jumper.cxx,1.17,1.18 laser_kill.cxx,1.13,1.14 miner.cxx,1.19,1.20 rocket_launcher.cxx,1.13,1.14 slider.cxx,1.16,1.17 smashed.cxx,1.12,1.13 splashed.cxx,1.12,1.13 superman.cxx,1.10,1.11 teleported.cxx,1.11,1.12 waiter.cxx,1.12,1.13 walker.cxx,1.30,1.31
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src cursor.cxx,1.2,NONE cursor.hxx,1.5,NONE display.cxx,1.6,NONE display.hxx,1.5,NONE display_graphic_context.cxx,1.9,NONE display_graphic_context.hxx,1.4,NONE game_delta.hxx,1.14,NONE graphic_context.hxx,1.3,NONE gui_screen.cxx,1.16,NONE gui_screen.hxx,1.15,NONE input_debug_screen.cxx,1.8,NONE input_debug_screen.hxx,1.4,NONE screen.cxx,1.2,NONE screen.hxx,1.11,NONE screen_manager.cxx,1.29,NONE screen_manager.hxx,1.16,NONE screen_manager_impl.hxx,1.5,NONE screen_ptr.cxx,1.1,NONE screen_ptr.hxx,1.1,NONE
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx,1.15,1.16 basher.cxx,1.25,1.26 blocker.cxx,1.15,1.16 boarder.cxx,1.13,1.14 bomber.cxx,1.28,1.29 bridger.cxx,1.27,1.28 climber.cxx,1.20,1.21 digger.cxx,1.20,1.21 drown.cxx,1.12,1.13 exiter.cxx,1.14,1.15 faller.cxx,1.35,1.36 floater.cxx,1.22,1.23 jumper.cxx,1.17,1.18 laser_kill.cxx,1.13,1.14 miner.cxx,1.19,1.20 rocket_launcher.cxx,1.13,1.14 slider.cxx,1.16,1.17 smashed.cxx,1.12,1.13 splashed.cxx,1.12,1.13 superman.cxx,1.10,1.11 teleported.cxx,1.11,1.12 waiter.cxx,1.12,1.13 walker.cxx,1.30,1.31
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src cursor.cxx,1.2,NONE cursor.hxx,1.5,NONE display.cxx,1.6,NONE display.hxx,1.5,NONE display_graphic_context.cxx,1.9,NONE display_graphic_context.hxx,1.4,NONE game_delta.hxx,1.14,NONE graphic_context.hxx,1.3,NONE gui_screen.cxx,1.16,NONE gui_screen.hxx,1.15,NONE input_debug_screen.cxx,1.8,NONE input_debug_screen.hxx,1.4,NONE screen.cxx,1.2,NONE screen.hxx,1.11,NONE screen_manager.cxx,1.29,NONE screen_manager.hxx,1.16,NONE screen_manager_impl.hxx,1.5,NONE screen_ptr.cxx,1.1,NONE screen_ptr.hxx,1.1,NONE
- Index(es):