Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the bit that always set the player status to STATUS_DOCKED at the end of missionscreens without choices. It is wrong because a missionscreen could have been set up in flight, triggering a inconsistent state.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4419 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Eric Walch 2011-02-27 14:36:49 +00:00
parent 15858be796
commit 8e45928422
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Entities/PlayerEntityControls.m
View File

@ -3206,7 +3206,6 @@ static BOOL toggling_music;
{
if (!spacePressed)
{
[self setStatus:STATUS_DOCKED];
[[OOMusicController sharedController] stopMissionMusic];
[self handleMissionCallback];
@ -3264,6 +3263,7 @@ static BOOL toggling_music;
if ([self status] != STATUS_DOCKED) // did we launch inside callback? / are we in flight?
{
// TODO: This is no longer doing anything because of an 'isDocked' check inside the function. ***** Probably remove it for 1.76
[self doWorldEventUntilMissionScreen:OOJSID("missionScreenEnded")]; // no opportunity events.
}
else