Changeset 9614 for code/branches/formationupdate/src/orxonox/worldentities
- Timestamp:
- Apr 9, 2013, 4:02:46 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/formationupdate/src/orxonox/worldentities/pawns/Pawn.cc
r9613 r9614 308 308 } 309 309 310 // Two functions to find the slaves of a Pawn 310 311 /* Two functions to find the slaves of a Pawn 312 * 313 */ 311 314 bool Pawn::hasSlaves() 312 315 { 313 /* TEST TEST This is used to find out if the current pawn is also314 * the master of the formation and to find his slaves.315 *316 */317 316 for (ObjectList<FormationController>::iterator it = 318 317 ObjectList<FormationController>::begin(); … … 327 326 } 328 327 return false; 329 /* TEST TEST */330 328 } 331 329 … … 358 356 if (this->getPlayer() && this->getPlayer()->getControllableEntity() == this) 359 357 { 360 if(this->hasSlaves()) 358 /* Do different things if Pawn is the Master of a Formation 359 * Doesn't work yet 360 * 361 * if(this->hasSlaves()) 361 362 { 362 363 // start to control a slave 363 364 this->getPlayer()->startControl(this->getSlave()->getControllableEntity()); 364 } 365 }*/ 365 366 this->getPlayer()->stopControl(); 366 367 } 367 /*if (GameMode::isMaster())368 if (GameMode::isMaster()) 368 369 { 369 370 // this->deathEffect(); 370 371 this->goWithStyle(); 371 } */372 } 372 373 } 373 374 }
Note: See TracChangeset
for help on using the changeset viewer.