From 92cd4358065e8f57fe7e4a1a5f9b8055c8241ef0 Mon Sep 17 00:00:00 2001 From: Flugente Date: Wed, 27 Feb 2013 20:54:40 +0000 Subject: [PATCH] Fix: militia equipment was not dropped and saved if trashing world git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5878 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/strategicmap.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp index 0a6ee997..14cc0815 100644 --- a/Strategic/strategicmap.cpp +++ b/Strategic/strategicmap.cpp @@ -6132,6 +6132,13 @@ BOOLEAN HandleDefiniteUnloadingOfWorld( UINT8 ubUnloadCode ) } else if( ubUnloadCode == ABOUT_TO_TRASH_WORLD ) { + //if we arent loading a saved game + if( !(gTacticalStatus.uiFlags & LOADING_SAVED_GAME ) ) + { + // Flugente: cause all militia whose equipment is from this sector to drop it + TeamDropAll( MILITIA_TEAM ); + } + //Save the current sectors open temp files to the disk if( !SaveCurrentSectorsInformationToTempItemFile() ) {