[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata bumper_data.cxx,1.3,1.4 fake_exit_data.cxx,1.3,1.4 guillotine_data.cxx,1.3,1.4 hammer_data.cxx,1.3,1.4 laser_exit_data.cxx,1.3,1.4 smasher_data.cxx,1.3,1.4 spike_data.cxx,1.3,1.4 teleporter_data.cxx,1.2,1.3

[torangan]

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

Modified Files:
        bumper_data.cxx fake_exit_data.cxx guillotine_data.cxx 
        hammer_data.cxx laser_exit_data.cxx smasher_data.cxx 
        spike_data.cxx teleporter_data.cxx 
Log Message:
added and applied to XMLhelper methods


Index: bumper_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/bumper_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bumper_data.cxx     10 Sep 2002 19:24:19 -0000      1.3
+++ bumper_data.cxx     10 Sep 2002 21:03:33 -0000      1.4
@@ -37,11 +37,11 @@
     {
       XMLhelper::skip_blank(cur);
 
-      if (strcmp(reinterpret_cast<const char*>(cur->name), "position") == 0) 
+      if (XMLhelper::equal_str(cur->name, "position")) 
        {
          pos = XMLhelper::parse_vector(doc, cur);
        }
-         
+       
       cur = cur->next;
     }
 }

Index: fake_exit_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/fake_exit_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fake_exit_data.cxx  10 Sep 2002 19:24:20 -0000      1.3
+++ fake_exit_data.cxx  10 Sep 2002 21:03:33 -0000      1.4
@@ -37,11 +37,11 @@
     {
       XMLhelper::skip_blank(cur);
 
-      if (! strcmp(reinterpret_cast<const char*>(cur->name), "position")) 
+      if (XMLhelper::equal_str(cur->name, "position")) 
        {
          pos = XMLhelper::parse_vector(doc, cur);
        }
-         
+       
       cur = cur->next;
     }
 }

Index: guillotine_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/guillotine_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- guillotine_data.cxx 10 Sep 2002 19:24:20 -0000      1.3
+++ guillotine_data.cxx 10 Sep 2002 21:03:33 -0000      1.4
@@ -44,7 +44,7 @@
     {
       XMLhelper::skip_blank(cur);
 
-      if (! strcmp(reinterpret_cast<const char*>(cur->name), "position")) 
+      if (XMLhelper::equal_str(cur->name, "position")) 
        {
          pos = XMLhelper::parse_vector(doc, cur);
        }

Index: hammer_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hammer_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hammer_data.cxx     10 Sep 2002 19:24:20 -0000      1.3
+++ hammer_data.cxx     10 Sep 2002 21:03:33 -0000      1.4
@@ -37,7 +37,7 @@
     {
       XMLhelper::skip_blank(cur);
 
-      if (strcmp(reinterpret_cast<const char*>(cur->name), "position") == 0) 
+      if (XMLhelper::equal_str(cur->name, "position")) 
        {
          pos = XMLhelper::parse_vector(doc, cur);
        }

Index: laser_exit_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/laser_exit_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- laser_exit_data.cxx 10 Sep 2002 19:24:20 -0000      1.3
+++ laser_exit_data.cxx 10 Sep 2002 21:03:33 -0000      1.4
@@ -37,7 +37,7 @@
     {
       XMLhelper::skip_blank(cur);
 
-      if (strcmp(reinterpret_cast<const char*>(cur->name), "position") == 0) 
+      if (XMLhelper::equal_str(cur->name, "position")) 
        {
          pos = XMLhelper::parse_vector(doc, cur);
        }

Index: smasher_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/smasher_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- smasher_data.cxx    10 Sep 2002 15:36:44 -0000      1.3
+++ smasher_data.cxx    10 Sep 2002 21:03:33 -0000      1.4
@@ -37,7 +37,7 @@
     {
       XMLhelper::skip_blank(cur);
 
-      if (strcmp(reinterpret_cast<const char*>(cur->name), "position") == 0) 
+      if (XMLhelper::equal_str(cur->name, "position")) 
        {
          pos = XMLhelper::parse_vector(doc, cur);
        }

Index: spike_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/spike_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- spike_data.cxx      10 Sep 2002 19:24:20 -0000      1.3
+++ spike_data.cxx      10 Sep 2002 21:03:33 -0000      1.4
@@ -37,7 +37,7 @@
     {
       XMLhelper::skip_blank(cur);
 
-      if (strcmp(reinterpret_cast<const char*>(cur->name), "position") == 0) 
+      if (XMLhelper::equal_str(cur->name, "position")) 
        {
          pos = XMLhelper::parse_vector(doc, cur);
        }

Index: teleporter_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/teleporter_data.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- teleporter_data.cxx 10 Sep 2002 19:24:20 -0000      1.2
+++ teleporter_data.cxx 10 Sep 2002 21:03:33 -0000      1.3
@@ -55,7 +55,7 @@
 {
   cur = cur->children;
   
-  while (cur != NULL)
+  while (cur)
     {
       if (xmlIsBlankNode(cur)) 
        {
@@ -63,17 +63,17 @@
          continue;
        }
 
-      if (strcmp((char*)cur->name, "position") == 0)
+      if (XMLhelper::equal_str(cur->name, "position"))
        {
          pos = XMLhelper::parse_vector (doc, cur);
        }
-      else if (strcmp((char*)cur->name, "target") == 0)
+      else if (XMLhelper::equal_str(cur->name, "target"))
        {
          xmlNodePtr ncur = cur->children;
 
          if (xmlIsBlankNode(ncur)) ncur = ncur->next;
            
-         if (ncur != NULL)
+         if (ncur)
            target_pos = XMLhelper::parse_vector (doc, ncur);
          else
            std::cout << "TeleporterData::create (): <target> is empty" << 
std::endl;