From 81cf0853f026123f9d4a43bde9c0a79521d71ca5 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Sat, 14 Apr 2012 12:23:49 +0800 Subject: [PATCH] Fix crash when loading a level in the editor --- CHANGELOG.txt | 4 ++++ main/gamesave.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 6420754b4..429211b3c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,9 @@ D1X-Rebirth Changelog +20120414 +-------- +main/gamesave.c: Fix crash when loading a level in the editor + 20120412 -------- main/collide.c, main/gameseq.c, main/multi.c, main/multi.h, main/net_udp.c: Fixed some Multiplayer bugs: Reactor invulnerable time did not checked for hours spent in level so reactor would become invulnerable again after 60 minutes; Fixed the fix (heh) for misordered explode/reappear packets; Reset Player_eggs_dropped when initializing new ship so eggs are properly dropped when player disconnects two times without respawning; Cleaned player disconnecting a little bit and made code more straightforward diff --git a/main/gamesave.c b/main/gamesave.c index d802ca26e..3b6b9b289 100644 --- a/main/gamesave.c +++ b/main/gamesave.c @@ -1176,7 +1176,7 @@ int load_level(char * filename_passed) * Descent 1 - Level 19: OBERON MINE has some ugly overlapping rooms (segment 484). * HACK to make this issue less visible by moving one vertex a little. */ - if ( !stricmp("Descent: First Strike",Current_mission_longname) && !stricmp("level19.rdl",filename) && PHYSFS_fileLength(LoadFile) == 136706) + if (Current_mission && !stricmp("Descent: First Strike",Current_mission_longname) && !stricmp("level19.rdl",filename) && PHYSFS_fileLength(LoadFile) == 136706) Vertices[1905].z =-385*F1_0; if (mine_err == -1) { //error!!