[Pingus-CVS] CVS: Games/Pingus/src pingus_main.cxx,1.29,1.30 worldobj_data_factory.cxx,1.28,1.29 xml_helper.cxx,1.23,1.24 xml_helper.hxx,1.16,1.17

[grumbel]

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

Modified Files:
        pingus_main.cxx worldobj_data_factory.cxx xml_helper.cxx 
        xml_helper.hxx 
Log Message:
some small fixes

Index: pingus_main.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- pingus_main.cxx     2 Nov 2002 19:03:40 -0000       1.29
+++ pingus_main.cxx     2 Nov 2002 20:46:10 -0000       1.30
@@ -36,6 +36,7 @@
 #  include "win32/getopt.h"
 #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>

Index: worldobj_data_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_data_factory.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- worldobj_data_factory.cxx   1 Oct 2002 23:10:41 -0000       1.28
+++ worldobj_data_factory.cxx   2 Nov 2002 20:46:10 -0000       1.29
@@ -156,7 +156,7 @@
   
   if (it == factories.end())
     PingusError::raise("WorldObjDataFactory: Invalid id: '" + id + "' at line "
-                      + to_string(XML_GET_LINE(cur)));
+                      + to_string(XMLhelper::get_line(cur)));
   else 
     return it->second->create (doc, cur);
     

Index: xml_helper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_helper.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- xml_helper.cxx      12 Oct 2002 00:02:14 -0000      1.23
+++ xml_helper.cxx      2 Nov 2002 20:46:10 -0000       1.24
@@ -420,6 +420,16 @@
   xmlLineNumbersDefault(1);
 }
 
+int
+XMLhelper::get_line(xmlNodePtr cur)
+{
+#ifdef WIN32
+  return -1;
+#else
+  return XML_GET_LINE(cur);
+#endif
+}
+
 /* EOF */
 
 

Index: xml_helper.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_helper.hxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- xml_helper.hxx      12 Oct 2002 00:02:21 -0000      1.16
+++ xml_helper.hxx      2 Nov 2002 20:46:10 -0000       1.17
@@ -119,6 +119,9 @@
   static void write_vector_xml (std::ostream& xml, const Vector& pos);
   //@}
 
+  /** @return the number of the line in which these element starts */
+  static int get_line(xmlNodePtr cur);
+
   static void init();
   
 private: