scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-07 08:15:59 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

Keep the mission's own ship when a quick start finds no last flown ship (#7962)

Browse Source 
A new pilot, or one whose last ship isn't in the current mod, has no last
flown ship. create_default_player_ship() then shows a popup and returns an
error; release builds carry on with the mission's own player ship, but
debug builds asserted. Drop the assert so both builds behave the same.

Co-authored-by: Dustinspace217 <[email protected]>
This commit is contained in:
Goober5000andDustinspace217 authored and GitHub committed 2026-11-02 22:42:30 -05:00
2 parents bb69b1b9db 670df9b97e
commit b8bd1daa6e
1 file changed
+2 -3
Download Patch File Download Diff File Expand all files Collapse all files
code/mission/missionload.cpp
+2 -3
View File
@@ -133,9 +133,8 @@ bool mission_load(const char* filename_ext)
return false;
if (Select_default_ship) {
int ret;
ret = create_default_player_ship();
Assert(!ret);
// no last flown ship (new pilot, or its ship isn't in this mod): the popup says so, the mission's ship is kept
create_default_player_ship();
}
ml_update_recent_missions(filename_ext); // update recently played missions list (save the csg later)