[Pingus-CVS] CVS: Games/Pingus/src action_holder.hxx, 1.13, 1.14 client.cxx, 1.48, 1.49 col_map.cxx, 1.20, 1.21 console.hxx, 1.14, 1.15 credits.cxx, 1.39, 1.40 credits.hxx, 1.15, 1.16 demo_session.cxx, 1.10, 1.11 exit_menu.cxx, 1.21, 1.22 fade_out.cxx, 1.9, 1.10 fonts.cxx, 1.5, 1.6 fps_counter.cxx, 1.9, 1.10 game_session.hxx, 1.20, 1.21 global_event.cxx, 1.11, 1.12 level_desc.hxx, 1.7, 1.8 level_result.hxx, 1.6, 1.7 loading.cxx, 1.7, 1.8 menu_button.hxx, 1.5, 1.6 pingus_counter_bar.cxx, 1.8, 1.9 pingus_main.cxx, 1.100, 1.101 res_descriptor.cxx, 1.17, 1.18 savegame.hxx, 1.4, 1.5 smallmap.cxx, 1.39, 1.40 smallmap_image.cxx, 1.11, 1.12 smallmap_image.hxx, 1.9, 1.10 spot_map.cxx, 1.28, 1.29 stat_manager.cxx, 1.8, 1.9 story_screen.cxx, 1.22, 1.23 target_provider.cxx, 1.2, 1.3 target_provider.hxx, 1.7, 1.8 theme.cxx, 1.20, 1.21 theme.hxx, 1.7, 1.8 time_display.hxx, 1.11, 1.12 usb_mouse_controller.cxx, 1.5, 1.6

[Ingo Ruhnke]

Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv7605

Modified Files:
        action_holder.hxx client.cxx col_map.cxx console.hxx 
        credits.cxx credits.hxx demo_session.cxx exit_menu.cxx 
        fade_out.cxx fonts.cxx fps_counter.cxx game_session.hxx 
        global_event.cxx level_desc.hxx level_result.hxx loading.cxx 
        menu_button.hxx pingus_counter_bar.cxx pingus_main.cxx 
        res_descriptor.cxx savegame.hxx smallmap.cxx 
        smallmap_image.cxx smallmap_image.hxx spot_map.cxx 
        stat_manager.cxx story_screen.cxx target_provider.cxx 
        target_provider.hxx theme.cxx theme.hxx time_display.hxx 
        usb_mouse_controller.cxx 
Log Message:
misc stuff

Index: action_holder.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/action_holder.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- action_holder.hxx   18 Oct 2003 23:17:27 -0000      1.13
+++ action_holder.hxx   20 Oct 2003 19:28:54 -0000      1.14
@@ -43,7 +43,7 @@
    *  where the integer <i>n</i> indicates how much more actions
    *  called <i>name</i> can be created.
    */
-  std::map<ActionName, int> available_actions;
+  std::map<Actions::ActionName, int> available_actions;
 
 public:
   /** Create an action holder from the number of actions given in a
@@ -52,29 +52,29 @@
   ~ActionHolder ();
 
   /** @return a list of available actions in the current level */
-  std::vector<ActionName> get_available_actions();
+  std::vector<Actions::ActionName> get_available_actions();
 
   /** Sets the number of actions, which are available in the pool.
    * @param name the name of the action
    * @param available the number of actions available
    */
-  void set_actions (ActionName name, int available);
+  void set_actions (Actions::ActionName name, int available);
 
   /** Adds an action to the pool of actions, making one more action available
    * @param name the name of the action
    */
-  void push_action (ActionName name);
+  void push_action (Actions::ActionName name);
 
   /** Removes an action from the pool of actions
       @return true if an action was available and removed, false if no
       actions where available */
-  bool pop_action (ActionName name);
+  bool pop_action (Actions::ActionName name);
 
   /** Returns the number of actions of the specified name which are available
    *  thru get_action()
    * @return 0 if the name is unknown FIXME: should use .find instead of []
    */
-  int get_available (ActionName);
+  int get_available (Actions::ActionName name);
 
 private:
   ActionHolder (const ActionHolder&);

Index: client.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/client.cxx,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- client.cxx  18 Oct 2003 23:17:27 -0000      1.48
+++ client.cxx  20 Oct 2003 19:28:54 -0000      1.49
@@ -19,7 +19,6 @@
 
 #include <iostream>
 #include <ClanLib/Display/display.h>
-#include <ClanLib/Display/mousecursor_provider.h>
 #include "globals.hxx"
 #include "playfield.hxx"
 #include "timer.hxx"
@@ -50,10 +49,7 @@
     time_display (0),
     small_map    (0),
     hurry_up     (0)
-  //cursor       (new Cursor ("cursors/animcross", "core", controller))
 {
-  //Display::add_flip_screen_hook(cursor);
-
   unplayable.set_align_center();
 
   Timer timer("Client UI generation");

Index: col_map.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/col_map.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- col_map.cxx 18 Oct 2003 23:17:27 -0000      1.20
+++ col_map.cxx 20 Oct 2003 19:28:54 -0000      1.21
@@ -19,7 +19,7 @@
 
 #include <iostream>
 #include <assert.h>
-#include <ClanLib/Display/SurfaceProviders/canvas.h>
+#include <ClanLib/Display/pixel_buffer.h>
 #include "gui/graphic_context.hxx"
 #include "globals.hxx"
 #include "col_map.hxx"
@@ -77,7 +77,9 @@
 void
 ColMap::remove(const CL_Surface& sur, int x, int y)
 {
+#ifdef CLANLIB_0_6
   remove(sur.get_provider(), x, y);
+#endif
 }
 
 void

Index: console.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/console.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- console.hxx 18 Oct 2003 12:11:30 -0000      1.14
+++ console.hxx 20 Oct 2003 19:28:54 -0000      1.15
@@ -65,7 +65,7 @@
   ConsoleBuffer streambuf;
 
 public:
-  CL_Font* font;
+  CL_Font font;
   bool is_init;
   unsigned int current_pos;
 

Index: credits.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/credits.cxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- credits.cxx 18 Oct 2003 23:17:27 -0000      1.39
+++ credits.cxx 20 Oct 2003 19:28:54 -0000      1.40
@@ -168,10 +168,10 @@
       switch ((*i)[0])
        {
        case '-':
-         end_offset += font->get_height() + 5;
+         end_offset += font.get_height() + 5;
          break;
        case '_':
-         end_offset += font_small->get_height() + 5;
+         end_offset += font_small.get_height() + 5;
          break;
        case 'n':
          end_offset += 50;
@@ -232,12 +232,12 @@
       switch ((*i)[0])
        {
        case '-':
-         font->print_center(x, y + yof, i->substr(1).c_str());
-         yof += font->get_height() + 5;
+         font.print_center(x, y + yof, i->substr(1).c_str());
+         yof += font.get_height() + 5;
          break;
        case '_':
-         font_small->print_center(x, y + yof, i->substr(1).c_str());
-         yof += font_small->get_height() + 5;
+         font_small.print_center(x, y + yof, i->substr(1).c_str());
+         yof += font_small.get_height() + 5;
          break;
        case 'n':
          yof += 50;

Index: credits.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/credits.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- credits.hxx 18 Oct 2003 23:17:27 -0000      1.15
+++ credits.hxx 20 Oct 2003 19:28:54 -0000      1.16
@@ -40,8 +40,8 @@
   CL_Surface background;
   CL_Surface pingu;
 
-  CL_Font*    font;
-  CL_Font*    font_small;
+  CL_Font    font;
+  CL_Font    font_small;
 
   bool is_init;
 

Index: demo_session.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/demo_session.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- demo_session.cxx    18 Oct 2003 23:17:27 -0000      1.10
+++ demo_session.cxx    20 Oct 2003 19:28:54 -0000      1.11
@@ -17,8 +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/Input/input.h>
-#include <ClanLib/Display/Input/keyboard.h>
+#include <ClanLib/Display/keyboard.h>
 #include "math.hxx"
 #include "xml_pdf.hxx"
 #include "true_server.hxx"

Index: exit_menu.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/exit_menu.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- exit_menu.cxx       18 Oct 2003 23:17:27 -0000      1.21
+++ exit_menu.cxx       20 Oct 2003 19:28:54 -0000      1.22
@@ -17,7 +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/Display/display.h>
+#include <ClanLib/Display/display.h>
 #include "gettext.h"
 #include "pingus_menu_manager.hxx"
 #include "pingus_resource.hxx"

Index: fade_out.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/fade_out.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fade_out.cxx        18 Oct 2003 23:17:27 -0000      1.9
+++ fade_out.cxx        20 Oct 2003 19:28:54 -0000      1.10
@@ -19,7 +19,7 @@
 
 #include <iostream>
 #include <ClanLib/Core/System/system.h>
-#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/display.h>
 #include "gui/display.hxx"
 #include "fade_out.hxx"
 #include "globals.hxx"

Index: fonts.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/fonts.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fonts.cxx   18 Oct 2003 23:17:27 -0000      1.5
+++ fonts.cxx   20 Oct 2003 19:28:54 -0000      1.6
@@ -23,20 +23,20 @@
 namespace Pingus {
 namespace Fonts {
 
-FontHandle chalk_large;
-FontHandle chalk_normal;
-FontHandle chalk_small;
+CL_Font chalk_large;
+CL_Font chalk_normal;
+CL_Font chalk_small;
 
-FontHandle pingus_small;
-FontHandle pingus_small_fix_num;
-FontHandle pingus_large;
+CL_Font pingus_small;
+CL_Font pingus_small_fix_num;
+CL_Font pingus_large;
 
-FontHandle smallfont;
-FontHandle smallfont_h;
+CL_Font smallfont;
+CL_Font smallfont_h;
 
-FontHandle courier_small;
-FontHandle xterm;
-FontHandle lcd;
+CL_Font courier_small;
+CL_Font xterm;
+CL_Font lcd;
 
 void
 init ()

Index: fps_counter.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/fps_counter.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fps_counter.cxx     18 Oct 2003 23:17:27 -0000      1.9
+++ fps_counter.cxx     20 Oct 2003 19:28:54 -0000      1.10
@@ -25,6 +25,8 @@
 #include "fps_counter.hxx"
 #include "gettext.h"
 
+namespace Pingus {
+
 FPSCounter fps_counter;
 
 FPSCounter::FPSCounter()
@@ -86,7 +88,6 @@
     }
 }
 
-/* EOF */
-
-
+} // namespace Pingus
 
+/* EOF */

Index: game_session.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/game_session.hxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- game_session.hxx    18 Oct 2003 23:17:27 -0000      1.20
+++ game_session.hxx    20 Oct 2003 19:28:54 -0000      1.21
@@ -24,13 +24,13 @@
 #include "gui/screen.hxx"
 #include "plf_handle.hxx"
 
+namespace Pingus {
+
 class Client;
 class TrueServer;
 class PingusGameSessionResult;
 class DemoPlayer;
 
-namespace Pingus {
-
 /** You can use this class to start up a game session, which consist
     of a single level. */
 class PingusGameSession : public Screen

Index: global_event.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/global_event.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- global_event.cxx    18 Oct 2003 12:11:30 -0000      1.11
+++ global_event.cxx    20 Oct 2003 19:28:54 -0000      1.12
@@ -20,8 +20,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <algorithm>
-#include <ClanLib/Display/Input/input.h>
-#include <ClanLib/Display/Input/keyboard.h>
+#include <ClanLib/Display/keyboard.h>
 #include "screenshot.hxx"
 #include "console.hxx"
 #include "fps_counter.hxx"

Index: level_desc.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/level_desc.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- level_desc.hxx      18 Oct 2003 23:17:27 -0000      1.7
+++ level_desc.hxx      20 Oct 2003 19:28:54 -0000      1.8
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_LEVEL_DESC_HXX
 #define HEADER_PINGUS_LEVEL_DESC_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "multiline_text.hxx"
 
 class CL_Font;

Index: level_result.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/level_result.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- level_result.hxx    19 Apr 2003 10:23:17 -0000      1.6
+++ level_result.hxx    20 Oct 2003 19:28:54 -0000      1.7
@@ -21,7 +21,7 @@
 #define HEADER_PINGUS_LEVEL_RESULT_HXX
 
 #include "pingus.hxx"
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 
 class CL_Font;
 class World;

Index: loading.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/loading.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- loading.cxx 18 Oct 2003 23:17:27 -0000      1.7
+++ loading.cxx 20 Oct 2003 19:28:54 -0000      1.8
@@ -70,7 +70,7 @@
   sur.draw((CL_Display::get_width() - sur.get_width())/2,
                 (CL_Display::get_height() - sur.get_height())/2);
 
-  font->print_center(CL_Display::get_width() / 2,
+  font.print_center(CL_Display::get_width() / 2,
                     CL_Display::get_height() - 130,
                     str.c_str());
 

Index: menu_button.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/menu_button.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- menu_button.hxx     19 Oct 2003 12:25:47 -0000      1.5
+++ menu_button.hxx     20 Oct 2003 19:28:54 -0000      1.6
@@ -21,7 +21,7 @@
 #define HEADER_PINGUS_SURFACE_BUTTON_HXX
 
 #include <string>
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 
 #include "gui/component.hxx"
 

Index: pingus_counter_bar.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_counter_bar.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pingus_counter_bar.cxx      19 Oct 2003 12:25:47 -0000      1.8
+++ pingus_counter_bar.cxx      20 Oct 2003 19:28:54 -0000      1.9
@@ -17,7 +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/Display/display.h>
+#include <ClanLib/Display/display.h>
 #include "pingus_counter_bar.hxx"
 #include "pingu_holder.hxx"
 #include "server.hxx"

Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- pingus_main.cxx     19 Oct 2003 12:25:47 -0000      1.100
+++ pingus_main.cxx     20 Oct 2003 19:28:54 -0000      1.101
@@ -30,13 +30,6 @@
 #include <locale.h>
 #include <getopt.h>
 
-//#include <ClanLib/Core/System/console_window.h>
-//#include <ClanLib/Display/setupdisplay.h>
-//#include <ClanLib/Display/Display/display.h>
-//#include <ClanLib/Display/Input/input.h>
-//#include <ClanLib/Core/System/setupcore.h>
-//#include <ClanLib/GUI/setupgui.h>
-
 #include <ClanLib/display.h>
 #include <ClanLib/sound.h>
 #include <ClanLib/core.h>

Index: res_descriptor.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/res_descriptor.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- res_descriptor.cxx  18 Oct 2003 23:17:27 -0000      1.17
+++ res_descriptor.cxx  20 Oct 2003 19:28:54 -0000      1.18
@@ -112,6 +112,8 @@
 
 std::ostream& operator<<(std::ostream& s, const Pingus::ResDescriptor& desc)
 {
+  using namespace Pingus;
+
   switch (desc.type)
     {
     case ResDescriptor::RD_RESOURCE:

Index: savegame.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/savegame.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- savegame.hxx        18 Oct 2003 12:11:30 -0000      1.4
+++ savegame.hxx        20 Oct 2003 19:28:54 -0000      1.5
@@ -31,7 +31,7 @@
 {
 private:
 public:
-  enum SG_Status { FINISHED,   // level is successfully finished
+  enum Status { FINISHED,   // level is successfully finished
                    ACCESSIBLE, // level is accessible and can be played
                    NONE };      // level is not finished and cannot be accessed
   static std::string status_to_string (Status s);

Index: smallmap.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/smallmap.cxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- smallmap.cxx        18 Oct 2003 23:17:27 -0000      1.39
+++ smallmap.cxx        20 Oct 2003 19:28:54 -0000      1.40
@@ -17,8 +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/Display/Display/display.h>
-#include <ClanLib/Display/SurfaceProviders/canvas.h>
+#include <ClanLib/Display/display.h>
+#include <ClanLib/Display/pixel_buffer.h>
 #include "pingu_holder.hxx"
 #include "gui/display.hxx"
 #include "playfield.hxx"

Index: smallmap_image.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/smallmap_image.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- smallmap_image.cxx  18 Oct 2003 23:17:27 -0000      1.11
+++ smallmap_image.cxx  20 Oct 2003 19:28:54 -0000      1.12
@@ -17,12 +17,14 @@
 //  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/SurfaceProviders/canvas.h>
+#include <ClanLib/Display/pixel_buffer.h>
 #include "world.hxx"
 #include "smallmap_image.hxx"
 #include "col_map.hxx"
 #include "server.hxx"
 
+namespace Pingus {
+
 SmallMapImage::SmallMapImage (Server * s, Vector arg_pos, int width, int 
height)
   : sur (create_surface (s, width, height)),
     pos (arg_pos)
@@ -158,4 +160,6 @@
          pos.y < y && pos.y + sur.get_height () > y);
 }
 
+} // namespace Pingus
+
 /* EOF */

Index: smallmap_image.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/smallmap_image.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- smallmap_image.hxx  19 Apr 2003 10:23:17 -0000      1.9
+++ smallmap_image.hxx  20 Oct 2003 19:28:54 -0000      1.10
@@ -21,7 +21,7 @@
 #define HEADER_PINGUS_SMALLMAP_IMAGE_HXX
 
 #include "pingus.hxx"
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "vector.hxx"
 
 class Server;

Index: spot_map.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/spot_map.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- spot_map.cxx        18 Oct 2003 23:17:27 -0000      1.28
+++ spot_map.cxx        20 Oct 2003 19:28:54 -0000      1.29
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
-#include <ClanLib/Display/SurfaceProviders/canvas.h>
+#include <ClanLib/Display/pixel_buffer.h>
 #include "gui/graphic_context.hxx"
 #include "plf.hxx"
 #include "pingus_error.hxx"

Index: stat_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/stat_manager.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- stat_manager.cxx    19 Apr 2003 10:23:17 -0000      1.8
+++ stat_manager.cxx    20 Oct 2003 19:28:54 -0000      1.9
@@ -24,6 +24,8 @@
 #include "system.hxx"
 #include "stat_manager.hxx"
 
+namespace Pingus {
+
 StatManager* StatManager::instance_ = 0;
 
 StatManager*
@@ -175,4 +177,6 @@
   flush();
 }
 
+} // namespace Pingus
+
 /* EOF */

Index: story_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/story_screen.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- story_screen.cxx    18 Oct 2003 23:17:27 -0000      1.22
+++ story_screen.cxx    20 Oct 2003 19:28:54 -0000      1.23
@@ -19,7 +19,7 @@
 
 #include <algorithm>
 #include <vector>
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "gettext.h"
 #include "pingus_resource.hxx"
 #include "gui/gui_manager.hxx"

Index: target_provider.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/target_provider.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- target_provider.cxx 19 Apr 2003 10:23:17 -0000      1.2
+++ target_provider.cxx 20 Oct 2003 19:28:54 -0000      1.3
@@ -20,6 +20,8 @@
 #include <ClanLib/Display/SurfaceProviders/canvas.h>
 #include "target_provider.hxx"
 
+namespace Pingus {
+
 CL_Canvas*
 TargetProvider::create_canvas (CL_Target* target)
 {
@@ -38,4 +40,6 @@
   return canvas;
 }
 
+} // namespace Pingus
+
 /* EOF */

Index: target_provider.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/target_provider.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- target_provider.hxx 18 Oct 2003 23:17:27 -0000      1.7
+++ target_provider.hxx 20 Oct 2003 19:28:54 -0000      1.8
@@ -21,12 +21,14 @@
 #define HEADER_PINGUS_TARGET_PROVIDER_HXX
 
 #include "pingus.hxx"
-#include <ClanLib/Display/Display/surfaceprovider.h>
+#include <ClanLib/Display/pixel_buffer.h>
 
 class CL_Target;
 class CL_Palette;
 class CL_Canvas;
 
+namespace Pingus {
+
 class TargetProvider : public CL_PixelBuffer
 {
 private:
@@ -60,6 +62,8 @@
   TargetProvider& operator= (const TargetProvider&);
 };
 
+} // namespace Pingus
+
 #endif
 
 /* EOF */

Index: theme.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/theme.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- theme.cxx   18 Oct 2003 23:17:27 -0000      1.20
+++ theme.cxx   20 Oct 2003 19:28:55 -0000      1.21
@@ -23,7 +23,6 @@
 #include <ClanLib/Display/display.h>
 #include <ClanLib/Display/font.h>
 #include <ClanLib/Display/keyboard.h>
-#include <ClanLib/Display/key.h>
 #include "path_manager.hxx"
 #include "system.hxx"
 #include "pingus_resource.hxx"

Index: theme.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/theme.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- theme.hxx   18 Oct 2003 23:17:27 -0000      1.7
+++ theme.hxx   20 Oct 2003 19:28:55 -0000      1.8
@@ -21,7 +21,7 @@
 #ifndef HEADER_PINGUS_THEME_HXX
 #define HEADER_PINGUS_THEME_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "multiline_text.hxx"
 #include "plt_xml.hxx"
 

Index: time_display.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/time_display.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- time_display.hxx    19 Apr 2003 10:23:17 -0000      1.11
+++ time_display.hxx    20 Oct 2003 19:28:55 -0000      1.12
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_TIME_DISPLAY_HXX
 #define HEADER_PINGUS_TIME_DISPLAY_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "gui/component.hxx"
 
 class CL_Font;

Index: usb_mouse_controller.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/usb_mouse_controller.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- usb_mouse_controller.cxx    18 Oct 2003 23:17:27 -0000      1.5
+++ usb_mouse_controller.cxx    20 Oct 2003 19:28:55 -0000      1.6
@@ -19,7 +19,7 @@
 
 #ifndef WIN32
 
-#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/display.h>
 #include "pingus_error.hxx"
 #include "usb_mouse_controller.hxx"