Changeset 4894 in orxonox.OLD for orxonox/trunk

Timestamp:

Jul 19, 2005, 5:27:30 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: seg-fault prevention thanks to the ClassList.
The animations will only be deleted, if they are in the ClassList stored as animations.
PS: commiting this out of the Kdevelop-svn-environment, and it totally rocks.
@patrick: switching payed out

File:

• orxonox/trunk/src/world_entities/weapons/weapon.cc (modified) (7 diffs)

orxonox/trunk/src/world_entities/weapons/weapon.cc

@@ -23 +23 @@
 #include "projectile.h"
 
+#include "class_list.h"
 #include "load_param.h"
 #include "vector.h"
@@ -53 +54 @@
 {
   for (int i = 0; i < WS_STATE_COUNT; i++)
-    if (this->animation[i])
+    if (this->animation[i] && ClassList::exists(animation[i], CL_ANIMATION))  //!< @todo this should check animation3D
       delete this->animation[i];
   for (int i = 0; i < WA_ACTION_COUNT; i++)
@@ -216 +217 @@
   {
     case WA_SHOOT:
-      this->fireW();
+      return this->fireW();
       break;
     case WA_CHARGE:
-      this->chargeW();
+      return this->chargeW();
       break;
     case WA_RELOAD:
-      this->reloadW();
+      return this->reloadW();
       break;
     case WA_DEACTIVATE:
-      this->deactivateW();
+      return this->deactivateW();
       break;
     case WA_ACTIVATE:
-      this->activateW();
-      break;
-  }
-}
-
-
-/**
- *
- * @return
+      return this->activateW();
+      break;
+  }
+}
+
+
+/**
+ * checks and activates the Weapon.
+ * @return true on success.
  */
 bool Weapon::activateW()
@@ -259 +260 @@
 
 /**
- *
- * @return
+ * checks and deactivates the Weapon
+ * @return true on success.
  */
 bool Weapon::deactivateW()
@@ -282 +283 @@
 
 /**
- *
- * @return
+ * checks and charges the Weapon
+ * @return true on success.
  */
 bool Weapon::chargeW()
@@ -310 +311 @@
 
 /**
- *
- * @return
+ * checks and fires the Weapon
+ * @return true on success.
  */
 bool Weapon::fireW()
@@ -339 +340 @@
 
 /**
- *
- * @return
+ * checks and Reloads the Weapon
+ * @return true on success.
  */
 bool Weapon::reloadW()