AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-25 05:48:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix check for umapdef entries (#432)

Browse Source 
* fix check for umapdef entries

* search all umapdef entries
This commit is contained in:
Roman Fomin 2022-01-28 19:49:09 +07:00 committed by GitHub
parent 2fa435d46e
commit 5950cb169e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Source/u_mapinfo.c
View File

@ -707,6 +707,25 @@ static int ParseMapEntry(u_scanner_t *s, mapentry_t *val)
// //
// ----------------------------------------------- // -----------------------------------------------
static boolean UpdateDefaultMapEntry(mapentry_t *val, int num)
{
int i;
for (i = 0; i < default_mapinfo.mapcount; ++i)
{
if (!strcmp(val->mapname, default_mapinfo.maps[i].mapname))
{
memset(&U_mapinfo.maps[num], 0, sizeof(mapentry_t));
UpdateMapEntry(&U_mapinfo.maps[num], &default_mapinfo.maps[i]);
UpdateMapEntry(&U_mapinfo.maps[num], val);
FreeMap(val);
return true;
}
}
return false;
}
int U_ParseMapInfo(boolean is_default, const char *buffer, size_t length) int U_ParseMapInfo(boolean is_default, const char *buffer, size_t length)
{ {
unsigned int i; unsigned int i;
@ -735,14 +754,8 @@ int U_ParseMapInfo(boolean is_default, const char *buffer, size_t length)
if (!strcmp(parsed.mapname, U_mapinfo.maps[i].mapname)) if (!strcmp(parsed.mapname, U_mapinfo.maps[i].mapname))
{ {
FreeMap(&U_mapinfo.maps[i]); FreeMap(&U_mapinfo.maps[i]);
if (default_mapinfo.mapcount > i)
{ if (!UpdateDefaultMapEntry(&parsed, i))
memset(&U_mapinfo.maps[i], 0, sizeof(mapentry_t));
UpdateMapEntry(&U_mapinfo.maps[i], &default_mapinfo.maps[i]);
UpdateMapEntry(&U_mapinfo.maps[i], &parsed);
FreeMap(&parsed);
}
else
{ {
U_mapinfo.maps[i] = parsed; U_mapinfo.maps[i] = parsed;
} }
@ -755,14 +768,7 @@ int U_ParseMapInfo(boolean is_default, const char *buffer, size_t length)
U_mapinfo.mapcount++; U_mapinfo.mapcount++;
U_mapinfo.maps = (mapentry_t*)realloc(U_mapinfo.maps, sizeof(mapentry_t)*U_mapinfo.mapcount); U_mapinfo.maps = (mapentry_t*)realloc(U_mapinfo.maps, sizeof(mapentry_t)*U_mapinfo.mapcount);
if (default_mapinfo.mapcount > i) if (!UpdateDefaultMapEntry(&parsed, i))
{
memset(&U_mapinfo.maps[i], 0, sizeof(mapentry_t));
UpdateMapEntry(&U_mapinfo.maps[i], &default_mapinfo.maps[i]);
UpdateMapEntry(&U_mapinfo.maps[i], &parsed);
FreeMap(&parsed);
}
else
{ {
U_mapinfo.maps[U_mapinfo.mapcount-1] = parsed; U_mapinfo.maps[U_mapinfo.mapcount-1] = parsed;
} }