Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10742 in orxonox.OLD for branches


Ignore:
Timestamp:
Jun 20, 2007, 8:43:43 PM (17 years ago)
Author:
nicolasc
Message:

moved loadHealth to WE

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

Legend:

Unmodified
Added
Removed
  • branches/presentation/src/world_entities/projectiles/plasma_pulse.cc

    r10740 r10742  
    5151  this->grid->setPulse();
    5252  this->grid->setTexture( "textures/plasma.png");
    53   //this->grid->toList(OM_ENVIRON);
     53  this->grid->toList(OM_ENVIRON);
    5454/*
    5555  this->blink = new Blink();
     
    8282{
    8383  this->origList = this->getOMListNumber();
    84   //this->toList(OM_ENVIRON);
     84  this->toList(OM_ENVIRON);
    8585  this->grid->setVisibility(true);
    8686//   this->blink->setVisibility(true);
  • branches/presentation/src/world_entities/space_ships/space_ship.cc

    r10740 r10742  
    187187  this->weaponMan.addWeaponToSlot(1, 3, "RFCannon");
    188188
    189 /*  this->weaponMan.addWeaponToSlot(0, 4, "NadionLaser");
     189  this->weaponMan.addWeaponToSlot(0, 4, "NadionLaser");
    190190  this->weaponMan.addWeaponToSlot(0, 5, "NadionLaser");
    191191  this->weaponMan.addWeaponToSlot(2, 4, "NadionLaser");
     
    195195  this->weaponMan.addWeaponToSlot(0, 7, "Disruptor");
    196196  this->weaponMan.addWeaponToSlot(3, 6, "Disruptor");
    197   this->weaponMan.addWeaponToSlot(3, 7, "Disruptor");*/
     197  this->weaponMan.addWeaponToSlot(3, 7, "Disruptor");
    198198
    199199
     
    333333  LoadParam(root, "loadShield", this, WorldEntity, loadShield)
    334334  .describe("set shield parameters: current strenght , max strenght, threshhold value (0..1), regeneration rate");
    335   LoadParam(root, "loadHealth", this, WorldEntity, loadHealth)
    336   .describe("set armor/health parameters: current strenght , max strenght");
     335//   LoadParam(root, "loadHealth", this, WorldEntity, loadHealth)
     336//   .describe("set armor/health parameters: current strenght , max strenght");
    337337  LoadParam(root, "loadElectronic", this, WorldEntity, loadElectronic)
    338338  .describe("set electronics parameters: current strenght , max strenght, threshhold value (0..1), regeneration rate");
     
    346346  LoadParam(root, "mouseSenitivity", this, SpaceShip, setMouseSensitivity);
    347347
    348 /*
    349   LOAD_PARAM_START_CYCLE(root, element);
    350   {
    351     LoadParamXML_CYCLE(element, "weaponMan", this->weaponMan, WeaponManager, loadWeapons)
    352     .describe("loads Weapons");
    353   }
    354   LOAD_PARAM_END_CYCLE(element);
    355 
    356   LOAD_PARAM_START_CYCLE(root, element);
    357   {
    358     LoadParamXML_CYCLE(element, "secWeaponMan", this->secWeaponMan, WeaponManager, loadWeapons)
    359     .describe("loads Weapons");
    360   }
    361   LOAD_PARAM_END_CYCLE(element);*/
    362348}
    363349
     
    427413  WorldEntity::draw();
    428414
    429 //   glMatrixMode(GL_MODELVIEW);
    430 //   glPushMatrix();
    431 
    432 //   float matrix[4][4];
    433 //   glTranslatef (this->getAbsCoor ().x-1, this->getAbsCoor ().y-.2, this->getAbsCoor ().z);
    434 //   this->getAbsDir().matrix (matrix);
    435 //   glMultMatrixf((float*)matrix);
    436   //glScalef(2.0, 2.0, 2.0);  // no double rescale
    437 
    438 
    439 //   this->trail->draw();
    440 
    441 //   glTranslatef(0,0,-.5);
    442 //   this->trailL->draw();
    443 
    444 //   glTranslatef(0,0,1);
    445 //   this->trailR->draw();
    446 
    447 //   glPopMatrix();
    448   //this->debug(0);
    449415}
    450416
     
    477443  }
    478444
    479   // Playable::tick(time);
    480 
    481  // this->test->tick(time);
    482445
    483446  // Own Tick Setup, as a different fire routine is used on the weapon manager
     
    528491  this->oldPos    = this->getAbsCoor();
    529492
    530 //FIXME
    531 //   this->trail->tick(time);
    532 //   this->trailL->tick(time);
    533 //   this->trailR->tick(time);
    534 
    535493  if (!this->isTravelDistanceInit)
    536494  {
     
    538496    //this->isTravelDistanceInit = true;
    539497  }
    540 
    541   //orient the spaceship in direction of the mouse
    542   /*
    543   rotQuat = Quaternion::quatSlerp( this->getAbsDir(), mouseDir, 0.5);//fabsf(time)*shipInertia);
    544   if (this->getAbsDir().distance(rotQuat) > 0.00000000000001)
    545     this->setAbsDir( rotQuat);
    546   //this->setAbsDirSoft(mouseDir,5);
    547   */
    548   /*
    549   this->shiftCoor(move);
    550   */
    551 
    552   //   PRINTF(0)("id of %s is: %i\n", this->getName(), this->getOMListNumber());
    553 
    554498}
    555499
  • branches/presentation/src/world_entities/world_entity.cc

    r10721 r10742  
    182182  LoadParam(root, "drawTrack", this, WorldEntity, drawDebugTrack)
    183183      .describe("draws the track for debugging purposes");
    184  
     184
    185185  LoadParam(root, "forwardDamageToParent", this, WorldEntity, setForwardDamageToParent);
    186  
     186
    187187  LoadParam(root, "damageable", this, WorldEntity, setDamageable);
    188188
     
    190190  LoadParamXML(root, "Track", this, WorldEntity, addTrack)
    191191  .describe("creates and adds a track to this WorldEntity");
     192
     193  LoadParam(root, "loadHealth", this, WorldEntity, loadHealth)
     194      .describe("set armor/health parameters: current strenght , max strenght");
    192195}
    193196
Note: See TracChangeset for help on using the changeset viewer.