Changeset 5574 in orxonox.OLD for branches/world_entities/src
- Timestamp:
- Nov 15, 2005, 9:29:57 PM (19 years ago)
- Location:
- branches/world_entities/src/world_entities
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/world_entities/src/world_entities/player.cc
r5567 r5574 133 133 134 134 this->weaponMan = new WeaponManager(this); 135 this->weaponMan->setSlotCount( 10);135 this->weaponMan->setSlotCount(6); 136 136 137 137 this->weaponMan->setSlotPosition(0, Vector(-2.6, .1, -3.0)); … … 152 152 this->weaponMan->setSlotPosition(5, Vector(-1.5, -.5, -.5)); 153 153 this->weaponMan->setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0))); 154 155 this->weaponMan->setSlotPosition(6, Vector(-2.0, 0.1, -2.0));156 this->weaponMan->setSlotPosition(7, Vector(-2.0, 0.1, 2.0));157 158 this->weaponMan->setSlotPosition(8, Vector(-2.5, -0.3, -2.0));159 this->weaponMan->setSlotDirection(8, Quaternion(-M_PI, Vector(1,0,0)));160 161 this->weaponMan->setSlotPosition(9, Vector(-2.5, -0.3, 2.0));162 this->weaponMan->setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0))); 154 // 155 // this->weaponMan->setSlotPosition(6, Vector(-2.0, 0.1, -2.0)); 156 // this->weaponMan->setSlotPosition(7, Vector(-2.0, 0.1, 2.0)); 157 // 158 // this->weaponMan->setSlotPosition(8, Vector(-2.5, -0.3, -2.0)); 159 // this->weaponMan->setSlotDirection(8, Quaternion(-M_PI, Vector(1,0,0))); 160 // 161 // this->weaponMan->setSlotPosition(9, Vector(-2.5, -0.3, 2.0)); 162 // this->weaponMan->setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));: 163 163 164 164 } … … 342 342 { 343 343 Weapon* turret = NULL; 344 345 printf("free slot: %d\n", this->weaponMan->getNextFreeSlot(3, WTYPE_TURRET | WTYPE_ALLDIRS)); 346 344 347 if ((float)rand()/RAND_MAX < .1) 345 348 { -
branches/world_entities/src/world_entities/weapons/aim.cc
r5568 r5574 107 107 while (likely(entity != NULL)) 108 108 { 109 if (entity->isA(CL_NPC) && (source->getAbsCoor() - entity->getAbsCoor()).len() < 100)109 if (entity->isA(CL_NPC) && source->getAbsCoor().x < entity->getAbsCoor().x && (source->getAbsCoor() - entity->getAbsCoor()).len() < 100) 110 110 { 111 111 if (this->getParent() != entity) 112 112 { 113 113 this->anim->replay(); 114 this->setParentSoft(entity, 3);114 this->setParentSoft(entity, 5); 115 115 } 116 116 delete iterator; -
branches/world_entities/src/world_entities/weapons/aiming_turret.cc
r5567 r5574 24 24 25 25 #include "null_parent.h" 26 #include "state.h" 27 #include "list.h" 26 28 27 #include "animation3d.h" 29 28 #include "sound_engine.h" … … 67 66 { 68 67 // model will be deleted from WorldEntity-destructor 69 delete this->target;68 // delete this->target; 70 69 } 71 70 -
branches/world_entities/src/world_entities/weapons/weapon_manager.cc
r5567 r5574 472 472 (this->currentSlotConfig[i].capability & capability & WTYPE_ALLKINDS) && 473 473 (this->currentSlotConfig[i].capability & capability & WTYPE_ALLDIRS)) 474 { 475 printf("%d %d %d %d\n", currentSlotConfig[i].capability, capability, WTYPE_ALLKINDS, WTYPE_ALLDIRS); 476 474 477 return i; 475 }476 printf("SHIT\n");478 } 479 } 477 480 return -1; 478 481 } -
branches/world_entities/src/world_entities/weapons/weapon_manager.h
r5567 r5574 92 92 void debug() const; 93 93 94 private:94 // private: 95 95 int getNextFreeSlot(int configID, long capability = WTYPE_ALL); 96 96
Note: See TracChangeset
for help on using the changeset viewer.