Changeset 1282 for code/branches/merge/bin

Timestamp:

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

Author:

scheusso

Message:

made gamestatemanager::cleanup a bit safer

Location:

code/branches/merge/bin

Files:

• levels/sample.oxw (modified) (1 diff)
• run-script (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 $@