Changeset 10332 in orxonox.OLD for branches/playability/src/world_entities/space_ships/space_ship.cc

Timestamp:

Jan 24, 2007, 3:23:23 PM (18 years ago)

Author:

muellmic

Message:

in this version the acid splasher isn't loaded anymore. it then doesn't crash when shooting.

File:

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

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

@@ -179 +179 @@
 //  spike2->setName( "SpikeLauncher" );
 
+  /*
   Weapon* acid0 = new AcidLauncher();
   acid0->setName( "AcidSplasher" );
@@ -184 +185 @@
   Weapon* acid1 = new AcidLauncher();
   acid1->setName( "AcidSplasher" );
+  */
 
   this->weaponMan.addWeapon( wpLeft1, 0, 0);
@@ -203 +205 @@
   this->weaponMan.addWeapon( wpRight3, 3, 5);
 
+  /*
   this->weaponMan.addWeapon( acid0, 0, 6);
   this->weaponMan.addWeapon( acid1, 0, 7);
+  */
 
   this->secWeaponMan.addWeapon( cannon, 0, 2);
@@ -368 +372 @@
   //this->travelDistancePlus = Vector2D(38.0, 43.0);
   //this->travelDistanceMinus = Vector2D(-38.0, -43.0);
-  this->travelDistancePlus = Vector2D(0,0);
-  this->travelDistancePlus = Vector2D(0,0);
+  this->travelDistancePlus = Vector2D(50,50);
+  this->travelDistanceMinus = Vector2D(-50,-50);
   this->isTravelDistanceInit = false;
   this->actionWidthPercentage = 1;
@@ -419 +423 @@
   LoadParam(root, "cameraDistance", this, SpaceShip, setCameraDistance);
   LoadParam(root, "cameraFovy", this, SpaceShip, setCameraFovy);
-  LoadParam(root, "actionWidthPercentage", this, SpaceShip, setActionWidthPercentage);
+  //LoadParam(root, "actionWidthPercentage", this, SpaceShip, setActionWidthPercentage);
 
   State::getCamera()->setViewMode(Camera::ViewTop);
@@ -858 +862 @@
         this->travelNode->setAbsCoor(this->getAbsCoor());
         this->travelNode->updateNode(0.01f);
-        this->isTravelDistanceInit = false;
-        
+
+        if (this->hasPlayer())
+          this->isTravelDistanceInit = false;
+
         if(this->entityTrack)
            this->travelNode->setParent(this->entityTrack->getTrackNode());
@@ -1166 +1172 @@
   //State::getPlayer()->hud().setOverlayPercentage(100-i);
   //updateTravelDistance();
-  this->isTravelDistanceInit = false;
+  if (this->hasPlayer())
+    this->isTravelDistanceInit = false;
 };