Changeset 9987 in orxonox.OLD for branches/playability/src/world_entities
- Timestamp:
- Dec 3, 2006, 3:26:08 PM (18 years ago)
- Location:
- branches/playability/src/world_entities
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/playability/src/world_entities/projectiles/hbolt.cc
r9979 r9987 124 124 if (this->tickLifeCycle(dt)) 125 125 this->deactivate(); 126 127 126 128 } 127 129 … … 144 146 glDisable(GL_LIGHTING); 145 147 148 //glPushMatrix(); 149 //glRotatef(30, 0.0f, 1.0f, 0.0f); 150 146 151 WorldEntity::draw(); 147 152 /* glMatrixMode(GL_MODELVIEW); … … 156 161 glPopMatrix();*/ 157 162 163 /* 164 165 float matrix[4][4]; 166 glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z); 167 this->getAbsDir().matrix (matrix); 168 glMultMatrixf((float*)matrix); 169 glRotatef(30, 0.0, 1.0, 0.0); 170 //glMultMatrixf((float*)matrix); 171 this->getModel()->draw();*/ 172 //glPopMatrix(); 158 173 glPopAttrib(); 159 174 } -
branches/playability/src/world_entities/space_ships/space_ship.cc
r9979 r9987 626 626 } 627 627 else { // shield <= pDamage 628 this->shieldCur = 0;629 this->shieldActive = false; //shield collap tses628 this->shieldCur -=pDamage; 629 this->shieldActive = false; //shield collapses 630 630 pDamage = pDamage - this->shieldCur; 631 631 if( !this->shieldActive) { … … 641 641 if( this->armorCur <= 0) { /* FIXME implement shipcrash*/ } 642 642 } 643 643 644 644 645 void SpaceShip::regen(float time){ … … 671 672 } 672 673 674 673 675 /** 674 676 * Weapon regeneration … … 679 681 float energy = ( this->reactorOutput * this->weaponEnergyShare + this->weaponEnergyRegen) * time; 680 682 Weapon* weapon; 681 for( int i=0; i < this->weaponMan.getSlotCount(); i++)683 for( unsigned int i=0; i < this->weaponMan.getSlotCount(); i++) 682 684 { 683 685 weapon = this->weaponMan.getWeapon(i); … … 692 694 } 693 695 696 694 697 void SpaceShip::enterPlaymode(Playable::Playmode playmode) 695 698 { 696 699 } 697 700 701 698 702 void SpaceShip::movement (float dt) 699 703 { -
branches/playability/src/world_entities/test_entity2.cc
r9979 r9987 117 117 118 118 119 gl Disable(GL_TEXTURE_2D);119 glEnable(GL_TEXTURE_2D); 120 120 this->material->select(); 121 121 … … 244 244 245 245 this->setParent(pl); 246 } 247 248 249 250 251 252 246 247 } 248 249 250 251 252 253
Note: See TracChangeset
for help on using the changeset viewer.