edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7348 from Robyt3/Tools-Map-Version-Check

Browse source 
Fix map version checks in map_diff and map_extract tools
This commit is contained in:
heinrich5991 2023-10-14 16:16:11 +00:00 committed by GitHub
parent 575fc6c27c 60bb48c725
commit 788a2ad1ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/tools/map_diff.cpp
View file

@ -17,11 +17,13 @@ bool Process(IStorage *pStorage, const char **pMapNames)
return false; return false;
} }
// check version const CMapItemVersion *pVersion = static_cast<CMapItemVersion *>(aMaps[i].FindItem(MAPITEMTYPE_VERSION, 0));
CMapItemVersion *pVersion = (CMapItemVersion *)aMaps[i].FindItem(MAPITEMTYPE_VERSION, 0); if(pVersion == nullptr || pVersion->m_Version != CMapItemVersion::CURRENT_VERSION)
if(pVersion && pVersion->m_Version != 1) {
dbg_msg("map_compare", "unsupported map version '%s'", pMapNames[i]);
return false; return false;
} }
}
int aStart[2], aNum[2]; int aStart[2], aNum[2];
for(int i = 0; i < 2; ++i) for(int i = 0; i < 2; ++i)

8
src/tools/map_extract.cpp
View file

@ -16,10 +16,12 @@ bool Process(IStorage *pStorage, const char *pMapName, const char *pPathSave)
return false; return false;
} }
// check version const CMapItemVersion *pVersion = static_cast<CMapItemVersion *>(Reader.FindItem(MAPITEMTYPE_VERSION, 0));
CMapItemVersion *pVersion = (CMapItemVersion *)Reader.FindItem(MAPITEMTYPE_VERSION, 0); if(pVersion == nullptr || pVersion->m_Version != CMapItemVersion::CURRENT_VERSION)
if(pVersion && pVersion->m_Version != 1) {
dbg_msg("map_extract", "unsupported map version '%s'", pMapName);
return false; return false;
}
dbg_msg("map_extract", "Make sure you have the permission to use these images and sounds in your own maps"); dbg_msg("map_extract", "Make sure you have the permission to use these images and sounds in your own maps");