Changeset 7264 in orxonox.OLD for branches/shared_lib/src/world_entities/space_ships

Timestamp:

Apr 2, 2006, 4:51:19 PM (19 years ago)

Author:

bensch

Message:

shared_lib: compile again

Location:

branches/shared_lib/src/world_entities/space_ships

Files:

• helicopter.cc (modified) (2 diffs)
• hover.cc (modified) (2 diffs)
• space_ship.cc (modified) (1 diff)
• turbine_hover.cc (modified) (2 diffs)

branches/shared_lib/src/world_entities/space_ships/helicopter.cc

@@ -20 +20 @@
 
 #include "weapons/weapon_manager.h"
-#include "weapons/test_gun.h"
-#include "weapons/turret.h"
-#include "weapons/cannon.h"
 
 #include "util/loading/factory.h"
@@ -82 +79 @@
 
   //weapons:
-  Weapon* wpRight = new TestGun(0);
-  wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(1);
-  wpLeft->setName("testGun Left");
+//  Weapon* wpRight = new TestGun(0);
+//  wpRight->setName("testGun Right");
+//  Weapon* wpLeft = new TestGun(1);
+//  wpLeft->setName("testGun Left");
   Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_CANNON));
 
   cannon->setName("BFG");
 
-  this->addWeapon(wpLeft, 1, 0);
-  this->addWeapon(wpRight,1 ,1);
+//  this->addWeapon(wpLeft, 1, 0);
+//  this->addWeapon(wpRight,1 ,1);
   this->addWeapon(cannon, 0, 6);
 

branches/shared_lib/src/world_entities/space_ships/hover.cc

@@ -20 +20 @@
 
 #include "weapons/weapon_manager.h"
-#include "weapons/test_gun.h"
-#include "weapons/turret.h"
-#include "weapons/cannon.h"
 
 #include "util/loading/factory.h"
@@ -74 +71 @@
 
   //weapons:
-  Weapon* wpRight = new TestGun(0);
-  wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(1);
-  wpLeft->setName("testGun Left");
-  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
-
-  cannon->setName("BFG");
-
-  this->addWeapon(wpLeft, 1, 0);
-  this->addWeapon(wpRight,1 ,1);
-  this->addWeapon(cannon, 0, 2);
+//  Weapon* wpRight = new TestGun(0);
+//  wpRight->setName("testGun Right");
+//  Weapon* wpLeft = new TestGun(1);
+//  wpLeft->setName("testGun Left");
+//  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
+
+//  cannon->setName("BFG");
+
+//  this->addWeapon(wpLeft, 1, 0);
+//  this->addWeapon(wpRight,1 ,1);
+//  this->addWeapon(cannon, 0, 2);
 
   this->getWeaponManager()->changeWeaponConfig(1);

branches/shared_lib/src/world_entities/space_ships/space_ship.cc

@@ -124 +124 @@
 
   //weapons:
-  Weapon* wpRight = new TestGun(0);
-  wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(1);
-  wpLeft->setName("testGun Left");
+  //Weapon* wpRight = dynamic_cast<Weapon*>(Factory::fabricate("TestGun"));
+  //wpRight->setName("testGun Right");
+  //Weapon* wpLeft = dynamic_cast<Weapon*>(Factory::fabricate("TestGun"));
+  //wpLeft->setName("testGun Left");
   //Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_CANNON));
 
   //cannon->setName("BFG");
 
-  this->addWeapon(wpLeft, 1, 0);
-  this->addWeapon(wpRight,1 ,1);
+  //this->addWeapon(wpLeft, 1, 0);
+  //this->addWeapon(wpRight,1 ,1);
   //this->addWeapon(cannon, 0, 6);
 

branches/shared_lib/src/world_entities/space_ships/turbine_hover.cc

@@ -20 +20 @@
 
 #include "weapons/weapon_manager.h"
-#include "weapons/test_gun.h"
-#include "weapons/turret.h"
-#include "weapons/cannon.h"
 
 #include "util/loading/factory.h"
@@ -76 +73 @@
 
   //weapons:
-  Weapon* wpRight = new TestGun(0);
-  wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(1);
-  wpLeft->setName("testGun Left");
+//  Weapon* wpRight = new TestGun(0);
+//  wpRight->setName("testGun Right");
+//  Weapon* wpLeft = new TestGun(1);
+//  wpLeft->setName("testGun Left");
   //Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
 
   //  cannon->setName("BFG");
 
-  this->addWeapon(wpLeft, 1, 0);
-  this->addWeapon(wpRight,1 ,1);
+//  this->addWeapon(wpLeft, 1, 0);
+//  this->addWeapon(wpRight,1 ,1);
   //this->addWeapon(cannon, 0, 2);