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

- Fixed exclusive VS 2010 compilation error that was introduced in revision 4665 when making improvement to the tactical save code (thx to BirdFlu)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4779 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-11-04 11:18:22 +00:00
parent d828cdd25f
commit cfc3981342
1 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/SaveLoadMap.cpp
+27 -24
View File
@@ -46,29 +46,32 @@ BOOLEAN ModifyWindowStatus( INT32 uiMapIndex );
struct ModifiedMapFile struct ModifiedMapFile
{ {
UINT32 uiType; struct Key
INT16 sMapX; {
INT16 sMapY; UINT32 uiType;
INT8 bMapZ; INT16 sMapX;
INT16 sMapY;
INT8 bMapZ;
} key;
CHAR8 szMapName[128]; CHAR8 szMapName[128];
HWFILE hFileHandle; HWFILE hFileHandle;
ModifiedMapFile(UINT32 uiType, INT16 sMapX, INT16 sMapY, INT8 bMapZ) ModifiedMapFile(UINT32 uiType, INT16 sMapX, INT16 sMapY, INT8 bMapZ)
{ {
this->uiType = uiType; this->key.uiType = uiType;
this->sMapX = sMapX; this->key.sMapX = sMapX;
this->sMapY = sMapY; this->key.sMapY = sMapY;
this->bMapZ = bMapZ; this->key.bMapZ = bMapZ;
this->szMapName[0] = 0; this->szMapName[0] = 0;
this->hFileHandle = NULL; this->hFileHandle = NULL;
} }
ModifiedMapFile(UINT32 uiType, STR pMapName, INT16 sMapX, INT16 sMapY, INT8 bMapZ) ModifiedMapFile(UINT32 uiType, STR pMapName, INT16 sMapX, INT16 sMapY, INT8 bMapZ)
{ {
this->uiType = uiType; this->key.uiType = uiType;
this->sMapX = sMapX; this->key.sMapX = sMapX;
this->sMapY = sMapY; this->key.sMapY = sMapY;
this->bMapZ = bMapZ; this->key.bMapZ = bMapZ;
strncpy(this->szMapName, pMapName, _countof(this->szMapName)); strncpy(this->szMapName, pMapName, _countof(this->szMapName));
this->szMapName[_countof(this->szMapName) - 1] = 0; this->szMapName[_countof(this->szMapName) - 1] = 0;
this->hFileHandle = NULL; this->hFileHandle = NULL;
@@ -141,7 +144,7 @@ struct ModifiedMapFile
struct ltMMF struct ltMMF
{ {
bool compare(const ModifiedMapFile& s1, const ModifiedMapFile& s2) const bool compare(const ModifiedMapFile::Key& s1, const ModifiedMapFile::Key& s2) const
{ {
int diff = s1.uiType - s2.uiType; int diff = s1.uiType - s2.uiType;
if (diff == 0) if (diff == 0)
@@ -158,13 +161,13 @@ struct ltMMF
} }
return diff < 0; return diff < 0;
} }
bool operator()(const ModifiedMapFile& s1, const ModifiedMapFile& s2) const { return compare(s1, s2); } bool operator()(const ModifiedMapFile::Key& s1, const ModifiedMapFile::Key& s2) const { return compare(s1, s2); }
bool operator()(const ModifiedMapFile* s1, const ModifiedMapFile* s2) const { return compare(*s1, *s2); } bool operator()(const ModifiedMapFile::Key* s1, const ModifiedMapFile::Key* s2) const { return compare(*s1, *s2); }
bool operator()(const ModifiedMapFile& s1, const ModifiedMapFile* s2) const { return compare(s1, *s2); } bool operator()(const ModifiedMapFile::Key& s1, const ModifiedMapFile::Key* s2) const { return compare(s1, *s2); }
bool operator()(const ModifiedMapFile* s1, const ModifiedMapFile& s2) const { return compare(*s1, s2); } bool operator()(const ModifiedMapFile::Key* s1, const ModifiedMapFile::Key& s2) const { return compare(*s1, s2); }
}; };
typedef std::set<ModifiedMapFile, ltMMF> ModifiedMapFileSet; typedef std::map<ModifiedMapFile::Key, ModifiedMapFile, ltMMF> ModifiedMapFileSet;
ModifiedMapFileSet g_mapFileSet; ModifiedMapFileSet g_mapFileSet;
BOOLEAN g_useSaveCache; BOOLEAN g_useSaveCache;
@@ -194,13 +197,13 @@ bool TryGetModifiedMapFile( UINT32 uiType, INT16 sMapX, INT16 sMapY, INT8 bMapZ,
return false; return false;
ModifiedMapFile key(uiType, sMapX, sMapY, bMapZ); ModifiedMapFile key(uiType, sMapX, sMapY, bMapZ);
ModifiedMapFileSet::iterator itr = g_mapFileSet.find(key); ModifiedMapFileSet::iterator itr = g_mapFileSet.find(key.key);
if (itr == g_mapFileSet.end()) if (itr == g_mapFileSet.end())
{ {
*ppMMF = NULL; *ppMMF = NULL;
return false; return false;
} }
*ppMMF = &(*itr); *ppMMF = &(itr->second);
return true; return true;
} }
@@ -211,10 +214,10 @@ ModifiedMapFile& GetOrCreateModifiedMapFile(UINT32 uiType, INT16 sMapX, INT16 sM
return *pResult; return *pResult;
ModifiedMapFile key(uiType, sMapX, sMapY, bMapZ); ModifiedMapFile key(uiType, sMapX, sMapY, bMapZ);
ModifiedMapFileSet::iterator itr = g_mapFileSet.insert(g_mapFileSet.end(), key); ModifiedMapFileSet::iterator itr = g_mapFileSet.insert(g_mapFileSet.end(), std::make_pair(key.key, key));
pResult = &(*itr); pResult = &(itr->second);
GetMapTempFileName( pResult->uiType, pResult->szMapName, pResult->sMapX, pResult->sMapY, pResult->bMapZ ); GetMapTempFileName( pResult->key.uiType, pResult->szMapName, pResult->key.sMapX, pResult->key.sMapY, pResult->key.bMapZ );
return *pResult; return *pResult;
} }