Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10739 in orxonox.OLD for branches/presentation


Ignore:
Timestamp:
Jun 20, 2007, 7:47:40 PM (17 years ago)
Author:
rennerc
Message:

die enemy die

Location:
branches/presentation/src/world_entities
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r10734 r10739  
    115115  LoadParam(root, "agility", this, ActionboxEnemy, setAgility);
    116116  LoadParam(root, "acceleration", this, ActionboxEnemy, setAcceleration);
     117  LoadParam(root, "active", this, ActionboxEnemy, setActive);
    117118}
    118119
    119120void ActionboxEnemy::tick( float dt )
    120121{
     122  // printf("ABEGROUP: %d\n", this->getOMListNumber());
     123 
    121124  if ( escaped )
    122125  {
    … …  
    375378  toList( OM_DEAD );
    376379}
     380

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

    r10727 r10739  
    3636    void setMaxSpeed( float f ){ this->maxSpeed = f; }
    3737    void setAgility( float f ){ this->agility = f; }
     38    void setActive( bool b ){ this->isActive = b; }
    3839   
    3940    Quaternion myDir;

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

    r10737 r10739  
    9191  this->halo->setVisibility(true);
    9292  this->origList = this->getOMListNumber();
    93   this->toList(OM_ENVIRON);
     93  //this->toList(OM_ENVIRON);
    9494  if (unlikely(HBolt::explosionParticles == NULL))
    9595  {

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

    r10737 r10739  
    4949  this->grid->setPulse();
    5050  this->grid->setTexture( "textures/plasma.png");
    51   this->grid->toList(OM_ENVIRON);
     51  //this->grid->toList(OM_ENVIRON);
    5252/*
    5353  this->blink = new Blink();
    … …  
    7676{
    7777  this->origList = this->getOMListNumber();
    78   this->toList(OM_ENVIRON);
     78  //this->toList(OM_ENVIRON);
    7979  this->grid->setVisibility(true);
    8080//   this->blink->setVisibility(true);

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

    r10734 r10739  
    7575#include "track/action_box.h"
    7676
     77
     78#include "weapons/aiming_system.h"
    7779
    7880ObjectListDefinition(SpaceShip);
    … …  
    141143  if (root != NULL)
    142144    this->loadParams(root);
     145 
     146  printf("SSGROUP: %d\n", this->getOMListNumber());
    143147
    144148}
    … …  
    150154void SpaceShip::init()
    151155{
    152 
    153   srand(time(0));   //initialize Random Nomber Generator
     156  toList( OM_GROUP_01 );
    154157
    155158  //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
    … …  
    175178
    176179
    177   this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
     180 /* this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
    178181  this->weaponMan.addWeaponToSlot(0, 1, "RFCannon");
    179182  this->weaponMan.addWeaponToSlot(0, 2, "RFCannon");
    … …  
    182185  this->weaponMan.addWeaponToSlot(1, 1, "RFCannon");
    183186  this->weaponMan.addWeaponToSlot(1, 2, "RFCannon");
    184   this->weaponMan.addWeaponToSlot(1, 3, "RFCannon");
    185 
    186   this->weaponMan.addWeaponToSlot(0, 4, "NadionLaser");
     187  this->weaponMan.addWeaponToSlot(1, 3, "RFCannon");*/
     188
     189/*  this->weaponMan.addWeaponToSlot(0, 4, "NadionLaser");
    187190  this->weaponMan.addWeaponToSlot(0, 5, "NadionLaser");
    188191  this->weaponMan.addWeaponToSlot(2, 4, "NadionLaser");
    189   this->weaponMan.addWeaponToSlot(2, 5, "NadionLaser");
     192  this->weaponMan.addWeaponToSlot(2, 5, "NadionLaser");*/
    190193
    191194  this->weaponMan.addWeaponToSlot(0, 6, "Disruptor");
    … …  
    292295
    293296
    294   this->toList(OM_GROUP_00);
     297  //this->toList(OM_GROUP_00);
    295298
    296299
    … …  
    380383{
    381384  this->secWeaponMan.showCrosshair();
    382   this->toList( OM_GROUP_01 );
     385  //this->toList( OM_GROUP_01 );
    383386  State::getPlayer()->hud().setRadarCenterNode(this->travelNode);
    384387  State::getPlayer()->hud().setOverlayActive(true);
    … …  
    388391{
    389392  this->secWeaponMan.hideCrosshair();
    390   this->toList( OM_GROUP_00);
     393  //this->toList( OM_GROUP_00);
    391394  State::getPlayer()->hud().setOverlayActive(false);
    392395  State::getCamera()->setEventHandling(true);
    … …  
    419422void SpaceShip::draw () const
    420423{
    421  // if( this->entityTrack != NULL && this->isDrawTrack())
     424 if( this->entityTrack != NULL /*&& this->isDrawTrack()*/)
    422425    this->entityTrack->drawGraph();
    423426
    … …  
    452455void SpaceShip::tick (float time)
    453456{
     457 // printf("SSGROUP: %d\n", this->getOMListNumber());
    454458
    455459  if( !this->bInit)

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

    r10715 r10739  
    267267  if ( weapon == NULL )
    268268    return false;
     269 
     270  weapon->toList( this->parentEntity->getOMListNumber() );
    269271
    270272  if (unlikely(configID >= WM_MAX_CONFIGS || slotID >= (int)this->slotCount))
Note: See TracChangeset for help on using the changeset viewer.