[Pingus-CVS] CVS: Games/Pingus/src console.cxx,1.3,1.4 console.hxx,1.2,1.3 debug_gui.cxx,1.2,1.3 debug_stream.cxx,1.1,1.2 debug_stream.hxx,1.1,1.2 demo_recorder.cxx,1.3,1.4 force_vector.cxx,1.2,1.3 pingu.cxx,1.4,1.5 pingu_action.cxx,1.2,1.3 pingus_main.cxx,1.2,1.3 pingus_menu.cxx,1.2,1.3 res_descriptor.cxx,1.1,1.2 screenshot.cxx,1.3,1.4 sound.cxx,1.3,1.4 sprite.cxx,1.2,1.3 time_display.cxx,1.3,1.4 view.cxx,1.2,1.3 world.cxx,1.7,1.8 xml_helper.cxx,1.2,1.3 xml_helper.hxx,1.2,1.3

[grumbel]

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

Modified Files:
        console.cxx console.hxx debug_gui.cxx debug_stream.cxx 
        debug_stream.hxx demo_recorder.cxx force_vector.cxx pingu.cxx 
        pingu_action.cxx pingus_main.cxx pingus_menu.cxx 
        res_descriptor.cxx screenshot.cxx sound.cxx sprite.cxx 
        time_display.cxx view.cxx world.cxx xml_helper.cxx 
        xml_helper.hxx 
Log Message:
Some include fixes for win32

Index: console.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/console.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- console.cxx 20 Jun 2002 16:48:11 -0000      1.3
+++ console.cxx 21 Jun 2002 07:45:35 -0000      1.4
@@ -25,6 +25,7 @@
 #include "math.hxx"
 
 using namespace Pingus;
+using namespace std;
 
 // Globale console
 Console console;
@@ -106,7 +107,7 @@
 }
 
 Console::Console()
-  : std::ostream (&streambuf)
+  : ostream (&streambuf)
 {
   is_init = false;
   is_visible = false;

Index: console.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/console.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- console.hxx 19 Jun 2002 15:19:26 -0000      1.2
+++ console.hxx 21 Jun 2002 07:45:35 -0000      1.3
@@ -57,26 +57,17 @@
   std::vector<std::string>* buffer;
 
 public:
-  ///
   CL_Font* font;
-  ///
   bool is_init;
-  ///
   int  current_pos;
-  ///
   std::string current_line;
-  ///
   int number_of_lines;
-  ///
   void draw();
 public:
-  ///
   Console ();
-  ///
   virtual ~Console();
-  ///
+
   void init();
-  ///
   virtual void on_event();
 
   /** Sets the number of lines, which are displayed

Index: debug_gui.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/debug_gui.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- debug_gui.cxx       19 Jun 2002 15:19:26 -0000      1.2
+++ debug_gui.cxx       21 Jun 2002 07:45:35 -0000      1.3
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
+#include <assert.h>
 #include "pingus_resource.hxx"
 
 #include "debug_gui.hxx"

Index: debug_stream.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/debug_stream.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debug_stream.cxx    12 Jun 2002 19:09:37 -0000      1.1
+++ debug_stream.cxx    21 Jun 2002 07:45:35 -0000      1.2
@@ -20,6 +20,8 @@
 #include "debug_stream.hxx"
 #include "globals.hxx"
 
+using namespace std;
+
 NilStream DebugStream::nilstream;
 
 DebugStream::Buffer::Buffer (const std::string& p)
@@ -64,7 +66,7 @@
 {
   if (!out_streams.empty ())
     {
-      for (std::vector<std::ostream*>::iterator i = out_streams.begin ();
+      for (std::vector<ostream*>::iterator i = out_streams.begin ();
            i != out_streams.end (); ++i)
        {
          *(*i) << line;
@@ -103,7 +105,7 @@
 }
 
 void
-DebugStream::Buffer::add (std::ostream& s)
+DebugStream::Buffer::add (ostream& s)
 {
   out_streams.push_back (&s);
 }
@@ -120,7 +122,7 @@
 
 
 DebugStream::DebugStream (const std::string& prefix)
-  : std::ostream (&buffer),
+  : ostream (&buffer),
     buffer (prefix)
 {
 }
@@ -130,7 +132,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;
@@ -140,7 +142,7 @@
 }
 
 void
-DebugStream::add (std::ostream& s)
+DebugStream::add (ostream& s)
 {
   buffer.add (s);
 }

Index: debug_stream.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/debug_stream.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debug_stream.hxx    12 Jun 2002 19:09:37 -0000      1.1
+++ debug_stream.hxx    21 Jun 2002 07:45:35 -0000      1.2
@@ -24,9 +24,11 @@
 #include <vector>
 #include <iostream>
 
+using namespace std;
+
 class NilStream;
 
-class DebugStream : public std::ostream
+class DebugStream : public ostream
 {
 
 private:
@@ -39,7 +41,7 @@
     // static const int buffersize;
     enum { buffersize = 200 };
 
-    std::vector<std::ostream*> out_streams;
+    std::vector<ostream*> out_streams;
 
     char char_buffer[200];
     std::string prefix;
@@ -52,7 +54,7 @@
     int overflow (int c);  
     int sync ();
 
-    void add (std::ostream& s);
+    void add (ostream& s);
     void set_prefix (const std::string & prefix_);
   
   private:
@@ -70,14 +72,14 @@
 
   std::ostream & operator () (int component);
 
-  void add (std::ostream& s);
+  void add (ostream& s);
   void set_prefix (const std::string & prefix);
 };
 
 
 
 /// Stream used to consume unwanted debugmessages
-class NilStream : public std::ostream
+class NilStream : public ostream
 {
   private:
 
@@ -97,7 +99,7 @@
         int sync     () { return 0; }
     } buffer;
 
-    NilStream () : std::ostream(&buffer) { }
+    NilStream () : ostream(&buffer) { }
    ~NilStream () { }
 
     NilStream (const NilStream &); ///< not supported    

Index: demo_recorder.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/demo_recorder.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- demo_recorder.cxx   19 Jun 2002 15:19:26 -0000      1.3
+++ demo_recorder.cxx   21 Jun 2002 07:45:35 -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 <time.h>
 #include "system.hxx"
 #include "console.hxx"
 #include "pingus_error.hxx"

Index: force_vector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/force_vector.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- force_vector.cxx    13 Jun 2002 14:25:12 -0000      1.2
+++ force_vector.cxx    21 Jun 2002 07:45:35 -0000      1.3
@@ -19,6 +19,7 @@
 
 // Force Vectors Implementation - Made by Peter Todd
 
+#include <math.h>
 #include "force_vector.hxx"
 
 CL_Vector grav(0.0,1.0);

Index: pingu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pingu.cxx   20 Jun 2002 11:23:53 -0000      1.4
+++ pingu.cxx   21 Jun 2002 07:45:35 -0000      1.5
@@ -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 <assert.h>
+#include <math.h>
 #include <stdio.h>
 #include <ClanLib/Display/Font/font.h>
 #include "globals.hxx"

Index: pingu_action.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_action.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pingu_action.cxx    13 Jun 2002 14:25:12 -0000      1.2
+++ pingu_action.cxx    21 Jun 2002 07:45:35 -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 <assert.h>
 #include "col_map.hxx"
 #include "world.hxx"
 #include "pingu.hxx"

Index: pingus_main.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pingus_main.cxx     20 Jun 2002 11:23:53 -0000      1.2
+++ pingus_main.cxx     21 Jun 2002 07:45:35 -0000      1.3
@@ -36,6 +36,7 @@
 #  include "win32/getopt.h"
 #endif /* !WIN32 */
 
+#include <ClanLib/core.h>
 #include <ClanLib/Core/System/system.h>
 #include <ClanLib/Display/setupdisplay.h>
 #include <ClanLib/Display/Display/display.h>

Index: pingus_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pingus_menu.cxx     13 Jun 2002 14:25:12 -0000      1.2
+++ pingus_menu.cxx     21 Jun 2002 07:45:35 -0000      1.3
@@ -44,7 +44,7 @@
       pout << "PingusMenu::init ()" << std::endl;
       event_enabled = true;
       is_init = true;
-      SurfaceButton* editor_button (new EditorButton (this));
+         SurfaceButton* editor_button = new EditorButton (this);
  
       if (start_editor)
        {

Index: res_descriptor.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/res_descriptor.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- res_descriptor.cxx  12 Jun 2002 19:09:37 -0000      1.1
+++ res_descriptor.cxx  21 Jun 2002 07:45:35 -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 <assert.h>
 #include <iostream>
 #include "res_descriptor.hxx"
 #include "pingus_error.hxx"

Index: screenshot.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/screenshot.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- screenshot.cxx      20 Jun 2002 11:23:53 -0000      1.3
+++ screenshot.cxx      21 Jun 2002 07:45:35 -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 <time.h>
 #include <stdio.h>
 #include <fstream>
 #include <iostream>

Index: sound.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/sound.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sound.cxx   13 Jun 2002 19:53:21 -0000      1.3
+++ sound.cxx   21 Jun 2002 07:45:35 -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 <assert.h>
 #include "sound_dummy.hxx"
 
 PingusSound* PingusSound::sound;

Index: sprite.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/sprite.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sprite.cxx  13 Jun 2002 14:25:12 -0000      1.2
+++ sprite.cxx  21 Jun 2002 07:45:35 -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 <assert.h>
 #include <ClanLib/Core/Math/cl_vector.h>
 #include "pingus_resource.hxx"
 #include "sprite.hxx"

Index: time_display.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/time_display.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- time_display.cxx    20 Jun 2002 12:22:51 -0000      1.3
+++ time_display.cxx    21 Jun 2002 07:45:35 -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 <assert.h>
 #include <stdio.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Font/font.h>

Index: view.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/view.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- view.cxx    13 Jun 2002 14:25:12 -0000      1.2
+++ view.cxx    21 Jun 2002 07:45:35 -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 <assert.h>
 #include <ClanLib/Display/Display/display.h>
 #include "mouse_controller.hxx"
 #include "view.hxx"

Index: world.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- world.cxx   20 Jun 2002 16:48:11 -0000      1.7
+++ world.cxx   21 Jun 2002 07:45:35 -0000      1.8
@@ -43,17 +43,17 @@
   return a->get_z_pos () < b->get_z_pos ();
 }
 
-#ifdef WIN32
+// #ifdef WIN32
 //FIXME: ingo: This is a workaround around the std::list::sort()
 //FIXME: problem under MSVC6. This is copy&paste from an usenet
 //FIXME: article, so it might work or not, never tested it.
-typedef WorldObj* CWorldObjPtr;
-template<>
-bool std::greater<CWorldObjPtr>::operator()(WorldObj* a, WorldObj* b) const
-{
-  return WorldObj_less (a, b);
-} 
-#endif
+// typedef WorldObj* CWorldObjPtr;
+// template<>
+// bool std::greater<CWorldObjPtr>::operator()(WorldObj* a, WorldObj* b) const
+// {
+//  return WorldObj_less (a, b);
+// } 
+// #endif
 
 World::World(PLF* arg_plf)
   : world_obj (new std::list<WorldObj*>),
@@ -210,14 +210,14 @@
    world_obj->push_back(pingus);
 
   // After all objects are in world_obj, sort them to there z_pos
-#ifdef WIN32
+// #ifdef WIN32
   //FIXME: ingo: This is a workaround around the std::list::sort()
   //FIXME: problem under MSVC6. This is copy&paste from an usenet
   //FIXME: article, so it might work or not, never tested it.
- world_obj->sort(std::greater<CWorldObjPtr>());
-#else
-  world_obj->sort(WorldObj_less);
-#endif
+// world_obj->sort(std::greater<CWorldObjPtr>());
+// #else
+//  world_obj->sort(WorldObj_less);
+// #endif
   // FIXME: If the above thing causes throuble under windows we could
   // use a vector instead of a list and use stable_sort() instead.
 

Index: xml_helper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_helper.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xml_helper.cxx      13 Jun 2002 14:25:12 -0000      1.2
+++ xml_helper.cxx      21 Jun 2002 07:45:35 -0000      1.3
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <fstream>
-#include <ClanLib/Core/Math/cl_vector.h>
 #include "string_converter.hxx"
 #include "xml_helper.hxx"
 #include "color.hxx"

Index: xml_helper.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_helper.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xml_helper.hxx      13 Jun 2002 19:53:21 -0000      1.2
+++ xml_helper.hxx      21 Jun 2002 07:45:35 -0000      1.3
@@ -24,13 +24,13 @@
 #include <string>
 #include <iosfwd>
 
-#include <config.h>
+#include <ClanLib/Core/Math/cl_vector.h>
 
 // FIX: Under windows, it's necessary to use libxml/parser.h, or MS's
 // compiler will fails.
 #ifdef WIN32
   #define list
-  #include <libxml/parser.h>
+    #include <libxml/parser.h>
   #undef list
 #else
   #ifdef LIBXML_2
@@ -53,7 +53,7 @@
   int xmlIsBlankNode(xmlNodePtr node);
 #endif
 
-class CL_Vector;
+// class CL_Vector;
 class Color;
 class ResDescriptor;