Changeset 1282
- Timestamp:
- May 15, 2008, 2:14:44 PM (17 years ago)
- Location:
- code/branches/merge
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified code/branches/merge/bin/levels/sample.oxw ¶
r1279 r1282 11 11 <!--Ambient colourvalue="1,1,1" /--> 12 12 <Skybox src="Orxonox/StarSkyBox" /> 13 <SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="-90,-90,0" mesh="assf 3.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />13 <SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="-90,-90,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" /> 14 14 15 15 <NPC position="0,100,400" scale="1" mesh="razor.mesh"/> -
TabularUnified code/branches/merge/bin/run-script ¶
r1279 r1282 22 22 fi 23 23 fi 24 trap "xset r" EXIT HUP INT TERM ABRT 24 trap "xset r" EXIT HUP INT TERM ABRT KILL 25 25 exec ./orxonox $@ -
TabularUnified code/branches/merge/src/network/ConnectionManager.cc ¶
r1278 r1282 342 342 no->setScale(10); 343 343 no->setYawPitchRoll(orxonox::Degree(-90),orxonox::Degree(-90),orxonox::Degree(0)); 344 no->setMesh("assf 3.mesh");344 no->setMesh("assff.mesh"); 345 345 no->setMaxSpeed(500); 346 346 no->setMaxSideAndBackSpeed(50); -
TabularUnified code/branches/merge/src/network/GameStateManager.cc ¶
r1265 r1282 84 84 if( (*it).second <= 0 ){ 85 85 COUT(4) << "GameStateManager: deleting gamestate with id: " << (*it).first << ", uses: " << (*it).second << std::endl; 86 delete[] gameStateMap[(*it).first]->data; 87 delete gameStateMap[(*it).first]; 88 gameStateMap.erase((*it).first); 86 std::map<int, GameState *>::iterator tempit = gameStateMap.find((*it).first); 87 if( tempit != gameStateMap.end() ){ 88 GameState *temp = tempit->second; 89 if(temp){ 90 delete[] gameStateMap[(*it).first]->data; 91 delete gameStateMap[(*it).first]; 92 gameStateMap.erase((*it).first); 93 } 94 } 89 95 gameStateUsed.erase(it++); 90 96 continue;
Note: See TracChangeset
for help on using the changeset viewer.