Changeset 5643 in orxonox.OLD

Timestamp:

Nov 19, 2005, 12:35:48 AM (18 years ago)

Author:

bensch

Message:

orxonx/trunk: some minor multi-type-cleanup… new functionality

Location:

trunk/src/lib/util

Files:

• multi_type.cc (modified) (3 diffs)
• multi_type.h (modified) (1 diff)

trunk/src/lib/util/multi_type.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
@@ -119 +119 @@
   this->type = MT_NULL;
   this->storedString = NULL;
-}
-
-
-
+  this->value.Bool = false;
+}
+
+
+/**
+ * sets the type of this MultiType and resets to the default value
+ * @param type the new Type
+ */
 void MultiType::setType(int type)
 {
-  this->type = (MT_Type)type;
-
   if (this->type != type)
   {
+    this->type = (MT_Type)type;
+
     if (this->type == MT_NULL)
-      this->setString("");
-
-  }
-  /// @todo check if this works...
-
+      this->reset();
+  }
 }
 
@@ -348 +349 @@
 
 /**
+ * Resets the MultiType to default values.
+ */
+void MultiType::reset()
+{
+  switch (this->type)
+  {
+    default:
+      break;
+    case MT_BOOL:
+      this->setBool(false);
+    case MT_INT:
+      this->setInt(0);
+      break;
+    case MT_FLOAT:
+      this->setFloat(0.0f);
+      break;
+    case MT_CHAR:
+      this->setChar('\0');
+      break;
+    case MT_STRING:
+      this->setString("");
+      break;
+  }
+}
+
+/**
  * converts a MT_Type into a String
  * @param type: the MT_Type

trunk/src/lib/util/multi_type.h

@@ -69 +69 @@
     const char* getString();
 
+    void reset();
 
     void debug();