Changeset 9615 for code/branches/formationupdate
- Timestamp:
- Apr 23, 2013, 1:42:53 PM (12 years ago)
- Location:
- code/branches/formationupdate
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/formationupdate/data/levels/maxim.oxw
r9613 r9615 65 65 66 66 <!-- ADDING FORMATION: 5 Swallows --> 67 <?lua for i=0, 4,1 do67 <?lua for i=0,1,1 do 68 68 ?> 69 <SpaceShip position="<?lua print( 400+i*200) ?>,-200,1000" lookat="-1300,-600,900" visible="true">69 <SpaceShip position="<?lua print(800+i*200) ?>,700,600" lookat="-1300,-600,900" visible="true"> 70 70 <templates> 71 71 <Template link=spaceshipswallow /> … … 79 79 80 80 <!-- ADDING ENEMY FORMATION: 5 Swallows --> 81 <!-- 82 <?lua for i=0, 4,1 do81 82 <?lua for i=0,1,1 do 83 83 ?> 84 84 <SpaceShip position="<?lua print(5000+i*200) ?>,-200,1000" lookat="-1300,-600,900" visible="true"> … … 91 91 </SpaceShip> 92 92 <?lua end ?> 93 -->94 93 </Scene> 95 94 </Level> -
code/branches/formationupdate/src/orxonox/worldentities/pawns/Pawn.cc
r9614 r9615 325 325 } 326 326 } 327 orxout(user_warning) << "The HumanController has no slaves!" << endl; 327 328 return false; 328 329 } … … 359 360 * Doesn't work yet 360 361 * 361 * if(this->hasSlaves())362 */ if(this->hasSlaves()) 362 363 { 363 364 // start to control a slave 364 365 this->getPlayer()->startControl(this->getSlave()->getControllableEntity()); 365 }*/ 366 this->getPlayer()->stopControl(); 366 } 367 else{ 368 this->getPlayer()->stopControl(); 369 } 367 370 } 368 371 if (GameMode::isMaster())
Note: See TracChangeset
for help on using the changeset viewer.