Changeset 5538 in orxonox.OLD

Timestamp:

Nov 11, 2005, 12:30:53 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: more elaborate MultiType, all get*() written

File:

• trunk/src/lib/util/multi_type.cc (modified) (5 diffs)

trunk/src/lib/util/multi_type.cc

@@ -88 +88 @@
   else if (this->type & MT_CHAR) return (this->value.Char == '\0')? false : true;
   else if (this->type & MT_STRING) return (!strncmp(this->value.String, "true", 4) || !strncmp(this->value.String, "TRUE", 4) || !strncmp(this->value.String, "1", 1))? true : false;
+
+  return false;
 }
 
@@ -99 +101 @@
   else if (this->type & MT_FLOAT) return (int) this->value.Float;
   else if (this->type & MT_CHAR) return (int) this->value.Char;
-  else if (this->type & MT_STRING) return 1; //! @TODO
+  else if (this->type & MT_STRING) {
+    char* endPtr = NULL;
+    int result = strtol(this->value.String, &endPtr, 10);
+    if ( endPtr >= this->value.String && endPtr < this->value.String + strlen(this->value.String))
+      return 0;
+    else
+      return result;
+  }
+
+  return 0;
 }
 
@@ -111 +122 @@
   else if (this->type & MT_INT) return (float) this->value.Int;
   else if (this->type & MT_CHAR) return (float) this->value.Char;
-  else if (this->type & MT_STRING) return 1; //! @TODO
+  else if (this->type & MT_STRING) {
+    char* endPtr = NULL;
+    double result = strtod(this->value.String, &endPtr);
+
+    if ( endPtr >= this->value.String && endPtr < this->value.String + strlen(this->value.String))
+      return 0.0f;
+    else
+      return result;
+  }
+
+  return 0.0f;
 }
 
@@ -123 +144 @@
   else if (this->type & MT_INT) return (int) this->value.Int;
   else if (this->type & MT_FLOAT) return (char) this->value.Float;
-  else if (this->type & MT_STRING) return 1; //! @TODO
+  else if (this->type & MT_STRING) return *this->value.String;
+
+  return '\0';
 }
 
@@ -131 +154 @@
   if (this->type & MT_STRING)
     return this->value.String;
-/*  else if (this->type & MT_BOOL) return (this->value.Bool)? 1 : 0;
-  else if (this->type & MT_INT) return 1; //! @TODO
-  else if (this->type & MT_FLOAT) return (int) this->value.Float;
-  else if (this->type & MT_CHAR) return (int) this->value.Char;*/
+  else
+  {
+    if (this->type & MT_BOOL) return (this->value.Bool)? "true" : "false";
+    else if (this->type & MT_CHAR) &this->value.Char;
+
+    char tmpString[128];
+    if (this->storedString != NULL)
+    {
+      delete[] this->storedString;
+      this->storedString = NULL;
+    }
+
+    if (this->type & MT_INT)
+    {
+      sprintf(tmpString, "%d", this->value.Int);
+      this->storedString = new char[strlen (tmpString)+1];
+      strcpy (this->storedString, tmpString);
+      return this->storedString;
+    }
+    if (this->type & MT_FLOAT)
+    {
+      sprintf(tmpString, "%f", this->value.Float);
+      this->storedString = new char[strlen (tmpString)+1];
+      strcpy (this->storedString, tmpString);
+      return this->storedString;
+    }
+  }
+
+  return "";
 }