yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

collision: load ent file without has as backward compatibility

Browse source 
https://github.com/yquake2/yquake2/pull/1130#issuecomment-2256461447
This commit is contained in:
Denis Pauk 2024-07-29 22:15:13 +03:00
parent c92664c01d
commit 005dfa0ed5
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/common/collision.c
View file

@ -1649,7 +1649,14 @@ CMod_LoadEntityString(const lump_t *l, const char *name)
bufLen = FS_LoadFile(entname, (void **)&buffer);
if (buffer == NULL)
{
Com_Printf("No fixes found for '%s'\n", entname);
Com_Printf("No fixes found as '%s'\n", entname);
snprintf(entname, sizeof(entname) -1, "%s.ent", namewe);
bufLen = FS_LoadFile(entname, (void **)&buffer);
if (buffer != NULL && bufLen > 1)
{
Com_Printf("Have used '%s' file without content hash.\n", entname);
}
}
}
@ -1667,7 +1674,7 @@ CMod_LoadEntityString(const lump_t *l, const char *name)
}
else if (bufLen != -1)
{
/* If the .ent file is too small, don't load. */
/* If the .ent file is too small or large, don't load. */
Com_Printf("%s: .ent file %s too small.\n", __func__, entname);
FS_FreeFile(buffer);
}
@ -1677,12 +1684,12 @@ CMod_LoadEntityString(const lump_t *l, const char *name)
if (l->filelen < 0)
{
Com_Error(ERR_DROP, "%s: Map has too small entity lump", __func__);
Com_Error(ERR_DROP, "%s: Map %s has too small entity lump", __func__, name);
}
if (l->filelen >= sizeof(map_entitystring))
{
Com_Error(ERR_DROP, "%s: Map has too big entity lump", __func__);
Com_Error(ERR_DROP, "%s: Map %s has too large entity lump", __func__, name);
}
memcpy(map_entitystring, (const char *)cmod_base + l->fileofs, numentitychars);