Changeset 10196 in orxonox.OLD for branches/playability/src/world_entities/projectiles/spike_ball.cc

Timestamp:

Jan 8, 2007, 9:46:13 PM (17 years ago)

Author:

nicolasc

Message:

just another upload
GUI seems to work, but there are still some unexplainable segfaults

File:

• branches/playability/src/world_entities/projectiles/spike_ball.cc (modified) (3 diffs)

branches/playability/src/world_entities/projectiles/spike_ball.cc

@@ -32 +32 @@
 
 #include "weapons/weapon.h"
-
+#include "../weapons/weapon_manager.h"
 
 #include "class_id_DEPRECATED.h"
@@ -65 +65 @@
   this->halo->setSize(2, 2);
   this->halo->setTexture("hbolt_halo.png");
-/*
-//   this->weaponMan = new WeaponManager(dynamic_cast<WorldEntity*>(this));
-  this->weaponMan.setParentEntity(this);
+
+  this->weaponMan = new WeaponManager(dynamic_cast<WorldEntity*>(this));
+  this->weaponMan->setParentEntity(this);
 
   Weapon* cannon = new SpikeLauncher();
   cannon->setName( "SpikeLauncher");
-  this->weaponMan.addWeapon(cannon, 0, 0);
-  this->weaponMan.changeWeaponConfig(0);
-*/
+  this->weaponMan->addWeapon(cannon, 0, 0);
+  this->weaponMan->changeWeaponConfig(0);
+
 
 }
@@ -177 +177 @@
 
   if (this->tickLifeCycle(dt)){
-//     this->blow();
+    this->weaponMan->fire();
     this->deactivate();
   }