1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Bugfix: Map Editor

Browse Source 
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
This commit is contained in:
Wanne
2012-06-19 10:49:05 +00:00
parent c0448be2e6
commit 31ec66539b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/worlddef.cpp
+5 -3
View File
@@ -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);
}
}