Changeset 6165

Timestamp:

Nov 26, 2009, 6:06:26 PM (14 years ago)

Author:

landauf

Message:

"Fixed" 'Can't assign NULL identifier' error message and replaced it with a more meaningful message. Please add a munition-name in Rocket.cc soon.

File:

• code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) (1 diff)

code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc

@@ -150 +150 @@
     {
         this->munitionname_ = munitionname;
-        this->munitiontype_ = ClassByString(this->munitionname_);
+        Identifier* identifier = ClassByString(this->munitionname_);
+        if (identifier)
+            this->munitiontype_ = identifier;
+        else
+            COUT(2) << "Warning: No munition class defined in WeaponMode " << this->getName() << std::endl;
         this->updateMunition();
     }