[Pingus-CVS] CVS: Games/Pingus/src debug_stream.hxx,1.2,1.3 world.cxx,1.8,1.9

[grumbel]

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

Modified Files:
        debug_stream.hxx world.cxx 
Log Message:
Some patch for the last patch

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

Index: world.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- world.cxx   21 Jun 2002 07:45:35 -0000      1.8
+++ world.cxx   21 Jun 2002 08:11:27 -0000      1.9
@@ -43,7 +43,7 @@
   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.
@@ -53,7 +53,7 @@
 // {
 //  return WorldObj_less (a, b);
 // } 
-// #endif
+#endif
 
 World::World(PLF* arg_plf)
   : world_obj (new std::list<WorldObj*>),
@@ -210,17 +210,16 @@
    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
+#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.
-
 
   // Drawing all world objs to the colmap
   for(WorldObjIter obj = world_obj->begin(); obj != world_obj->end(); ++obj)