[Pingus-CVS] CVS: Games/Pingus/src xml_plf.cxx,1.12,1.13 xml_plf.hxx,1.5,1.6

[grumbel]

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

Modified Files:
        xml_plf.cxx xml_plf.hxx 
Log Message:
- fixed trap in the editor (well, moving them is still broken now)
- some worldmap rewrite stuff, completly #ifdef'ed out at the moment

Index: xml_plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_plf.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- xml_plf.cxx 4 Sep 2002 14:55:11 -0000       1.12
+++ xml_plf.cxx 8 Sep 2002 18:13:04 -0000       1.13
@@ -120,7 +120,7 @@
            }
          else if (!strcmp(reinterpret_cast<const char*>(cur->name), "trap"))
            {
-             parse_traps(doc, cur);
+             parse_traps(cur);
            }
          else if (!strcmp(reinterpret_cast<const char*>(cur->name), "hotspot"))
            {
@@ -242,7 +242,7 @@
        }
       else if (!strcmp(reinterpret_cast<const char*>(cur->name), "trap"))
        {
-         parse_traps(doc, cur);
+         parse_traps (cur);
        }
       else if (!strcmp(reinterpret_cast<const char*>(cur->name), "hotspot"))
        {
@@ -437,7 +437,7 @@
 }
 
 void
-XMLPLF::parse_traps (xmlDocPtr doc, xmlNodePtr cur)
+XMLPLF::parse_traps (xmlNodePtr cur)
 {
   xmlNodePtr cur_ = XMLhelper::skip_blank(cur->children);
   

Index: xml_plf.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_plf.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xml_plf.hxx 4 Sep 2002 14:55:11 -0000       1.5
+++ xml_plf.hxx 8 Sep 2002 18:13:04 -0000       1.6
@@ -37,7 +37,10 @@
   void parse_group       (xmlNodePtr cur);
   void parse_start_pos   (xmlNodePtr cur);
   void parse_weather     (xmlNodePtr cur);
-  void parse_traps       (xmlDocPtr  doc, xmlNodePtr node);
+
+  /** trap parsing is only here for backward compatibility, traps are
+      worldobjs now */
+  void parse_traps       (xmlNodePtr node);
 
 public:
   XMLPLF (const std::string& filename);