Changeset 10739 in orxonox.OLD for branches/presentation/src/world_entities/space_ships

Timestamp:

Jun 20, 2007, 7:47:40 PM (18 years ago)

Author:

rennerc

Message:

die enemy die

File:

• branches/presentation/src/world_entities/space_ships/space_ship.cc (modified) (10 diffs)

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

@@ -75 +75 @@
 #include "track/action_box.h"
 
+
+#include "weapons/aiming_system.h"
 
 ObjectListDefinition(SpaceShip);
@@ -141 +143 @@
   if (root != NULL)
     this->loadParams(root);
+  
+  printf("SSGROUP: %d\n", this->getOMListNumber());
 
 }
@@ -150 +154 @@
 void SpaceShip::init()
 {
-
-  srand(time(0));   //initialize Random Nomber Generator
+  toList( OM_GROUP_01 );
 
   //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
@@ -175 +178 @@
 
 
-  this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
+ /* this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
   this->weaponMan.addWeaponToSlot(0, 1, "RFCannon");
   this->weaponMan.addWeaponToSlot(0, 2, "RFCannon");
@@ -182 +185 @@
   this->weaponMan.addWeaponToSlot(1, 1, "RFCannon");
   this->weaponMan.addWeaponToSlot(1, 2, "RFCannon");
-  this->weaponMan.addWeaponToSlot(1, 3, "RFCannon");
-
-  this->weaponMan.addWeaponToSlot(0, 4, "NadionLaser");
+  this->weaponMan.addWeaponToSlot(1, 3, "RFCannon");*/
+
+/*  this->weaponMan.addWeaponToSlot(0, 4, "NadionLaser");
   this->weaponMan.addWeaponToSlot(0, 5, "NadionLaser");
   this->weaponMan.addWeaponToSlot(2, 4, "NadionLaser");
-  this->weaponMan.addWeaponToSlot(2, 5, "NadionLaser");
+  this->weaponMan.addWeaponToSlot(2, 5, "NadionLaser");*/
 
   this->weaponMan.addWeaponToSlot(0, 6, "Disruptor");
@@ -292 +295 @@
 
 
-  this->toList(OM_GROUP_00);
+  //this->toList(OM_GROUP_00);
 
 
@@ -380 +383 @@
 {
   this->secWeaponMan.showCrosshair();
-  this->toList( OM_GROUP_01 );
+  //this->toList( OM_GROUP_01 );
   State::getPlayer()->hud().setRadarCenterNode(this->travelNode);
   State::getPlayer()->hud().setOverlayActive(true);
@@ -388 +391 @@
 {
   this->secWeaponMan.hideCrosshair();
-  this->toList( OM_GROUP_00);
+  //this->toList( OM_GROUP_00);
   State::getPlayer()->hud().setOverlayActive(false);
   State::getCamera()->setEventHandling(true);
@@ -419 +422 @@
 void SpaceShip::draw () const
 {
- // if( this->entityTrack != NULL && this->isDrawTrack())
+ if( this->entityTrack != NULL /*&& this->isDrawTrack()*/)
     this->entityTrack->drawGraph();
 
@@ -452 +455 @@
 void SpaceShip::tick (float time)
 {
+ // printf("SSGROUP: %d\n", this->getOMListNumber());
 
   if( !this->bInit)