pingus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pingus-CVS] CVS: Games/Pingus/src action_holder.cxx,1.3,1.4 console.cxx


From: grumbel
Subject: [Pingus-CVS] CVS: Games/Pingus/src action_holder.cxx,1.3,1.4 console.cxx,1.7,1.8 credits.cxx,1.7,1.8 debug_stream.cxx,1.4,1.5 level_desc.cxx,1.4,1.5 multiplayer_game.cxx,1.8,1.9 pingu_action_factory.cxx,1.5,1.6 plf.cxx,1.2,1.3 plf_plf.cxx,1.5,1.6 plt_xml.cxx,1.4,1.5 specs_reader.cxx,1.2,1.3 theme.cxx,1.4,1.5 xml_plf.cxx,1.8,1.9
Date: 22 Aug 2002 02:25:02 -0000

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

Modified Files:
        action_holder.cxx console.cxx credits.cxx debug_stream.cxx 
        level_desc.cxx multiplayer_game.cxx pingu_action_factory.cxx 
        plf.cxx plf_plf.cxx plt_xml.cxx specs_reader.cxx theme.cxx 
        xml_plf.cxx 
Log Message:
Albertos win32 compability patch

Index: action_holder.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_holder.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- action_holder.cxx   28 Jun 2002 15:12:22 -0000      1.3
+++ action_holder.cxx   22 Aug 2002 02:24:59 -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 "pingus.hxx"
 #include "globals.hxx"
 #include "plf.hxx"
 

Index: console.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/console.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- console.cxx 22 Aug 2002 00:36:30 -0000      1.7
+++ console.cxx 22 Aug 2002 02:24:59 -0000      1.8
@@ -26,6 +26,7 @@
 #include "math.hxx"
 
 using namespace Pingus;
+using std::ostream;
 
 // Globale console
 Console console;
@@ -115,7 +116,7 @@
   return buffer;
 }
 
-Console::Console() : std::ostream (&streambuf)
+Console::Console() : ostream (&streambuf)
 {
   is_init = false;
   is_visible = false;

Index: credits.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/credits.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- credits.cxx 17 Aug 2002 17:56:23 -0000      1.7
+++ credits.cxx 22 Aug 2002 02:24:59 -0000      1.8
@@ -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 "pingus.hxx"
 #include <iostream>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Input/keyboard.h>

Index: debug_stream.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/debug_stream.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- debug_stream.cxx    17 Aug 2002 17:21:25 -0000      1.4
+++ debug_stream.cxx    22 Aug 2002 02:24:59 -0000      1.5
@@ -17,9 +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 "pingus.hxx"
 #include "debug_stream.hxx"
 #include "globals.hxx"
 
+using std::ostream;
 
 NilStream DebugStream::nilstream;
 
@@ -102,7 +104,7 @@
 }
 
 void
-DebugStream::Buffer::add (std::ostream& s)
+DebugStream::Buffer::add (ostream& s)
 {
   out_streams.push_back (&s);
 }
@@ -119,7 +121,7 @@
 
 
 DebugStream::DebugStream (const std::string& prefix)
-  : std::ostream (&buffer),
+  : ostream (&buffer),
     buffer (prefix)
 {
 }
@@ -129,7 +131,7 @@
 }
 
 /// returns self if the debug flag is set, else nilstream
-std::ostream & DebugStream::operator () (int component) {
+ostream & DebugStream::operator () (int component) {
 
   if (pingus_debug_flags & component) {
     return *this;
@@ -139,7 +141,7 @@
 }
 
 void
-DebugStream::add (std::ostream& s)
+DebugStream::add (ostream& s)
 {
   buffer.add (s);
 }
@@ -152,7 +154,7 @@
 
 
 NilStream::NilStream ()
-  : std::ostream(&buffer) 
+  : ostream(&buffer) 
 { 
 }
 

Index: level_desc.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/level_desc.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- level_desc.cxx      9 Aug 2002 22:02:13 -0000       1.4
+++ level_desc.cxx      22 Aug 2002 02:24:59 -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 "pingus.hxx"
 #include <stdio.h>
 #include <ClanLib/Core/System/system.h>
 #include <ClanLib/Display/Display/display.h>

Index: multiplayer_game.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiplayer_game.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- multiplayer_game.cxx        16 Aug 2002 22:58:43 -0000      1.8
+++ multiplayer_game.cxx        22 Aug 2002 02:24:59 -0000      1.9
@@ -40,7 +40,7 @@
   std::cout << "Starting Multiplayer Game" << std::endl;
   try {
     PLF* plf = new XMLPLF (path_manager.complete("levels/multi2-grumbel.xml"));
-    Server*     server (new TrueServer (plf));
+    Server* server = new TrueServer (plf);
 #if 0
     Controller* controller1;
     Controller* controller2;

Index: pingu_action_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_action_factory.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pingu_action_factory.cxx    16 Aug 2002 15:13:59 -0000      1.5
+++ pingu_action_factory.cxx    22 Aug 2002 02:24:59 -0000      1.6
@@ -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 "pingus.hxx"
 #include <iostream>
 #include "pingus_error.hxx"
 

Index: plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plf.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- plf.cxx     13 Jun 2002 14:25:12 -0000      1.2
+++ plf.cxx     22 Aug 2002 02:24:59 -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 "pingus.hxx"
 #include "xml_plf.hxx"
 #include "plf_plf.hxx"
 #include "globals.hxx"

Index: plf_plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plf_plf.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- plf_plf.cxx 16 Aug 2002 15:13:59 -0000      1.5
+++ plf_plf.cxx 22 Aug 2002 02:24:59 -0000      1.6
@@ -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 "pingus.hxx"
 #include <stdio.h>
 #include "globals.hxx"
 #include "pingus_error.hxx"

Index: plt_xml.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plt_xml.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- plt_xml.cxx 22 Aug 2002 00:36:30 -0000      1.4
+++ plt_xml.cxx 22 Aug 2002 02:24:59 -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 "pingus.hxx"
 #include "globals.hxx"
 #include "pingus_error.hxx"
 #include "xml_helper.hxx"

Index: specs_reader.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/specs_reader.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- specs_reader.cxx    16 Aug 2002 15:13:59 -0000      1.2
+++ specs_reader.cxx    22 Aug 2002 02:24:59 -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 "pingus.hxx"
 #include <iostream>
 
 #include "pingus_error.hxx"

Index: theme.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/theme.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- theme.cxx   17 Aug 2002 17:56:23 -0000      1.4
+++ theme.cxx   22 Aug 2002 02:24:59 -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 "pingus.hxx"
 #include <ClanLib/Core/System/error.h>
 #include <ClanLib/Core/System/system.h>
 #include <ClanLib/Display/Display/display.h>

Index: xml_plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_plf.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- xml_plf.cxx 22 Aug 2002 00:36:30 -0000      1.8
+++ xml_plf.cxx 22 Aug 2002 02:24:59 -0000      1.9
@@ -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 "pingus.hxx"
 #include "xml_plf.hxx"
 #include "xml_helper.hxx"
 #include "globals.hxx"





reply via email to

[Prev in Thread] Current Thread [Next in Thread]