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

Timestamp:

Jan 21, 2007, 6:23:04 PM (18 years ago)

Author:

nicolasc

Message:

Fixed Wooblegrid, transparancy problem (acid splashes) still exists

File:

• branches/playability/src/world_entities/space_ships/space_ship.cc (modified) (6 diffs)

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

@@ -29 +29 @@
 #include "weapons/spike_launcher.h"
 #include "weapons/spike_thrower.h"
+#include "weapons/acid_launcher.h"
 #include "weapons/boomerang_gun.h"
 #include "weapons/turret.h"
@@ -178 +179 @@
 //  spike2->setName( "SpikeLauncher" );
 
+  Weapon* acid0 = new AcidLauncher();
+  acid0->setName( "AcidSplasher" );
+
+  Weapon* acid1 = new AcidLauncher();
+  acid1->setName( "AcidSplasher" );
+
   this->weaponMan.addWeapon( wpLeft1, 0, 0);
   this->weaponMan.addWeapon( wpRight1, 0, 1);
@@ -196 +203 @@
   this->weaponMan.addWeapon( wpRight3, 3, 5);
 
-  this->secWeaponMan.addWeapon( cannon, 0, 0);
-  this->secWeaponMan.addWeapon( spike, 1, 1);
-//  this->secWeaponMan.addWeapon( spike2, 2, 2);
-
-
-  this->weaponMan.changeWeaponConfig(3);
+  this->weaponMan.addWeapon( acid0, 0, 6);
+  this->weaponMan.addWeapon( acid1, 0, 7);
+
+  this->secWeaponMan.addWeapon( cannon, 0, 2);
+  this->secWeaponMan.addWeapon( spike, 1, 3);
+//   this->secWeaponMan.addWeapon( acid0, 2, 2);
+//   this->secWeaponMan.addWeapon( acid1, 2, 3);
+
+
+  this->weaponMan.changeWeaponConfig(0);
   this->secWeaponMan.changeWeaponConfig(1);
 
@@ -236 +247 @@
 
   bForward = bBackward = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = bFire = bSecFire = false;
-  
 
   this->setHealthMax(shieldMax);
@@ -288 +298 @@
   this->secWeaponMan.setParentEntity( this);
 
-  this->weaponMan.setSlotCount(6);
+  this->weaponMan.setSlotCount(8);
 
   this->weaponMan.setSlotPosition(0, Vector(0.0, 0, -3.0));
@@ -307 +317 @@
   this->weaponMan.setSlotPosition(5, Vector(1.5, 0, -.5));
   this->weaponMan.setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
+
+  this->weaponMan.setSlotPosition(6, Vector(0.5, 0, 2.5));
+  this->weaponMan.setSlotDirection(6, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
+
+  this->weaponMan.setSlotPosition(7, Vector(0.5, 0, -2.5));
+  this->weaponMan.setSlotDirection(7, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
 
   this->secWeaponMan.setSlotCount(6);