[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata groundpiece_data.cxx,1.12,1.13

[grumbel]

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

Modified Files:
        groundpiece_data.cxx 
Log Message:
groundtype fix


Index: groundpiece_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/groundpiece_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- groundpiece_data.cxx        18 Feb 2003 17:04:13 -0000      1.12
+++ groundpiece_data.cxx        18 Feb 2003 22:03:39 -0000      1.13
@@ -42,16 +42,15 @@
   reader.read_desc("surface", desc);
 
   std::string gptype_string;
-  if (XMLhelper::get_prop(cur, "type", gptype_string))
+  if (XMLhelper::get_prop(cur, "type", gptype_string) && gptype_string != 
"groundpiece")
     {
-      if (gptype_string != "groundpiece")
-        gptype = Groundtype::string_to_type (gptype_string);
+      gptype = Groundtype::string_to_type (gptype_string);
     }
   else
     {
       std::string type;
-      reader.read_string("type", type);
-      gptype = Groundtype::string_to_type (type);
+      if (reader.read_string("type", type))
+        gptype = Groundtype::string_to_type (type);
     }
 }