Changeset 1282 for code/branches/merge

Timestamp:

May 15, 2008, 2:14:44 PM (17 years ago)

Author:

scheusso

Message:

made gamestatemanager::cleanup a bit safer

Location:

code/branches/merge

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• bin/run-script (modified) (1 diff)
• src/network/ConnectionManager.cc (modified) (1 diff)
• src/network/GameStateManager.cc (modified) (1 diff)

code/branches/merge/bin/levels/sample.oxw

@@ -11 +11 @@
 <!--Ambient colourvalue="1,1,1" /-->
 <Skybox src="Orxonox/StarSkyBox" />
-<SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="-90,-90,0" mesh="assf3.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
+<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" />
 
 <NPC position="0,100,400" scale="1" mesh="razor.mesh"/>

code/branches/merge/bin/run-script

@@ -22 +22 @@
         fi
 fi
-trap "xset r" EXIT HUP INT TERM ABRT
+trap "xset r" EXIT HUP INT TERM ABRT KILL
 exec ./orxonox $@

code/branches/merge/src/network/ConnectionManager.cc

@@ -342 +342 @@
     no->setScale(10);
     no->setYawPitchRoll(orxonox::Degree(-90),orxonox::Degree(-90),orxonox::Degree(0));
-    no->setMesh("assf3.mesh");
+    no->setMesh("assff.mesh");
     no->setMaxSpeed(500);
     no->setMaxSideAndBackSpeed(50);

code/branches/merge/src/network/GameStateManager.cc

@@ -84 +84 @@
       if( (*it).second <= 0 ){
         COUT(4) << "GameStateManager: deleting gamestate with id: " << (*it).first << ", uses: " << (*it).second << std::endl;
-        delete[] gameStateMap[(*it).first]->data;
-        delete gameStateMap[(*it).first];
-        gameStateMap.erase((*it).first);
+        std::map<int, GameState *>::iterator tempit = gameStateMap.find((*it).first);
+        if( tempit != gameStateMap.end() ){
+          GameState *temp = tempit->second;
+          if(temp){
+            delete[] gameStateMap[(*it).first]->data;
+            delete gameStateMap[(*it).first];
+            gameStateMap.erase((*it).first);
+          }
+        }
         gameStateUsed.erase(it++);
         continue;