[Pingus-CVS] CVS: Games/Pingus/src config.cxx,1.2,1.3 display.cxx,1.4,1.5 fps_counter.cxx,1.2,1.3 global_event.cxx,1.2,1.3 level_result.cxx,1.2,1.3 multiplayer_client_child.cxx,1.1,1.2 multiplayer_game.cxx,1.3,1.4 pingu_info.cxx,1.2,1.3 plt_parser.cxx,1.2,1.3 server.cxx,1.3,1.4 spot_map.cxx,1.2,1.3 time_display.cxx,1.2,1.3

[grumbel]

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

Modified Files:
        config.cxx display.cxx fps_counter.cxx global_event.cxx 
        level_result.cxx multiplayer_client_child.cxx 
        multiplayer_game.cxx pingu_info.cxx plt_parser.cxx server.cxx 
        spot_map.cxx time_display.cxx 
Log Message:
- some more include fixes 
- ripped out auto_ptr stuff, since gcc-2.95 doesn't like copying them (I know 
that resulted in a mem-hole, but this Multiplayer stuff needs a rewrite anyway)

Index: config.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/config.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config.cxx  13 Jun 2002 14:25:12 -0000      1.2
+++ config.cxx  20 Jun 2002 12:22:51 -0000      1.3
@@ -17,6 +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 <stdio.h>
 #include <iostream>
 
 #include "globals.hxx"

Index: display.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/display.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- display.cxx 20 Jun 2002 11:23:53 -0000      1.4
+++ display.cxx 20 Jun 2002 12:22:51 -0000      1.5
@@ -17,6 +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 <algorithm>
 #include <stdio.h>
 #include <iostream>
 #include <ClanLib/Display/Display/display.h>

Index: fps_counter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/fps_counter.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fps_counter.cxx     13 Jun 2002 14:25:12 -0000      1.2
+++ fps_counter.cxx     20 Jun 2002 12:22:51 -0000      1.3
@@ -17,6 +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 <stdio.h>
 #include <ClanLib/Core/System/system.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Font/font.h>

Index: global_event.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/global_event.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- global_event.cxx    13 Jun 2002 14:25:12 -0000      1.2
+++ global_event.cxx    20 Jun 2002 12:22:51 -0000      1.3
@@ -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 <stdio.h>
+#include <algorithm>
 #include <ClanLib/Display/Input/input.h>
 #include <ClanLib/Display/Input/keyboard.h>
 #include "screenshot.hxx"

Index: level_result.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/level_result.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- level_result.cxx    13 Jun 2002 14:25:12 -0000      1.2
+++ level_result.cxx    20 Jun 2002 12:22:51 -0000      1.3
@@ -17,6 +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 <stdio.h>
 #include <ClanLib/Core/System/system.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Font/font.h>

Index: multiplayer_client_child.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiplayer_client_child.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- multiplayer_client_child.cxx        12 Jun 2002 19:09:37 -0000      1.1
+++ multiplayer_client_child.cxx        20 Jun 2002 12:22:51 -0000      1.2
@@ -17,6 +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 <stdio.h>
 #include <ClanLib/Display/Input/key.h>
 #include "multiplayer_client_child.hxx"
 #include "pingu.hxx"

Index: multiplayer_game.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiplayer_game.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- multiplayer_game.cxx        13 Jun 2002 14:25:12 -0000      1.3
+++ multiplayer_game.cxx        20 Jun 2002 12:22:51 -0000      1.4
@@ -44,41 +44,41 @@
   try {
     PLF* plf = new XMLPLF (path_manager.complete("levels/multi2-grumbel.xml"));
     std::auto_ptr<Server>     server (new TrueServer (plf));
-    std::auto_ptr<Controller> controller1;
-    std::auto_ptr<Controller> controller2;
-    std::auto_ptr<Controller> controller3;
-    std::auto_ptr<Controller> controller4;
+    Controller* controller1;
+    Controller* controller2;
+    Controller* controller3;
+    Controller* controller4;
 
     if (CL_Input::joysticks.size () > 0)
-      controller1 = std::auto_ptr<Controller>(new GamepadController 
(CL_Input::joysticks[0], 0));
+      controller1 = new GamepadController (CL_Input::joysticks[0], 0);
     else 
-      controller1 = std::auto_ptr<Controller>(new KeyboardController (0));
+      controller1 = new KeyboardController (0);
 
     if (CL_Input::joysticks.size () > 1)
-      controller2 = std::auto_ptr<Controller>(new GamepadController 
(CL_Input::joysticks[1], 0));
+      controller2 = new GamepadController (CL_Input::joysticks[1], 0);
     else
-      controller2 = std::auto_ptr<Controller>(new MouseController (1));
+      controller2 = new MouseController (1);
 
     if (CL_Input::joysticks.size () > 2)
-      controller3 = std::auto_ptr<Controller>(new GamepadController 
(CL_Input::joysticks[2], 0));
+      controller3 = new GamepadController (CL_Input::joysticks[2], 0);
     else
-      controller3 = std::auto_ptr<Controller>(new KeyboardController (2));
+      controller3 = new KeyboardController (2);
 
-    controller4 = std::auto_ptr<Controller>(new MouseController (3));
+    controller4 = new MouseController (3);
 
-    std::auto_ptr<MultiplayerClient> client;
+    MultiplayerClient* client;
     int player = 2;
     if (player == 2)
       {
        client = new MultiplayerClient (server.get (),
-                                        new MultiplayerClientChild 
(controller1.get(),
+                                        new MultiplayerClientChild 
(controller1,
                                                                    server.get 
(),
                                                                    CL_Rect 
(0,0, 
                                                                             
CL_Display::get_width ()/2-2,
                                                                              
CL_Display::get_height ()
                                                                             )
                                                                    ),
-                                        new MultiplayerClientChild 
(controller2.get(),
+                                        new MultiplayerClientChild 
(controller2,
                                                                    server.get 
(),
                                                                     CL_Rect 
(CL_Display::get_width ()/2, 0,
                                                                              
CL_Display::get_width (), 
@@ -90,14 +90,14 @@
     else
       {
        client = new MultiplayerClient (server.get (),
-                                        new MultiplayerClientChild 
(controller1.get(),
+                                        new MultiplayerClientChild 
(controller1,
                                                                    server.get 
(),
                                                                    CL_Rect (0,
                                                                             0,
                                                                             
CL_Display::get_width  ()/2 - 4,
                                                                             
CL_Display::get_height ()/2 - 4)
                                                                            ),
-                                       new MultiplayerClientChild 
(controller2.get(),
+                                       new MultiplayerClientChild (controller2,
                                                                    server.get 
(),
                                                                    CL_Rect 
(CL_Display::get_width ()/2 + 4,
                                                                             0,
@@ -105,7 +105,7 @@
                                                                             
CL_Display::get_height ()/2 - 4
                                                                            )
                                                                   ),
-                                        new MultiplayerClientChild 
(controller3.get(),
+                                        new MultiplayerClientChild 
(controller3,
                                                                    server.get 
(),
                                                                    CL_Rect (0,
                                                                             
CL_Display::get_height ()/2 + 4,
@@ -113,7 +113,7 @@
                                                                             
CL_Display::get_height ()
                                                                            )
                                                                   ),
-                                       new MultiplayerClientChild 
(controller4.get(),
+                                       new MultiplayerClientChild (controller4,
                                                                    server.get 
(),
                                                                    CL_Rect 
(CL_Display::get_width ()/2 + 4,
                                                                             
CL_Display::get_height ()/2 + 4,

Index: pingu_info.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_info.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pingu_info.cxx      13 Jun 2002 14:25:12 -0000      1.2
+++ pingu_info.cxx      20 Jun 2002 12:22:51 -0000      1.3
@@ -17,6 +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 <stdio.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Font/font.h>
 #include "algo.hxx"

Index: plt_parser.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plt_parser.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- plt_parser.cxx      13 Jun 2002 14:25:12 -0000      1.2
+++ plt_parser.cxx      20 Jun 2002 12:22:51 -0000      1.3
@@ -17,6 +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 <stdio.h>
 #include "pingus_error.hxx"
 #include "plt_parser.hxx"
 #include "my_gettext.hxx"

Index: server.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/server.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- server.cxx  20 Jun 2002 11:23:53 -0000      1.3
+++ server.cxx  20 Jun 2002 12:22:51 -0000      1.4
@@ -17,6 +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 <algorithm>
 #include <stdio.h>
 #include "system.hxx"
 #include "pingu.hxx"

Index: spot_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/spot_map.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- spot_map.cxx        13 Jun 2002 14:25:12 -0000      1.2
+++ spot_map.cxx        20 Jun 2002 12:22:51 -0000      1.3
@@ -17,6 +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 <stdio.h>
 #include <ClanLib/Display/SurfaceProviders/canvas.h>
 #include <ClanLib/Display/Display/display.h>
 #include "pingus_resource.hxx"

Index: time_display.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/time_display.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- time_display.cxx    13 Jun 2002 14:25:12 -0000      1.2
+++ time_display.cxx    20 Jun 2002 12:22:51 -0000      1.3
@@ -17,6 +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 <stdio.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Font/font.h>
 #include "globals.hxx"