[Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.25,1.26 action

pingus-cvs
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.25,1.26 action_ho

From:	torangan
Subject:	[Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.25,1.26 action_holder.cxx,1.9,1.10 blitter.cxx,1.21,1.22 button_panel.cxx,1.22,1.23 client.cxx,1.36,1.37 col_map.cxx,1.13,1.14 console.cxx,1.10,1.11 demo_player.cxx,1.6,1.7 demo_recorder.cxx,1.10,1.11 demo_session.cxx,1.3,1.4 display.cxx,1.5,1.6 fade_out.cxx,1.5,1.6 game_delta.hxx,1.12,1.13 game_session.cxx,1.23,1.24 gui_screen.cxx,1.15,1.16 hurry_up.cxx,1.4,1.5 input_debug_screen.cxx,1.7,1.8 intro.cxx,1.5,1.6 multiline_text.cxx,1.5,1.6 option_menu.cxx,1.10,1.11 path_manager.cxx,1.3,1.4 pingu_action.cxx,1.21,1.22 pingu_map.cxx,1.5,1.6 pingus_counter_bar.cxx,1.4,1.5 pingus_main.cxx,1.38,1.39 playfield.cxx,1.28,1.29 plf.cxx,1.12,1.13 plt_parser.cxx,1.6,1.7 screen_manager.cxx,1.27,1.28 server.cxx,1.24,1.25 server.hxx,1.12,1.13 server_event.cxx,1.3,1.4 smallmap.cxx,1.28,1.29 smallmap_image.cxx,1.8,1.9 spot_map.cxx,1.22,1.23 string_converter.cxx,1.6,1.7 string_converter.hxx,1.10,1.11 theme.cxx,1.10,1.11 true_server.cxx,1.16,1.17 wav_provider.cxx,1.4,1.5 xml_helper.cxx,1.25,1.26 xml_pdf.cxx,1.5,1.6 xml_plf.cxx,1.31,1.32
Date:	29 Dec 2002 23:29:03 -0000
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv4084

Modified Files:
        action_button.cxx action_holder.cxx blitter.cxx 
        button_panel.cxx client.cxx col_map.cxx console.cxx 
        demo_player.cxx demo_recorder.cxx demo_session.cxx display.cxx 
        fade_out.cxx game_delta.hxx game_session.cxx gui_screen.cxx 
        hurry_up.cxx input_debug_screen.cxx intro.cxx 
        multiline_text.cxx option_menu.cxx path_manager.cxx 
        pingu_action.cxx pingu_map.cxx pingus_counter_bar.cxx 
        pingus_main.cxx playfield.cxx plf.cxx plt_parser.cxx 
        screen_manager.cxx server.cxx server.hxx server_event.cxx 
        smallmap.cxx smallmap_image.cxx spot_map.cxx 
        string_converter.cxx string_converter.hxx theme.cxx 
        true_server.cxx wav_provider.cxx xml_helper.cxx xml_pdf.cxx 
        xml_plf.cxx 
Log Message:
cleanup


Index: action_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_button.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- action_button.cxx   20 Dec 2002 01:22:32 -0000      1.25
+++ action_button.cxx   29 Dec 2002 23:29:00 -0000      1.26
@@ -27,7 +27,6 @@
 #include "action_button.hxx"
 #include "true_server.hxx"
 #include "world.hxx"
-#include "vector.hxx"
 #include "graphic_context.hxx"
 #include "string_converter.hxx"
 

Index: action_holder.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_holder.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- action_holder.cxx   8 Nov 2002 01:38:27 -0000       1.9
+++ action_holder.cxx   29 Dec 2002 23:29:00 -0000      1.10
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include "globals.hxx"
 #include "plf.hxx"
 
 #include "pingu_action_factory.hxx"

Index: blitter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/blitter.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- blitter.cxx 19 Oct 2002 23:23:44 -0000      1.21
+++ blitter.cxx 29 Dec 2002 23:29:00 -0000      1.22
@@ -18,8 +18,6 @@
 //  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/palette.h>
 #include "pingus_error.hxx"
 #include "color.hxx"
 #include "string_converter.hxx"
@@ -27,7 +25,6 @@
 #include "math.hxx"
 #include "blitter.hxx"
 #include "debug.hxx"
-#include "indexed_canvas.hxx"
 #include "blitter_impl.hxx"
 
 /* Headers needed for i18n / gettext */

Index: button_panel.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/button_panel.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- button_panel.cxx    8 Nov 2002 01:38:27 -0000       1.22
+++ button_panel.cxx    29 Dec 2002 23:29:00 -0000      1.23
@@ -17,13 +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.
 
-#include <iostream>
 #include <algorithm>
-#include <ClanLib/Core/System/system.h>
 #include "globals.hxx"
 #include "button_panel.hxx"
 #include "true_server.hxx"
-#include "plf.hxx"
 #include "client.hxx"
 
 using namespace Actions;

Index: client.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/client.cxx,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- client.cxx  20 Dec 2002 01:22:32 -0000      1.36
+++ client.cxx  29 Dec 2002 23:29:00 -0000      1.37
@@ -17,9 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <iostream>
-#include <config.h>
-#include <ClanLib/Core/System/system.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Display/mousecursor_provider.h>
 #include "globals.hxx"
@@ -36,11 +33,7 @@
 #include "cursor.hxx"
 #include "true_server.hxx"
 #include "button_panel.hxx"
-#include "screen_manager.hxx"
 #include "gui/gui_manager.hxx"
-// Input
-#include "input/controller.hxx"
-#include "input/event.hxx"
 
 Client::Client (TrueServer * s)
   : server       (s),

Index: col_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/col_map.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- col_map.cxx 7 Oct 2002 23:09:14 -0000       1.13
+++ col_map.cxx 29 Dec 2002 23:29:00 -0000      1.14
@@ -21,8 +21,6 @@
 #include <ClanLib/Display/SurfaceProviders/canvas.h>
 #include "graphic_context.hxx"
 #include "globals.hxx"
-#include "pingus_resource.hxx"
-#include "pingus_error.hxx"
 #include "col_map.hxx"
 
 /* Headers needed for i18n / gettext */

Index: console.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/console.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- console.cxx 11 Sep 2002 12:45:57 -0000      1.10
+++ console.cxx 29 Dec 2002 23:29:00 -0000      1.11
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
-#include <assert.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Font/font.h>
 #include "pingus_resource.hxx"

Index: demo_player.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/demo_player.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- demo_player.cxx     3 Oct 2002 12:57:37 -0000       1.6
+++ demo_player.cxx     29 Dec 2002 23:29:00 -0000      1.7
@@ -17,16 +17,9 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <iostream>
-#include <fstream>
 #include "server.hxx"
-#include "pingus_error.hxx"
 #include "demo_player.hxx"
-#include "xml_helper.hxx"
-#include "my_gettext.hxx"
 #include "xml_pdf.hxx"
-
-using namespace std;
 
 DemoPlayer::DemoPlayer(Server* s, XMLPDF* pdf)
   : server(s),

Index: demo_recorder.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/demo_recorder.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- demo_recorder.cxx   7 Oct 2002 13:12:47 -0000       1.10
+++ demo_recorder.cxx   29 Dec 2002 23:29:00 -0000      1.11
@@ -19,10 +19,7 @@
 
 #include <time.h>
 #include "system.hxx"
-#include "console.hxx"
-#include "pingus_error.hxx"
 #include "demo_recorder.hxx"
-#include "server_event.hxx"
 #include "server.hxx"
 #include "plf.hxx"
 
@@ -31,9 +28,7 @@
 #include <config.h>
 #include "my_gettext.hxx"
 
-using namespace std;
-
-DemoRecorder::DemoRecorder(Server* server)
+DemoRecorder::DemoRecorder (Server* server)
   : record_demo (true)
 {
   std::string levelname = server->get_plf()->get_filename();
@@ -71,7 +66,7 @@
     }
 }
 
-DemoRecorder::~DemoRecorder()
+DemoRecorder::~DemoRecorder ()
 {
   if (record_demo)
     {
@@ -92,8 +87,8 @@
     }
 }
 
-string 
-DemoRecorder::get_date()
+std::string 
+DemoRecorder::get_date ()
 {
   char buffer[32];
   time_t curtime;
@@ -102,7 +97,7 @@
   loctime = localtime(&curtime);
   strftime(buffer, 32, "%Y%m%d-%H%M%S", loctime);
 
-  return string(buffer);
+  return std::string(buffer);
 }
 
 /* EOF */

Index: demo_session.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/demo_session.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- demo_session.cxx    4 Oct 2002 13:46:56 -0000       1.3
+++ demo_session.cxx    29 Dec 2002 23:29:00 -0000      1.4
@@ -17,7 +17,6 @@
 //  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/Core/System/system.h>
 #include <ClanLib/Display/Input/input.h>
 #include <ClanLib/Display/Input/keyboard.h>
 #include "xml_pdf.hxx"
@@ -26,7 +25,6 @@
 #include "demo_player.hxx"
 #include "pingus_counter.hxx"
 #include "gui/gui_manager.hxx"
-#include "vector.hxx"
 #include "graphic_context.hxx"
 #include "demo_session.hxx"
 

Index: display.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/display.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- display.cxx 20 Jun 2002 12:22:51 -0000      1.5
+++ display.cxx 29 Dec 2002 23:29:00 -0000      1.6
@@ -25,9 +25,7 @@
 #include "globals.hxx"
 #include "display.hxx"
 
-using namespace std;
-
-list<DisplayHook*> Display::display_hooks;
+std::list<DisplayHook*> Display::display_hooks;
 bool Display::displaying_cursor = false;
 
 DisplayHook::DisplayHook() : is_visible(false)
@@ -84,7 +82,7 @@
 void
 Display::flip_display(bool sync)
 {
-  for(list<DisplayHook*>::iterator i = display_hooks.begin();
+  for(std::list<DisplayHook*>::iterator i = display_hooks.begin();
       i != display_hooks.end();
       i++)
     {
@@ -96,9 +94,9 @@
 }
 
 void
-Display:: add_flip_screen_hook(DisplayHook* hook)
+Display::add_flip_screen_hook(DisplayHook* hook)
 {
-  if (find(display_hooks.begin(), display_hooks.end(), hook) == 
display_hooks.end())
+  if (std::find(display_hooks.begin(), display_hooks.end(), hook) == 
display_hooks.end())
     display_hooks.push_back(hook);
   else
     std::cout << "Display: Trying to insert a display hook multiple times..." 
<< std::endl;
@@ -111,7 +109,3 @@
 }
 
 /* EOF */
-
-
-
-

Index: fade_out.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/fade_out.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fade_out.cxx        12 Oct 2002 00:49:10 -0000      1.5
+++ fade_out.cxx        29 Dec 2002 23:29:00 -0000      1.6
@@ -25,8 +25,6 @@
 #include "globals.hxx"
 #include "math.hxx"
 
-using namespace std;
-
 FadeOut::FadeOut (float seconds, Color color_)
   : complete_time(seconds), passed_time(0),
     color(color_)
@@ -71,23 +69,23 @@
 }
 
 void
-FadeOut::random(void)
+FadeOut::random (void)
 {
   if (maintainer_mode) {
     CL_Display::clear_display();    
   } else {
     switch(rand() % 2) {
     case 0:
-      if (verbose) cout << "FadeOut::black_rect" << endl;
+      if (verbose) std::cout << "FadeOut::black_rect" << std::endl;
       black_rect();
       break;
     case 1:
-      if (verbose) cout << "FadeOut::fade_to_black" << endl;
+      if (verbose) std::cout << "FadeOut::fade_to_black" << std::endl;
       fade_to_black();
       break;
     case 2:
       CL_Display::clear_display();
-      if (verbose) cout << "FadeOut::clear_display()" << endl;    
+      if (verbose) std::cout << "FadeOut::clear_display()" << std::endl;    
       break;
     default:
       black_rect();
@@ -97,7 +95,7 @@
 }
 
 void
-FadeOut::black_rect(int steps)
+FadeOut::black_rect (int steps)
 {
   int x1, x2, y1, y2;
   double step_w = (CL_Display::get_width()  / 2.0) / steps;
@@ -107,10 +105,10 @@
 
   for(int i=0; i <= steps; ++i) 
     {
-      x1 = (int)((CL_Display::get_width()  / 2) - (step_w * i));
-      y1 = (int)((CL_Display::get_height() / 2) - (step_h * i));
-      x2 = (int)((CL_Display::get_width()  / 2) + (step_w * i));
-      y2 = (int)((CL_Display::get_height() / 2) + (step_h * i));
+      x1 = static_cast<int>((CL_Display::get_width()  / 2) - (step_w * i));
+      y1 = static_cast<int>((CL_Display::get_height() / 2) - (step_h * i));
+      x2 = static_cast<int>((CL_Display::get_width()  / 2) + (step_w * i));
+      y2 = static_cast<int>((CL_Display::get_height() / 2) + (step_h * i));
       
       CL_Display::fill_rect(x1, y1, x2, y2, 0.0, 0.0, 0.0, 1.0);
       CL_System::sleep(0);
@@ -120,24 +118,24 @@
 }
 
 void
-FadeOut::fade_to_black(int steps)
+FadeOut::fade_to_black (int steps)
 {
   CL_Display::sync_buffers();
 
   for(int i = 0; i < steps; ++i)
     {
-      CL_Display::fill_rect(0,0,
+      CL_Display::fill_rect(0, 0,
                            CL_Display::get_width(),
                            CL_Display::get_height(),
-                           0.0, 0.0, 0.0,
-                           ((double)i)/steps);
+                           0.0f, 0.0f, 0.0f,
+                           static_cast<float>(i)/steps);
 
       Display::flip_display(true);
     }
 }
 
 void
-FadeOut::clear(void)
+FadeOut::clear (void)
 {
   CL_Display::clear_display();
   Display::flip_display();
@@ -147,7 +145,7 @@
 void 
 EnlargingRectFadeOut::draw ()
 {
-  //cout << "EnlargingRectFadeOut:: draw" << endl;
+  //std::cout << "EnlargingRectFadeOut:: draw" << std::endl;
   int width = int(CL_Display::get_width () * get_progress ());
   CL_Display::fill_rect (0, 0, width, CL_Display::get_height (),
                         color.red,  color.green, color.blue);

Index: game_delta.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/game_delta.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- game_delta.hxx      20 Dec 2002 01:42:07 -0000      1.12
+++ game_delta.hxx      29 Dec 2002 23:29:00 -0000      1.13
@@ -21,7 +21,6 @@
 #define HEADER_PINGUS_GAME_DELTA_HXX
 
 #include <list>
-#include "pingus.hxx"
 #include "delta_manager.hxx"
 #include "input/event_fwd.hxx"
 

Index: game_session.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/game_session.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- game_session.cxx    26 Oct 2002 17:27:52 -0000      1.23
+++ game_session.cxx    29 Dec 2002 23:29:00 -0000      1.24
@@ -17,8 +17,6 @@
 //  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/Core/System/system.h>
-#include <iostream>
 #include "client.hxx"
 #include "true_server.hxx"
 #include "game_session.hxx"

Index: gui_screen.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/gui_screen.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gui_screen.cxx      20 Dec 2002 01:22:32 -0000      1.15
+++ gui_screen.cxx      29 Dec 2002 23:29:00 -0000      1.16
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <iostream>
 #include "globals.hxx"
 #include "debug.hxx"
 #include "gui_screen.hxx"

Index: hurry_up.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/hurry_up.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hurry_up.cxx        4 Oct 2002 16:54:04 -0000       1.4
+++ hurry_up.cxx        29 Dec 2002 23:29:00 -0000      1.5
@@ -17,14 +17,11 @@
 //  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/Core/System/system.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Font/font.h>
-#include <ClanLib/Core/System/system.h>
 #include "pingus_resource.hxx"
 #include "hurry_up.hxx"
-#include "client.hxx"
-#include "world.hxx"
-#include "true_server.hxx"
 
 HurryUp::HurryUp () 
   : font(PingusResource::load_font("Fonts/pingus","fonts")),

Index: input_debug_screen.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input_debug_screen.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- input_debug_screen.cxx      20 Dec 2002 01:22:32 -0000      1.7
+++ input_debug_screen.cxx      29 Dec 2002 23:29:00 -0000      1.8
@@ -19,7 +19,6 @@
 
 #include <assert.h>
 #include <iostream>
-#include <ClanLib/Core/System/system.h>
 #include "input/event.hxx"
 //#include "input/scroll_event.hxx"
 #include "input_debug_screen.hxx"

Index: intro.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/intro.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- intro.cxx   28 Sep 2002 11:52:21 -0000      1.5
+++ intro.cxx   29 Dec 2002 23:29:00 -0000      1.6
@@ -17,7 +17,6 @@
 //  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/Core/System/system.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Font/font.h>
 #include "pingus_menu_manager.hxx"

Index: multiline_text.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiline_text.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- multiline_text.cxx  11 Sep 2002 12:45:57 -0000      1.5
+++ multiline_text.cxx  29 Dec 2002 23:29:00 -0000      1.6
@@ -22,8 +22,6 @@
 #include "multiline_text.hxx"
 #include "math.hxx"
 
-using namespace std;
-
 MultiLineText::MultiLineText()
 {
   width = -1;
@@ -38,7 +36,7 @@
 }
 
 void
-MultiLineText::set_text(const string& str, int text_width)
+MultiLineText::set_text(const std::string& str, int text_width)
 {
   int last_pos;
 
@@ -74,11 +72,11 @@
   //cout << "MultiLineText: " << str << endl;
   /*
   cout << "MultiLineText: " << endl;
-  for(vector<string>::iterator i = text.begin(); i != text.end(); ++i)
+  for(std::vector<std::string>::iterator i = text.begin(); i != text.end(); 
++i)
     cout << "  " << *i << endl;
   */
   width = 0;
-  for(vector<string>::iterator i = text.begin(); i != text.end(); ++i)
+  for(std::vector<std::string>::iterator i = text.begin(); i != text.end(); 
++i)
          width = Math::max(width, font->get_text_width(i->c_str()));
 
   height = text.size() * font->get_height();
@@ -89,7 +87,7 @@
 {
   int y_inc = 0;
 
-  for(vector<string>::iterator i = text.begin(); 
+  for(std::vector<std::string>::iterator i = text.begin(); 
       i != text.end();
       ++i)
     {
@@ -103,7 +101,7 @@
 {
   int y_inc = 0;
 
-  for(vector<string>::iterator i = text.begin(); 
+  for(std::vector<std::string>::iterator i = text.begin(); 
       i != text.end();
       ++i)
     {
@@ -117,7 +115,7 @@
 {
   int y_inc = 0;
 
-  for(vector<string>::iterator i = text.begin(); 
+  for(std::vector<std::string>::iterator i = text.begin(); 
       i != text.end();
       ++i)
     {

Index: option_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/option_menu.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- option_menu.cxx     8 Nov 2002 01:38:27 -0000       1.10
+++ option_menu.cxx     29 Dec 2002 23:29:00 -0000      1.11
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include <ClanLib/Core/System/system.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Font/font.h>
 #include <ClanLib/Display/Input/mouse.h>

Index: path_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/path_manager.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- path_manager.cxx    23 Aug 2002 15:49:49 -0000      1.3
+++ path_manager.cxx    29 Dec 2002 23:29:00 -0000      1.4
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <iostream>
 #include "globals.hxx"
 #include "system.hxx"
 #include "path_manager.hxx"

Index: pingu_action.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_action.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- pingu_action.cxx    26 Nov 2002 21:30:37 -0000      1.21
+++ pingu_action.cxx    29 Dec 2002 23:29:00 -0000      1.22
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <iostream>
 #include <assert.h>
 #include <math.h>
 #include "vector.hxx"
@@ -26,7 +25,6 @@
 #include "pingu.hxx"
 #include "pingu_action.hxx"
 #include "worldobj.hxx"
-#include "actions/faller.hxx"
 
 // Initialise class static.
 const int PinguAction::pingu_height = 26;

Index: pingu_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_map.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pingu_map.cxx       14 Oct 2002 11:15:15 -0000      1.5
+++ pingu_map.cxx       29 Dec 2002 23:29:00 -0000      1.6
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Display/Display/surface.h>
-#include "col_map.hxx"
 #include "pingu_map.hxx"
 
 PinguMap::PinguMap()

Index: pingus_counter_bar.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_counter_bar.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pingus_counter_bar.cxx      4 Oct 2002 16:54:04 -0000       1.4
+++ pingus_counter_bar.cxx      29 Dec 2002 23:29:00 -0000      1.5
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <iostream>
 #include <ClanLib/Display/Display/display.h>
 #include "pingus_counter_bar.hxx"
 #include "pingu_holder.hxx"

Index: pingus_main.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- pingus_main.cxx     1 Dec 2002 17:08:47 -0000       1.38
+++ pingus_main.cxx     29 Dec 2002 23:29:00 -0000      1.39
@@ -37,8 +37,6 @@
 #endif /* !WIN32 */
 
 #include <ClanLib/Core/System/console_window.h>
-#include <ClanLib/Core/System/error.h>
-#include <ClanLib/Core/System/system.h>
 #include <ClanLib/Display/setupdisplay.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Input/input.h>

Index: playfield.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- playfield.cxx       28 Oct 2002 20:13:40 -0000      1.28
+++ playfield.cxx       29 Dec 2002 23:29:00 -0000      1.29
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
-#include <iostream>
 #include <ClanLib/Display/Display/display.h>
 #include "globals.hxx"
 #include "playfield.hxx"

Index: plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plf.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- plf.cxx     8 Nov 2002 01:38:27 -0000       1.12
+++ plf.cxx     29 Dec 2002 23:29:00 -0000      1.13
@@ -19,7 +19,6 @@
 
 #include <iostream>
 #include "xml_plf.hxx"
-#include "globals.hxx"
 #include "system.hxx"
 #include "pingus_error.hxx"
 #include "cheat.hxx"

Index: plt_parser.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plt_parser.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- plt_parser.cxx      14 Oct 2002 11:15:15 -0000      1.6
+++ plt_parser.cxx      29 Dec 2002 23:29:00 -0000      1.7
@@ -22,8 +22,6 @@
 #include "plt_parser.hxx"
 #include "my_gettext.hxx"
 
-using namespace std;
-
 PLTParser::PLTParser()
 {
   lineno = 0;
@@ -37,10 +35,10 @@
 }
 
 void
-PLTParser::parse(string filename)
+PLTParser::parse(std::string filename)
 {
-  string keyword;
-  string value;
+  std::string keyword;
+  std::string value;
 
   in.open(filename.c_str());
 
@@ -64,7 +62,7 @@
       
       while (true) 
        {
-         string str = get_line();
+         std::string str = get_line();
          levels.push_back(str);
        }
     }
@@ -76,7 +74,7 @@
 }
 
 void
-PLTParser::add_pair(string keyword, string value)
+PLTParser::add_pair(std::string keyword, std::string value)
 {
   if (keyword == "Name") {
     theme_name = value;
@@ -135,11 +133,11 @@
   jump_spaces();
 }
 
-string
+std::string
 PLTParser::get_string()
 {
   char c;
-  string str;
+  std::string str;
   
   while (isalnum(c = get_char())) {
     str += c;
@@ -149,11 +147,11 @@
   return str;
 }
 
-string
+std::string
 PLTParser::get_line()
 {
   char c;
-  string str;
+  std::string str;
 
   while ((c = get_char()) != '\n') {
     str += c;
@@ -162,25 +160,25 @@
   return str;
 }
 
-vector<string>
+std::vector<std::string>
 PLTParser::get_levels()
 {
   return levels;
 }
 
-string 
+std::string 
 PLTParser::get_name()
 {
   return theme_name;
 }
 
-string
+std::string
 PLTParser::get_description()
 {
   return theme_description;
 }
 
-string 
+std::string 
 PLTParser::get_surface()
 {
   return theme_image;

Index: screen_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/screen_manager.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- screen_manager.cxx  27 Nov 2002 20:05:42 -0000      1.27
+++ screen_manager.cxx  29 Dec 2002 23:29:00 -0000      1.28
@@ -19,9 +19,7 @@
 
 #include <iostream>
 #include <ClanLib/Display/Display/display.h>
-#include "globals.hxx"
 #include "input/controller.hxx"
-#include "delta_manager.hxx"
 #include "display.hxx"
 #include "screen_manager.hxx"
 #include "path_manager.hxx"

Index: server.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/server.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- server.cxx  12 Oct 2002 00:24:26 -0000      1.24
+++ server.cxx  29 Dec 2002 23:29:00 -0000      1.25
@@ -17,22 +17,13 @@
 //  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 <iostream>
-#include <fstream>
-#include <stdio.h>
-#include "system.hxx"
 #include "pingu.hxx"
 #include "server.hxx"
-#include "pingu_holder.hxx"
-#include "pingus_error.hxx"
-#include "string_converter.hxx"
 #include "game_time.hxx"
 #include "world.hxx"
 #include "demo_recorder.hxx"
 #include "goal_manager.hxx"
 
-using namespace std;
 using Actions::action_from_string;
 
 Server::Server (PLF* arg_plf)

Index: server.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/server.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- server.hxx  4 Oct 2002 16:54:04 -0000       1.12
+++ server.hxx  29 Dec 2002 23:29:00 -0000      1.13
@@ -20,7 +20,6 @@
 #ifndef HEADER_PINGUS_SERVER_HXX
 #define HEADER_PINGUS_SERVER_HXX
 
-#include <vector>
 #include "server_event.hxx"
 #include "action_holder.hxx"
 

Index: server_event.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/server_event.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- server_event.cxx    4 Oct 2002 13:46:56 -0000       1.3
+++ server_event.cxx    29 Dec 2002 23:29:00 -0000      1.4
@@ -23,7 +23,6 @@
 #include "server.hxx"
 #include "world.hxx"
 #include "pingu_holder.hxx"
-#include "server_event.hxx"
 
 ServerEvent::ServerEvent()
 {

Index: smallmap.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- smallmap.cxx        20 Dec 2002 01:22:32 -0000      1.28
+++ smallmap.cxx        29 Dec 2002 23:29:00 -0000      1.29
@@ -28,12 +28,9 @@
 #include "col_map.hxx"
 #include "true_server.hxx"
 #include "pingu.hxx"
-#include "timer.hxx"
 #include "math.hxx"
 #include "globals.hxx"
 
-using namespace std;
-
 SmallMap::SmallMap()
   : canvas(0),
     update_count(0),
@@ -334,4 +331,3 @@
 }
 
 /* EOF */
-

Index: smallmap_image.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap_image.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- smallmap_image.cxx  28 Sep 2002 11:52:22 -0000      1.8
+++ smallmap_image.cxx  29 Dec 2002 23:29:00 -0000      1.9
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Display/SurfaceProviders/canvas.h>
-#include "pingus_resource.hxx"
 #include "world.hxx"
 #include "smallmap_image.hxx"
 #include "col_map.hxx"

Index: spot_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/spot_map.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- spot_map.cxx        20 Dec 2002 23:06:55 -0000      1.22
+++ spot_map.cxx        29 Dec 2002 23:29:00 -0000      1.23
@@ -19,20 +19,16 @@
 
 #include <stdio.h>
 #include <ClanLib/Display/SurfaceProviders/canvas.h>
-#include <ClanLib/Display/Display/display.h>
 #include "graphic_context.hxx"
-#include "pingus_resource.hxx"
 #include "plf.hxx"
 #include "pingus_error.hxx"
 #include "blitter.hxx"
-#include "timer.hxx"
 #include "spot_map.hxx"
 #include "my_gettext.hxx"
 #include "col_map.hxx"
 #include "math.hxx"
 
 using namespace WorldObjsData;
-using namespace std;
 
 MapTileSurface::MapTileSurface () : empty(true)
 {

Index: string_converter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/string_converter.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- string_converter.cxx        4 Sep 2002 14:55:11 -0000       1.6
+++ string_converter.cxx        29 Dec 2002 23:29:00 -0000      1.7
@@ -18,61 +18,12 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <algorithm>
-#include <stdio.h>
 #include "string_converter.hxx"
 
-using namespace std;
-
-int 
-StringConverter::to_int(const std::string& str)
-{
-  int i;
-  if (sscanf(str.c_str(), "%d", &i) != 1)
-    {
-      throw Error("StringConverter: Couldn't convert: \"" + str + "\" to int");
-    }
-  return i;
-}
-
-float
-StringConverter::to_float(const std::string& str)
-{
-  float i;
-  if (sscanf(str.c_str(), "%f", &i) != 1)
-    {
-      throw Error("StringConverter: Couldn't convert: \"" + str + "\" to 
float");
-    }
-  return i;
-}
-
-std::string 
-StringConverter::to_string (int i)
-{
-  char buffer[16];
-  snprintf (buffer, 16, "%d", i);
-  return buffer;
-}
-
-std::string 
-StringConverter::to_string (long int i)
-{
-  char buffer[32];
-  snprintf (buffer, 32, "%ld", i);
-  return buffer;
-}
-
-std::string 
-StringConverter::to_string (float i)
-{
-  char buffer[48];
-  snprintf (buffer, 48, "%f", i);
-  return buffer;
-}
-
 std::string string_upcase (const std::string& str)
 {
   std::string name = str;
-  std::transform(name.begin(), name.end(), name.begin(), ::tolower);
+  std::transform(name.begin(), name.end(), name.begin(), ::toupper);
   return name;
 }
 

Index: string_converter.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/string_converter.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- string_converter.hxx        28 Dec 2002 16:57:38 -0000      1.10
+++ string_converter.hxx        29 Dec 2002 23:29:00 -0000      1.11
@@ -33,8 +33,6 @@
 #include <strstream>
 #endif
 
-class Vector;
-
 template <class T>
 std::string to_string (const T& any)
 {
@@ -80,30 +78,6 @@
 
 std::string string_upcase (const std::string&);
 std::string string_downcase (const std::string&);
-
-class StringConverter
-{
-private:
-  struct Error {
-    std::string message;
-    
-    Error (const std::string& str)
-      : message (str) {}
-  };
-
-public:
-  static int   to_int(const std::string&);
-  static float to_float(const std::string&);
-
-  static std::string to_string (int i);
-  static std::string to_string (long int i);
-  static std::string to_string (float i);
-  
-private:
-  StringConverter ();
-  StringConverter (const StringConverter&);
-  StringConverter& operator= (const StringConverter&);
-};
 
 #endif
 

Index: theme.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/theme.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- theme.cxx   1 Dec 2002 17:08:47 -0000       1.10
+++ theme.cxx   29 Dec 2002 23:29:00 -0000      1.11
@@ -20,7 +20,6 @@
 #include <fstream>
 #include <iostream>
 #include <ClanLib/Core/System/error.h>
-#include <ClanLib/Core/System/system.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Font/font.h>
 #include <ClanLib/Display/Input/keyboard.h>

Index: true_server.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/true_server.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- true_server.cxx     4 Oct 2002 16:54:04 -0000       1.16
+++ true_server.cxx     29 Dec 2002 23:29:00 -0000      1.17
@@ -17,14 +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 <iostream>
-#include <ClanLib/Core/System/system.h>
-#include "globals.hxx"
-#include "plf.hxx"
 #include "true_server.hxx"
-#include "world.hxx"
 
-using namespace std;
 
 TrueServer::TrueServer(PLF* arg_plf)
   : Server (arg_plf)

Index: wav_provider.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/wav_provider.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- wav_provider.cxx    14 Oct 2002 11:15:15 -0000      1.4
+++ wav_provider.cxx    29 Dec 2002 23:29:00 -0000      1.5
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
-#include <iostream>
 #include "globals.hxx"
 #include "pingus_error.hxx"
 #include "wav_provider.hxx"

Index: xml_helper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_helper.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- xml_helper.cxx      2 Nov 2002 21:12:16 -0000       1.25
+++ xml_helper.cxx      29 Dec 2002 23:29:00 -0000      1.26
@@ -19,7 +19,6 @@
 
 #include <iostream>
 #include "vector.hxx"
-#include "string_converter.hxx"
 #include "color.hxx"
 #include "res_descriptor.hxx"
 #include "xml_helper.hxx"

Index: xml_pdf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_pdf.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xml_pdf.cxx 14 Oct 2002 11:15:15 -0000      1.5
+++ xml_pdf.cxx 29 Dec 2002 23:29:00 -0000      1.6
@@ -18,14 +18,10 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <algorithm>
-
-#include "xml_helper.hxx"
 #include "pingus_error.hxx"
 #include "plf.hxx"
 #include "path_manager.hxx"
 #include "xml_pdf.hxx"
-
-#include <algorithm>
 
 XMLPDF::XMLPDF(const std::string& filename)
   : plf(0)

Index: xml_plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_plf.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- xml_plf.cxx 14 Oct 2002 11:15:15 -0000      1.31
+++ xml_plf.cxx 29 Dec 2002 23:29:00 -0000      1.32
@@ -23,13 +23,11 @@
 #include "globals.hxx"
 #include "system.hxx"
 #include "pingus_error.hxx"
-#include "string_converter.hxx"
 #include "worldobj_data_factory.hxx"
 #include "worldobjsdata/entrance_data.hxx"
 #include "worldobjsdata/exit_data.hxx"
 #include "worldobjsdata/hotspot_data.hxx"
 #include "worldobjsdata/liquid_data.hxx"
-#include "worldobjsdata/worldobj_group_data.hxx"
 
 using Actions::action_from_string;
[Prev in Thread]
Current Thread
[Next in Thread]
[Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.25,1.26 action_holder.cxx,1.9,1.10 blitter.cxx,1.21,1.22 button_panel.cxx,1.22,1.23 client.cxx,1.36,1.37 col_map.cxx,1.13,1.14 console.cxx,1.10,1.11 demo_player.cxx,1.6,1.7 demo_recorder.cxx,1.10,1.11 demo_session.cxx,1.3,1.4 display.cxx,1.5,1.6 fade_out.cxx,1.5,1.6 game_delta.hxx,1.12,1.13 game_session.cxx,1.23,1.24 gui_screen.cxx,1.15,1.16 hurry_up.cxx,1.4,1.5 input_debug_screen.cxx,1.7,1.8 intro.cxx,1.5,1.6 multiline_text.cxx,1.5,1.6 option_menu.cxx,1.10,1.11 path_manager.cxx,1.3,1.4 pingu_action.cxx,1.21,1.22 pingu_map.cxx,1.5,1.6 pingus_counter_bar.cxx,1.4,1.5 pingus_main.cxx,1.38,1.39 playfield.cxx,1.28,1.29 plf.cxx,1.12,1.13 plt_parser.cxx,1.6,1.7 screen_manager.cxx,1.27,1.28 server.cxx,1.24,1.25 server.hxx,1.12,1.13 server_event.cxx,1.3,1.4 smallmap.cxx,1.28,1.29 smallmap_image.cxx,1.8,1.9 spot_map.cxx,1.22,1.23 string_converter.cxx,1.6,1.7 string_converter.hxx,1.10,1.11 theme.cxx,1.10,1.11 true_server.cxx,1.16,1.17 wav_provider.cxx,1.4,1.5 xml_helper.cxx,1.25,1.26 xml_pdf.cxx,1.5,1.6 xml_plf.cxx,1.31,1.32, torangan <=