Changeset 2180 for code/branches/overlay/src/util

Timestamp:

Nov 12, 2008, 12:55:14 AM (16 years ago)

Author:

rgrieder

Message:

Bugfix in MultiType::convert(MT_null): it now clears the MT, so does reset(). However resetValue() only resets the value to the default zero value.
This bug caused command arguments like "Stats" to get parsed to "0.0". Wherever that Vector2 came from..

Location:

code/branches/overlay/src/util

Files:

• MultiType.cc (modified) (1 diff)
• MultiType.h (modified) (1 diff)

code/branches/overlay/src/util/MultiType.cc

@@ -43 +43 @@
     switch (type)
     {
+        case MT_null:
+            this->reset(); return true;
         case MT_char:
             return this->convert<char>(); break;

code/branches/overlay/src/util/MultiType.h

@@ -301 +301 @@
 
         /** @brief Current content gets deleted. New type is MT_null */
-        inline void                       reset()                         { if (this->value_) this->value_->reset(); }
-
-        template <typename T> inline void setType()                       { this->assignValue(T());                            } /** @brief Resets the value and changes the internal type to T. */
-        inline void                       setType(const MultiType& other) { this->setType(other.getType());                    } /** @brief Resets the value and changes the internal type to the type of the other MultiType. */
-        inline void                       setType(MT_Type type)           { this->reset(); this->convert(type); this->reset(); } /** @brief Resets the value and changes the internal type to the given type. */
+        inline void                       reset()                         { if (this->value_) delete this->value_; this->value_ = 0; }
+        /** @brief Current content gets overridden with default zero value */
+        inline void                       resetValue()                    { if (this->value_) this->value_->reset(); }
+
+        template <typename T> inline void setType()                       { this->assignValue(T());                                 } /** @brief Resets the value and changes the internal type to T. */
+        inline void                       setType(const MultiType& other) { this->setType(other.getType());                         } /** @brief Resets the value and changes the internal type to the type of the other MultiType. */
+        inline void                       setType(MT_Type type)           { this->reset(); this->convert(type); this->resetValue(); } /** @brief Resets the value and changes the internal type to the given type. */
 
         /** @brief Returns the current type. */