From 31ec66539bafc7f4f40526cef1106e8edd270c02 Mon Sep 17 00:00:00 2001 From: Wanne Date: Tue, 19 Jun 2012 10:49:05 +0000 Subject: [PATCH] - Bugfix: Map Editor o The "Save map in vanilla ..." was checked wrong after loading the map, when the map was not saved in "vanilla format" git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5353 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- TileEngine/worlddef.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/TileEngine/worlddef.cpp b/TileEngine/worlddef.cpp index ae9ea6f5..826884e4 100644 --- a/TileEngine/worlddef.cpp +++ b/TileEngine/worlddef.cpp @@ -2857,7 +2857,7 @@ BOOLEAN LoadWorld(const STR8 puiFilename, FLOAT* pMajorMapVersion, UINT8* pMinor // We enlarge the map SetWorldSize(iNewMapWorldRows, iNewMapWorldCols); - // Uncheck "vanilla map saving", because it is not allowed on maps > 160x160 + // Uncheck "vanilla map saving", because it is not allowed on maps > 160x160 UnclickEditorButton(OPTIONS_VANILLA_MODE); // Reset @@ -2868,13 +2868,15 @@ BOOLEAN LoadWorld(const STR8 puiFilename, FLOAT* pMajorMapVersion, UINT8* pMinor // Mapsize has not changed SetWorldSize(iRowSize, iColSize); - // We still have the "normal" map size -> Check "vanilla map saving" - if (iRowSize <= OLD_WORLD_ROWS && iRowSize <= OLD_WORLD_COLS) + // We still have the "normal" map size AND the map is saved in vanilla format + if ((iRowSize <= OLD_WORLD_ROWS && iRowSize <= OLD_WORLD_COLS) && (dMajorMapVersion == VANILLA_MAJOR_MAP_VERSION && ubMinorMapVersion == VANILLA_MINOR_MAP_VERSION)) { + // Check "vanilla map saving" ClickEditorButton(OPTIONS_VANILLA_MODE); } else { + // Uncheck "vanilla map saving" UnclickEditorButton(OPTIONS_VANILLA_MODE); } }