scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-12 02:01:29 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

properly close out mission when end-mission sexp is used (Mantis #2144)

Browse Source
This commit is contained in:
taylor committed 2010-03-04 06:08:19 +00:00
1 parent 5fb12eebf4
commit f985b10eb7
1 file changed
+11 -5
Download Patch File Download Diff File Expand all files Collapse all files
code/freespace2/freespace.cpp
+11 -5
View File
@@ -6211,11 +6211,17 @@ void game_leave_state( int old_state, int new_state )
case GS_STATE_DEATH_DIED:
Game_mode &= ~GM_DEAD_DIED;
// early end while respawning or blowing up in a multiplayer game
if((Game_mode & GM_MULTIPLAYER) && ((new_state == GS_STATE_DEBRIEF) || (new_state == GS_STATE_MULTI_DOGFIGHT_DEBRIEF)) ){
game_stop_time();
freespace_stop_mission();
if ( !(Game_mode & GM_MULTIPLAYER) ) {
if ( end_mission && (new_state == GS_STATE_DEBRIEF) ) {
freespace_stop_mission();
}
} else {
// early end while respawning or blowing up in a multiplayer game
if ( (new_state == GS_STATE_DEBRIEF) || (new_state == GS_STATE_MULTI_DOGFIGHT_DEBRIEF) ) {
game_stop_time();
freespace_stop_mission();
}
}
break;