Changeset 10484 in orxonox.OLD for branches/playability/src/world_entities/space_ships

Timestamp:

Jan 29, 2007, 5:07:24 PM (18 years ago)

Author:

nicolasc

Message:

tmp xfer

Location:

branches/playability/src/world_entities/space_ships

Files:

• human_scout.cc (added)
• human_scout.h (added)
• space_ship.cc (modified) (5 diffs)

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

@@ -172 +172 @@
   Weapon* cannon = new SwarmLauncher();
   cannon->setName( "SwarmLauncher");
-
+/*
   Weapon* spike = new SpikeThrower();
   spike->setName( "SpikeThrower" );
@@ -181 +181 @@
 
   Weapon* acid1 = new AcidLauncher();
-  acid1->setName( "AcidSplasher" );
+  acid1->setName( "AcidSplasher" );*/
 
 
@@ -192 +192 @@
   this->weaponMan.addWeapon( wpLeft3, 2, 4);
   this->weaponMan.addWeapon( wpRight3, 2, 5);
-/*
+
   this->weaponMan.addWeapon( wpLeft1, 3, 0);
   this->weaponMan.addWeapon( wpRight1, 3, 1);
@@ -201 +201 @@
   this->weaponMan.addWeapon( wpLeft3, 3, 4);
   this->weaponMan.addWeapon( wpRight3, 3, 5);
-*/
-
-  this->weaponMan.addWeapon( acid0, 3, 0);
-  this->weaponMan.addWeapon( acid1, 3, 1);
+
+
+//   this->weaponMan.addWeapon( acid0, 3, 0);
+//   this->weaponMan.addWeapon( acid1, 3, 1);
 
 
   this->secWeaponMan.addWeapon( cannon, 0, 2);
-  this->secWeaponMan.addWeapon( spike, 1, 3);
+//   this->secWeaponMan.addWeapon( spike, 1, 3);
 //   this->secWeaponMan.addWeapon( acid0, 2, 2);
 //   this->secWeaponMan.addWeapon( acid1, 2, 3);
 
 
-  this->weaponMan.changeWeaponConfig(3);
-  this->secWeaponMan.changeWeaponConfig(1);
+  this->weaponMan.changeWeaponConfig(0);
+  this->secWeaponMan.changeWeaponConfig(0);
 
   curWeaponPrimary    = 0;
-  curWeaponSecondary  = 1;
+  curWeaponSecondary  = 0;
 
   Playable::weaponConfigChanged();
@@ -244 +244 @@
 
 
-/*  this->loadModel("models/ships/mantawing.obj");*/
+ this->loadModel("models/spaceships/human_spaceship_fighter.obj", .25);
   //this->setVisibiliy(false);