Changeset 3557 in orxonox.OLD for orxonox/branches/levelloader/src/world_entities/environment.cc

Timestamp:

Mar 15, 2005, 10:53:46 AM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Rolling toward bug-free-ness

File:

• orxonox/branches/levelloader/src/world_entities/environment.cc (modified) (5 diffs)

orxonox/branches/levelloader/src/world_entities/environment.cc

@@ -35 +35 @@
 Environment::Environment ( TiXmlElement* root)
 {
+        assert( root != NULL);
+        
         char* temp;
         const char* string = grabParameter( root, "name");
+
         if( string == NULL)
         {
-                PRINTF(1)("Environment is missing a proper 'name'\n");
+                PRINTF0("Environment is missing a proper 'name'\n");
                 string = "Unknown";
-                temp = new char[strlen(string + 2)];
-                strcpy( temp, string);
-                this->setName( temp);
+                this->setName( string);
         }
         else
         {
-                temp = new char[strlen(string + 2)];
-                strcpy( temp, string);
-                this->setName( temp);
+                this->setName( string);
         }
         
@@ -58 +57 @@
         else
         {
-                PRINTF(1)("Environment is missing a proper 'model'\n");
+                PRINTF0("Environment is missing a proper 'model'\n");
                 this->model = new OBJModel( "../data/models/reaplow.obj");
         }
         if( this->model == NULL)
         {
-                PRINTF(1)("Environment model '%s' could not be loaded\n", string);
+                PRINTF0("Environment model '%s' could not be loaded\n", string);
         }
         
@@ -69 +68 @@
         
         string = grabParameter( root, "position");
-        if( string != NULL && sscanf( string, "%f,%f,%f", &(buff[0]), &(buff[1]), &(buff[2])) == 3)
+        if( string != NULL && sscanf( string, "%lf,%lf,%lf", &(buff[0]), &(buff[1]), &(buff[2])) == 3)
         {
                 Vector* es = new Vector( buff[0], buff[1], buff[2]);
@@ -77 +76 @@
         else
         {
-                PRINTF(1)("Environment is missing a proper 'position'\n");
+                PRINTF0("Environment is missing a proper 'position'\n");
                 Vector* es = new Vector();
                 this->setAbsCoor(es);
                 delete es;
         }
-        
+                
         string = grabParameter( root, "orientation");
-        if( string != NULL && sscanf( string, "%f,%f,%f", &(buff[0]), &(buff[1]), &(buff[2])) == 3)
+        if( string != NULL && sscanf( string, "%lf,%lf,%lf", &(buff[0]), &(buff[1]), &(buff[2])) == 3)
         {
                 Quaternion* qs = new Quaternion( buff[0], buff[1], buff[2]);
@@ -92 +91 @@
         else
         {
-                PRINTF(1)("Environment is missing a proper 'orientation'\n");
+                PRINTF0("Environment is missing a proper 'orientation'\n");
         Quaternion* qs = new Quaternion ();
                 this->setAbsDir(qs);