Changeset 10739 in orxonox.OLD

Timestamp:

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

Author:

rennerc

Message:

die enemy die

Location:

branches/presentation/src/world_entities

Files:

• npcs/actionbox_enemy.cc (modified) (2 diffs)
• npcs/actionbox_enemy.h (modified) (1 diff)
• projectiles/hbolt.cc (modified) (1 diff)
• projectiles/plasma_pulse.cc (modified) (2 diffs)
• space_ships/space_ship.cc (modified) (10 diffs)
• weapons/weapon_manager.cc (modified) (1 diff)

branches/presentation/src/world_entities/npcs/actionbox_enemy.cc

@@ -115 +115 @@
   LoadParam(root, "agility", this, ActionboxEnemy, setAgility);
   LoadParam(root, "acceleration", this, ActionboxEnemy, setAcceleration);
+  LoadParam(root, "active", this, ActionboxEnemy, setActive);
 }
 
 void ActionboxEnemy::tick( float dt )
 {
+  // printf("ABEGROUP: %d\n", this->getOMListNumber());
+  
   if ( escaped )
   {
@@ -375 +378 @@
   toList( OM_DEAD );
 }
+

branches/presentation/src/world_entities/npcs/actionbox_enemy.h

@@ -36 +36 @@
     void setMaxSpeed( float f ){ this->maxSpeed = f; }
     void setAgility( float f ){ this->agility = f; }
+    void setActive( bool b ){ this->isActive = b; }
     
     Quaternion myDir;

branches/presentation/src/world_entities/projectiles/hbolt.cc

@@ -91 +91 @@
   this->halo->setVisibility(true);
   this->origList = this->getOMListNumber();
-  this->toList(OM_ENVIRON);
+  //this->toList(OM_ENVIRON);
   if (unlikely(HBolt::explosionParticles == NULL))
   {

branches/presentation/src/world_entities/projectiles/plasma_pulse.cc

@@ -49 +49 @@
   this->grid->setPulse();
   this->grid->setTexture( "textures/plasma.png");
-  this->grid->toList(OM_ENVIRON);
+  //this->grid->toList(OM_ENVIRON);
 /*
   this->blink = new Blink();
@@ -76 +76 @@
 {
   this->origList = this->getOMListNumber();
-  this->toList(OM_ENVIRON);
+  //this->toList(OM_ENVIRON);
   this->grid->setVisibility(true);
 //   this->blink->setVisibility(true);

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)

branches/presentation/src/world_entities/weapons/weapon_manager.cc

@@ -267 +267 @@
   if ( weapon == NULL )
     return false;
+  
+  weapon->toList( this->parentEntity->getOMListNumber() );
 
   if (unlikely(configID >= WM_MAX_CONFIGS || slotID >= (int)this->slotCount))