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

- Fixed error when playing / loading maps that have been saved with a new Map Editor after Revision 5064 (when the Overheated Weapon feature was included)

Browse Source 
o The gMapInformation struct (Version, Edgepoints, ...) was not read correctly from the map file. Now it should work again!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5178 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-04-10 17:25:39 +00:00
parent d199d90c9f
commit 74c6e3c56c
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaveLoadGame.cpp
+13 -4
View File
@@ -2386,10 +2386,19 @@ BOOLEAN StackedObjectData::Load( INT8** hBuffer, float dMajorMapVersion, UINT8 u
|| (dMajorMapVersion == gdMajorMapVersion && gubMinorMapVersion == ubMinorMapVersion))
{
int size;
// 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 );
// 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 );
}
LOADDATA(&size, *hBuffer, sizeof(int) );
attachments.resize(size);
TileEngine/worlddef.h
+2 -2
View File
@@ -39,9 +39,9 @@ class OBJECTTYPE;
class SOLDIERTYPE;
// 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.
#define MINOR_MAP_VERSION 27
#define MINOR_MAP_VERSION 28 // 27 -> 28: increased to 28 because of included weapon overheated feature!
//dnl ch33 230909
#define VANILLA_MAJOR_MAP_VERSION 5.00