1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Reverted the increased map version number (from revision 5217), because it leads to problems when loading maps saved with older versions of Map Editor

Browse Source 
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
This commit is contained in:
Wanne
2012-05-12 19:24:08 +00:00
parent 1ad5b96931
commit 4f10c38a49
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaveLoadGame.cpp
+4 -12
View File
@@ -2388,18 +2388,10 @@ BOOLEAN StackedObjectData::Load( INT8** hBuffer, float dMajorMapVersion, UINT8 u
{ {
int size; int size;
// When saving maps with the new map editor that has weapon overheated feature included! // 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
if (dMajorMapVersion >= 7 && ubMinorMapVersion >= 28) // LOADDATA(&(this->data), *hBuffer, sizeof(ObjectData) );
{ // +1 because we have to account for endOfPOD itself
// 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_POD+1 );
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 );
}
LOADDATA(&size, *hBuffer, sizeof(int) ); LOADDATA(&size, *hBuffer, sizeof(int) );
attachments.resize(size); attachments.resize(size);
TileEngine/worlddef.h
+1 -1
View File
@@ -41,7 +41,7 @@ class SOLDIERTYPE;
// SB: new map version, with map dimensions added // SB: new map version, with map dimensions added
#define MAJOR_MAP_VERSION 7.0 #define MAJOR_MAP_VERSION 7.0
//Current minor map version updater. //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 //dnl ch33 230909
#define VANILLA_MAJOR_MAP_VERSION 5.00 #define VANILLA_MAJOR_MAP_VERSION 5.00