From 4f10c38a49ed0bee62d9d164397cc87683c19e83 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sat, 12 May 2012 19:24:08 +0000 Subject: [PATCH] - Reverted the increased map version number (from revision 5217), because it leads to problems when loading maps saved with older versions of Map Editor o Now maps saved with a map editor version from 1.13 revision <= 5216 should now work AGAIN with a compiled version (ja2.exe and Map Editor.exe) from THIS revision o INFO: Maps saved with a map editor version between revision 5217 and 5269 will have incorrect data! git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5270 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- SaveLoadGame.cpp | 16 ++++------------ TileEngine/worlddef.h | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/SaveLoadGame.cpp b/SaveLoadGame.cpp index 735b048a..b9773625 100644 --- a/SaveLoadGame.cpp +++ b/SaveLoadGame.cpp @@ -2388,18 +2388,10 @@ BOOLEAN StackedObjectData::Load( INT8** hBuffer, float dMajorMapVersion, UINT8 u { int size; - // When saving maps with the new map editor that has weapon overheated feature included! - if (dMajorMapVersion >= 7 && ubMinorMapVersion >= 28) - { - // Flugente: changed this, otherwise game would crash when reading WF maps if class ObjectData was different. this is a rough fix and by no means perfect - LOADDATA(&(this->data), *hBuffer, sizeof(ObjectData) ); - } - else - { - // WF Maps have old format - // +1 because we have to account for endOfPOD itself - LOADDATA(&(this->data), *hBuffer, SIZEOF_OBJECTDATA_POD+1 ); - } + // Flugente: changed this, otherwise game would crash when reading WF maps if class ObjectData was different. this is a rough fix and by no means perfect + // LOADDATA(&(this->data), *hBuffer, sizeof(ObjectData) ); + // +1 because we have to account for endOfPOD itself + LOADDATA(&(this->data), *hBuffer, SIZEOF_OBJECTDATA_POD+1 ); LOADDATA(&size, *hBuffer, sizeof(int) ); attachments.resize(size); diff --git a/TileEngine/worlddef.h b/TileEngine/worlddef.h index 3c89c57c..92ac6bc6 100644 --- a/TileEngine/worlddef.h +++ b/TileEngine/worlddef.h @@ -41,7 +41,7 @@ class SOLDIERTYPE; // SB: new map version, with map dimensions added #define MAJOR_MAP_VERSION 7.0 //Current minor map version updater. -#define MINOR_MAP_VERSION 28 // 27 -> 28: increased to 28 because of included weapon overheated feature! +#define MINOR_MAP_VERSION 27 //dnl ch33 230909 #define VANILLA_MAJOR_MAP_VERSION 5.00