Changeset 8315 in orxonox.OLD for trunk/src

Timestamp:

Jun 11, 2006, 1:01:26 PM (19 years ago)

Author:

bensch

Message:

trunk: fixed a nasty seg-fault, when unloading the WeaponManager

@chrigi: do not doulbe-delete no, you could not have known

Location:

trunk/src

Files:

• util/animation/t_animation.h (modified) (2 diffs)
• world_entities/weapons/weapon_manager.cc (modified) (6 diffs)

trunk/src/util/animation/t_animation.h

@@ -316 +316 @@
 {
   return this->linear(timePassed);
-
 }
 
@@ -338 +337 @@
 float tAnimation<T>::quadratic(float timePassed) const
 {
-  this->linear(timePassed);
+  return this->linear(timePassed);
 }
 

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -22 +22 @@
 #include "weapon.h"
 #include "crosshair.h"
+#include "class_list.h"
 
 #include "playable.h"
@@ -30 +31 @@
 #include "t_animation.h"
 
-using namespace std;
-
 
 /**
@@ -56 +55 @@
   // crosshair being a PNode it must not be deleted (this is because PNodes delete themselves.)
   // rennerc: crosshair seems not to delete itselve
-  delete this->crosshair;
+  if (ClassList::exists(this->crosshair, CL_CROSSHAIR))
+    delete this->crosshair;
 }
 
@@ -101 +101 @@
   this->currentConfigID = 0;
   this->slotCount = 2;
-  this->weaponChange;
+  //this->weaponChange;
 
   // CROSSHAIR INITIALISATION
@@ -141 +141 @@
   LOAD_PARAM_START_CYCLE(root, element);
 
-  Weapon* newWeapon = dynamic_cast<Weapon*>(Factory::fabricate(element));
-  /// @todo implement this !!
-
-
+  BaseObject* object = Factory::fabricate(element);
+  if (object != NULL)
+  {
+    Weapon* newWeapon = dynamic_cast<Weapon*>(object);
+    if (newWeapon == NULL)
+      delete object;
+  }
   LOAD_PARAM_END_CYCLE(element);
 }
@@ -464 +467 @@
 void WeaponManager::draw() const
 {
+  assert(false || "must not be called");
   Weapon* drawWeapon;
   for (int i = 0; i < this->slotCount; i++)