[Pingus-CVS] CVS: Games/Pingus/src globals.hxx,1.3,1.4 multiplayer_client_child.cxx,1.7,1.8 multiplayer_client_child.hxx,1.3,1.4 playfield.cxx,1.13,1.14 world.hxx,1.4,1.5

[grumbel]

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

Modified Files:
        globals.hxx multiplayer_client_child.cxx 
        multiplayer_client_child.hxx playfield.cxx world.hxx 
Log Message:
commited albertos patch

Index: globals.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/globals.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- globals.hxx 24 Jun 2002 22:52:54 -0000      1.3
+++ globals.hxx 12 Aug 2002 22:52:04 -0000      1.4
@@ -21,6 +21,11 @@
     keep the values of command line arguments. */
 
 
+#ifdef WIN32
+#pragma warning (disable : 4786)
+#endif
+
+
 #ifndef HEADER_PINGUS_GLOBALS_HXX
 #define HEADER_PINGUS_GLOBALS_HXX
 
@@ -28,6 +33,7 @@
 #ifdef WIN32
 #define for if(0);else for
 #endif /* WIN32 */
+
 
 #include <string>
 

Index: multiplayer_client_child.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiplayer_client_child.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- multiplayer_client_child.cxx        9 Aug 2002 22:02:13 -0000       1.7
+++ multiplayer_client_child.cxx        12 Aug 2002 22:52:04 -0000      1.8
@@ -19,10 +19,13 @@
 
 #include <stdio.h>
 #include <ClanLib/Display/Input/key.h>
-#include "multiplayer_client_child.hxx"
 #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),
     cursor (new Cursor ("cursors/cross", "core")),
@@ -96,7 +99,7 @@
       char str[256];
       sprintf(str, "Pingu: %d:%s",
              pingu->get_id(), 
-             action_to_string(button_panel->get_action_name()).c_str());
+                 
Pingus::Actions::action_to_string(button_panel->get_action_name()).c_str());
       server->send_event(str);
     }
   */

Index: multiplayer_client_child.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiplayer_client_child.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- multiplayer_client_child.hxx        9 Aug 2002 22:02:13 -0000       1.3
+++ multiplayer_client_child.hxx        12 Aug 2002 22:52:04 -0000      1.4
@@ -26,6 +26,7 @@
 #include "playfield_view.hxx"
 #include "pingus_counter_bar.hxx"
 
+#include <string>
 class Server;
 
 class MultiplayerClientChild : public GuiObj

Index: playfield.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- playfield.cxx       5 Aug 2002 09:19:08 -0000       1.13
+++ playfield.cxx       12 Aug 2002 22:52:04 -0000      1.14
@@ -27,6 +27,7 @@
 #include "server.hxx"
 #include "pingu.hxx"
 #include "button_panel.hxx"
+#include "pingu_enums.hxx"
 
 using boost::shared_ptr;
 
@@ -205,7 +206,7 @@
     {
       char str[256];
       sprintf(str, "Pingu: %d:%s", current_pingu->get_id(), 
-             action_to_string(buttons->get_action_name()).c_str());
+                 
Pingus::Actions::action_to_string(buttons->get_action_name()).c_str());
       server->send_event(str);
     }
 }

Index: world.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- world.hxx   28 Jun 2002 09:51:46 -0000      1.4
+++ world.hxx   12 Aug 2002 22:52:04 -0000      1.5
@@ -42,6 +42,9 @@
 class WorldObj;
 class GameTime;
 
+
+using std::list;
+using std::string;
 /** The World holds all objects of the pingu enviroment. 
     
     It holds the pingus, traps, exits, entrances, etc.. It keeps