Changeset 10687 in orxonox.OLD for branches/vs-enhencements/src
- Timestamp:
- Jun 12, 2007, 5:59:36 PM (18 years ago)
- Location:
- branches/vs-enhencements/src/world_entities
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc
r10686 r10687 165 165 this->secWeaponMan.setSlotCount(6); 166 166 167 //this->weaponMan.createWeaponSlot(0, 3.270, 1.028, .155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);168 //this->weaponMan.createWeaponSlot(1, 3.270, 1.028, -.155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);169 //this->weaponMan.createWeaponSlot(2, 4.385, .063, .876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);170 //this->weaponMan.createWeaponSlot(3, 4.385, -.063, -.876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);171 //this->weaponMan.createWeaponSlot(4, 1.635, -.612, 2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);172 //this->weaponMan.createWeaponSlot(5, 1.536, -.612, -2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);173 //this->weaponMan.createWeaponSlot(6, 1.536, -.612, 3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);174 //this->weaponMan.createWeaponSlot(7, 1.536, -.612, -3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);167 this->weaponMan.createWeaponSlot(0, 3.270, 1.028, .155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL); 168 this->weaponMan.createWeaponSlot(1, 3.270, 1.028, -.155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL); 169 this->weaponMan.createWeaponSlot(2, 4.385, .063, .876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL); 170 this->weaponMan.createWeaponSlot(3, 4.385, -.063, -.876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL); 171 this->weaponMan.createWeaponSlot(4, 1.635, -.612, 2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL); 172 this->weaponMan.createWeaponSlot(5, 1.536, -.612, -2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL); 173 this->weaponMan.createWeaponSlot(6, 1.536, -.612, 3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL); 174 this->weaponMan.createWeaponSlot(7, 1.536, -.612, -3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL); 175 175 176 176 … … 211 211 Playable::weaponConfigChanged(); 212 212 213 this->bInit = false;213 // this->bInit = false; 214 214 215 215 loadEnergyShare(.3,.3,.4); … … 297 297 298 298 299 dynamic_cast<WorldEntity*>(this)->createHealthWidget();300 dynamic_cast<WorldEntity*>(this)->createShieldWidget();301 dynamic_cast<WorldEntity*>(this)->createElectronicWidget();299 (this)->createHealthWidget(); 300 (this)->createShieldWidget(); 301 (this)->createElectronicWidget(); 302 302 303 303 if ( this->hasPlayer() ){ … … 399 399 void SpaceShip::postSpawn () 400 400 { 401 // std::map<int, MountPoint*>::iterator it = this->mountPointMap.begin(); 402 // for( ;it != this->mountPointMap.end(); it++) 403 // { 404 // WeaponSlot* ws = dynamic_cast<WeaponSlot*>((*it).second->getMount()); 405 // if( ws != NULL && ws->isA(WeaponSlot::staticClassID())) 406 // { 407 // int slot = ws->getWeaponSlot(); 408 // // int side = ws->getWeaponSide(); //FIXME / REMOVE: is not used// HACK needed for some weapons (left/right) 409 // this->getWeaponManager().setSlotPosition(slot, (*it).second->getCenter()); 410 // this->getWeaponManager().setSlotDirection(slot, ws->getRelDir()); 411 // // PRINTF(0)("setting slot %i\n", slot); 412 // // (*it).second->getCenter().debug(); 413 // } 414 // } 415 401 416 if(this->hasPlayer()) 402 417 Playable::postSpawn(); … … 445 460 } 446 461 462 463 464 465 447 466 /** 448 467 * the function called for each passing timeSnap … … 451 470 void SpaceShip::tick (float time) 452 471 { 453 472 /* 454 473 if( !this->bInit) 455 474 { … … 470 489 } 471 490 this->bInit = true; 472 } 491 }*/ 473 492 474 493 // Playable::tick(time); -
branches/vs-enhencements/src/world_entities/space_ships/space_ship.h
r10672 r10687 166 166 bool bSecFire; //!< second fire button pressed 167 167 168 bool bInit; //!< set true, if MP have been loaded168 // bool bInit; //!< set true, if MP have been loaded 169 169 170 170 /* -
branches/vs-enhencements/src/world_entities/weapons/weapon_slot.h
r10684 r10687 9 9 #include "p_node.h" 10 10 #include "weapon.h" 11 #include "weapon_manager.h" 11 // #include "weapon_manager.h" 12 13 #define WM_MAX_CONFIGS 4 //!< The maximum number of predefined Configurations 12 14 13 15 class Weapon;
Note: See TracChangeset
for help on using the changeset viewer.