Changeset 5041 in orxonox.OLD for orxonox/trunk/src/world_entities
- Timestamp:
- Aug 16, 2005, 7:56:48 PM (19 years ago)
- Location:
- orxonox/trunk/src/world_entities
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/world_entities/player.cc
r5037 r5041 98 98 this->weaponMan->addWeapon(turret, 2, 2); 99 99 this->weaponMan->addWeapon(turret2, 2, 3); 100 this->weaponMan->addWeapon(wpLeft, 3, 0); 101 this->weaponMan->addWeapon(wpRight,3 ,1); 100 //this->weaponMan->addWeapon(turret, 3, 0); 102 101 103 102 this->weaponMan->changeWeaponConfig(0); … … 152 151 153 152 } 154 155 153 156 154 /** -
orxonox/trunk/src/world_entities/weapons/test_gun.cc
r5000 r5041 132 132 133 133 this->setProjectile(CL_TEST_BULLET); 134 //this->getProjectileFactory()->prepare(100);134 this->getProjectileFactory()->prepare(20); 135 135 } 136 136 -
orxonox/trunk/src/world_entities/weapons/weapon.cc
r4979 r5041 191 191 else 192 192 { 193 PRINTF( 4)("Failed to load sound %s to %s.\n.", soundFile, actionToChar(action));193 PRINTF(2)("Failed to load sound %s to %s.\n.", soundFile, actionToChar(action)); 194 194 } 195 195 } … … 197 197 this->soundBuffers[action] = NULL; 198 198 } 199 200 199 201 200 /** … … 228 227 } 229 228 230 231 229 ///////////////// 232 230 // EXECUTION // … … 246 244 if (this->requestedAction != WA_NONE) 247 245 return; 248 printf("next action will be %s in %f seconds\n", actionToChar(action), this->stateDuration);246 PRINTF(5)("next action will be %s in %f seconds\n", actionToChar(action), this->stateDuration); 249 247 this->requestedAction = action; 250 248 } … … 404 402 } 405 403 406 407 404 /** 408 405 * checks and Reloads the Weapon … … 428 425 this->energyLoaded += this->energy; 429 426 this->energy = 0.0; 430 PRINT( 3)("Energy empty");431 } 432 else 433 { 434 PRINTF( 3)("Loaded %f energy into the Guns Buffer\n", chargeSize);427 PRINT(5)("Energy depleted\n"); 428 } 429 else 430 { 431 PRINTF(5)("Loaded %f energy into the Guns Buffer\n", chargeSize); 435 432 this->energyLoaded += chargeSize; 436 433 this->energy -= chargeSize; … … 446 443 inline void Weapon::enterState(WeaponState state) 447 444 { 448 PRINTF( 3)("ENTERING STATE %s\n", stateToChar(state));445 PRINTF(4)("ENTERING STATE %s\n", stateToChar(state)); 449 446 // playing animation if availiable 450 447 if (likely(this->animation[state] != NULL)) … … 454 451 this->currentState = state; 455 452 } 456 457 458 453 459 454 /////////////////// … … 513 508 // if (this->projectile == NULL) 514 509 { 515 PRINTF( 2)("There was no projectile assigned to the Weapon.\n");510 PRINTF(1)("There was no projectile assigned to the Weapon.\n"); 516 511 retVal = false; 517 512 } … … 528 523 void Weapon::debug() const 529 524 { 530 PRINT(3)("Weapon-Debug %s, state: %s, nex Action: %s\n", this->getName(), Weapon::stateToChar(this->currentState), Weapon::actionToChar(requestedAction));525 PRINT(3)("Weapon-Debug %s, state: %s, nextAction: %s\n", this->getName(), Weapon::stateToChar(this->currentState), Weapon::actionToChar(requestedAction)); 531 526 PRINT(3)("Energy: max: %f; current: %f; loadedMax: %f; loadedCurrent: %f; chargeMin: %f, chargeMax %f\n", 532 527 this->energyMax, this->energy, this->energyLoadedMax, this->energyLoaded, this->minCharge, this->maxCharge);
Note: See TracChangeset
for help on using the changeset viewer.