[Pingus-CVS] CVS: Games/Pingus/src/worldobjs conveyor_belt.cxx,1.10,1.11 ice_block.cxx,1.11,1.12 info_box.cxx,1.10,1.11 switch_door.cxx,1.11,1.12

[torangan]

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

Modified Files:
        conveyor_belt.cxx ice_block.cxx info_box.cxx switch_door.cxx 
Log Message:
added and applied to XMLhelper methods


Index: conveyor_belt.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/conveyor_belt.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- conveyor_belt.cxx   10 Sep 2002 19:24:19 -0000      1.10
+++ conveyor_belt.cxx   10 Sep 2002 21:03:33 -0000      1.11
@@ -38,22 +38,22 @@
 {
   cur = cur->children;
   
-  while (cur != NULL)
+  while (cur)
     {
       if (xmlIsBlankNode(cur)) 
        {
          cur = cur->next;
          continue;
        }
-      else if (strcmp((char*)cur->name, "position") == 0)
+      else if (XMLhelper::equal_str(cur->name, "position"))
        {
          pos = XMLhelper::parse_vector (doc, cur);
        }
-      else if (strcmp((char*)cur->name, "width") == 0)
+      else if (XMLhelper::equal_str(cur->name, "width"))
        {
          width = XMLhelper::parse_int (doc, cur);
        }
-      else if (strcmp((char*)cur->name, "speed") == 0)
+      else if (XMLhelper::equal_str(cur->name, "speed"))
        {
          speed = XMLhelper::parse_int (doc, cur);
        }

Index: ice_block.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ice_block.cxx       10 Sep 2002 14:33:07 -0000      1.11
+++ ice_block.cxx       10 Sep 2002 21:03:33 -0000      1.12
@@ -47,18 +47,18 @@
 {
   cur = cur->children;
   
-  while (cur != NULL)
+  while (cur)
     {
       if (xmlIsBlankNode(cur)) 
        {
          cur = cur->next;
          continue;
        }
-      else if (strcmp((char*)cur->name, "position") == 0)
+      else if (XMLhelper::equal_str(cur->name, "position"))
        {
          pos = XMLhelper::parse_vector (doc, cur);
        }
-      else if (strcmp((char*)cur->name, "width") == 0)
+      else if (XMLhelper::equal_str(cur->name, "width"))
        {
          width = XMLhelper::parse_int (doc, cur);
        }

Index: info_box.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/info_box.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- info_box.cxx        10 Sep 2002 19:24:19 -0000      1.10
+++ info_box.cxx        10 Sep 2002 21:03:33 -0000      1.11
@@ -56,18 +56,18 @@
 {
   cur = cur->children;
   
-  while (cur != NULL)
+  while (cur)
     {
       if (xmlIsBlankNode(cur)) 
        {
          cur = cur->next;
          continue;
        }
-      else if (strcmp((char*)cur->name, "position") == 0)
+      else if (XMLhelper::equal_str(cur->name, "position"))
        {
          pos = XMLhelper::parse_vector (doc, cur);
        }
-      else if (strcmp((char*)cur->name, "info-text") == 0)
+      else if (XMLhelper::equal_str(cur->name, "info-text"))
        {
          info_text = XMLhelper::parse_string (doc, cur);
        }

Index: switch_door.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/switch_door.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- switch_door.cxx     10 Sep 2002 19:24:19 -0000      1.11
+++ switch_door.cxx     10 Sep 2002 21:03:33 -0000      1.12
@@ -37,25 +37,25 @@
 {
   cur = cur->children;
   
-  while (cur != NULL)
+  while (cur)
     {
       if (xmlIsBlankNode(cur)) {
        cur = cur->next;
        continue;
       }
       
-      if (strcmp((char*)cur->name, "switch") == 0)
+      if (XMLhelper::equal_str(cur->name, "switch"))
        {
          xmlNodePtr subcur = cur->children;
   
-         while (subcur != NULL)
+         while (subcur)
            {
              if (xmlIsBlankNode(subcur)) {
                subcur = subcur->next;
                continue;
              }
              
-             if (strcmp((char*)subcur->name, "position") == 0)
+             if (XMLhelper::equal_str(subcur->name, "position"))
                {
                  switch_pos = XMLhelper::parse_vector (doc, subcur);
                }
@@ -65,22 +65,22 @@
              subcur = subcur->next;
            }
        }
-      else if (strcmp((char*)cur->name, "door") == 0)
+      else if (XMLhelper::equal_str(cur->name, "door"))
        {
          xmlNodePtr subcur = cur->children;
 
-         while (subcur != NULL)
+         while (subcur)
            {
              if (xmlIsBlankNode(subcur)) {
                subcur = subcur->next;
                continue;
              }
              
-             if (strcmp((char*)subcur->name, "position") == 0)
+             if (XMLhelper::equal_str(subcur->name, "position"))
                {
                  door_pos = XMLhelper::parse_vector (doc, subcur);
                }
-             else if (strcmp((char*)subcur->name, "height") == 0)
+             else if (XMLhelper::equal_str(subcur->name, "height"))
                {
                  door_height = XMLhelper::parse_int (doc, subcur);
                }