yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-18 01:51:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

CMod_LoadAreaPortals: reuse cache as map_areaportals

Browse source
This commit is contained in:
Denis Pauk 2024-05-01 19:07:42 +03:00
parent bf81d4e427
commit 78c7f62aba
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/common/collision.c
View file

@ -71,7 +71,7 @@ typedef struct
{ {
char name[MAX_QPATH]; char name[MAX_QPATH];
unsigned checksum; unsigned checksum;
char *cache; /* raw converted map */ byte *cache; /* raw converted map */
int cache_size; int cache_size;
cleaf_t *map_leafs; cleaf_t *map_leafs;
@ -104,7 +104,7 @@ typedef struct
int numareas; int numareas;
qboolean *portalopen; qboolean *portalopen;
dareaportal_t *map_areaportals; const dareaportal_t *map_areaportals;
int numareaportals; int numareaportals;
dvis_t *map_vis; dvis_t *map_vis;
@ -159,7 +159,7 @@ static void
FloodArea_r(carea_t *area, int floodnum) FloodArea_r(carea_t *area, int floodnum)
{ {
int i; int i;
dareaportal_t *p; const dareaportal_t *p;
if (area->floodvalid == floodvalid) if (area->floodvalid == floodvalid)
{ {
@ -1622,11 +1622,10 @@ CMod_LoadAreas(const char *name, carea_t **map_areas, int *numareas,
} }
static void static void
CMod_LoadAreaPortals(const char *name, dareaportal_t **map_areaportals, qboolean **portalopen, CMod_LoadAreaPortals(const char *name, const dareaportal_t **map_areaportals, qboolean **portalopen,
int *numareaportals, const byte *cmod_base, const lump_t *l) int *numareaportals, const byte *cmod_base, const lump_t *l)
{ {
const dareaportal_t *in; const dareaportal_t *in;
dareaportal_t *out;
int count; int count;
in = (void *)(cmod_base + l->fileofs); in = (void *)(cmod_base + l->fileofs);
@ -1643,11 +1642,11 @@ CMod_LoadAreaPortals(const char *name, dareaportal_t **map_areaportals, qboolean
Com_Error(ERR_DROP, "%s: Map %s has too small areas", __func__, name); Com_Error(ERR_DROP, "%s: Map %s has too small areas", __func__, name);
} }
out = *map_areaportals = Hunk_Alloc(l->filelen); *map_areaportals = in;
*portalopen = Hunk_Alloc(count * sizeof(qboolean)); *portalopen = Hunk_Alloc(count * sizeof(qboolean));
*numareaportals = count; *numareaportals = count;
memcpy(out, in, sizeof(dareaportal_t) * count);
memset(*portalopen, 0, count * sizeof(qboolean)); memset(*portalopen, 0, count * sizeof(qboolean));
} }
@ -1802,29 +1801,29 @@ CM_LoadCachedMap(const char *name, model_t *mod)
mod->cache_size = length; mod->cache_size = length;
CMod_LoadSurfaces(mod->name, &mod->map_surfaces, &mod->numtexinfo, CMod_LoadSurfaces(mod->name, &mod->map_surfaces, &mod->numtexinfo,
cmod_base, &header->lumps[LUMP_TEXINFO]); mod->cache, &header->lumps[LUMP_TEXINFO]);
CMod_LoadLeafs(mod->name, &mod->map_leafs, &mod->numleafs, &mod->emptyleaf, CMod_LoadLeafs(mod->name, &mod->map_leafs, &mod->numleafs, &mod->emptyleaf,
&mod->numclusters, cmod_base, &header->lumps[LUMP_LEAFS]); &mod->numclusters, mod->cache, &header->lumps[LUMP_LEAFS]);
CMod_LoadLeafBrushes(mod->name, &mod->map_leafbrushes, &mod->numleafbrushes, CMod_LoadLeafBrushes(mod->name, &mod->map_leafbrushes, &mod->numleafbrushes,
cmod_base, &header->lumps[LUMP_LEAFBRUSHES]); mod->cache, &header->lumps[LUMP_LEAFBRUSHES]);
Mod_LoadPlanes(mod->name, &mod->map_planes, &mod->numplanes, Mod_LoadPlanes(mod->name, &mod->map_planes, &mod->numplanes,
cmod_base, &header->lumps[LUMP_PLANES]); mod->cache, &header->lumps[LUMP_PLANES]);
CMod_LoadBrushes(mod->name, &mod->map_brushes, &mod->numbrushes, CMod_LoadBrushes(mod->name, &mod->map_brushes, &mod->numbrushes,
cmod_base, &header->lumps[LUMP_BRUSHES]); mod->cache, &header->lumps[LUMP_BRUSHES]);
CMod_LoadBrushSides(mod->name, &mod->map_brushsides, &mod->numbrushsides, CMod_LoadBrushSides(mod->name, &mod->map_brushsides, &mod->numbrushsides,
mod->map_planes, mod->numplanes, mod->map_surfaces, mod->numtexinfo, mod->map_planes, mod->numplanes, mod->map_surfaces, mod->numtexinfo,
cmod_base, &header->lumps[LUMP_BRUSHSIDES]); mod->cache, &header->lumps[LUMP_BRUSHSIDES]);
CMod_LoadSubmodels(mod->name, mod->map_cmodels, &mod->numcmodels, CMod_LoadSubmodels(mod->name, mod->map_cmodels, &mod->numcmodels,
cmod_base, &header->lumps[LUMP_MODELS]); mod->cache, &header->lumps[LUMP_MODELS]);
CMod_LoadNodes(mod->name, &mod->map_nodes, &mod->numnodes, CMod_LoadNodes(mod->name, &mod->map_nodes, &mod->numnodes,
mod->map_planes, cmod_base, &header->lumps[LUMP_NODES]); mod->map_planes, mod->cache, &header->lumps[LUMP_NODES]);
CMod_LoadAreas(mod->name, &mod->map_areas, &mod->numareas, cmod_base, CMod_LoadAreas(mod->name, &mod->map_areas, &mod->numareas, mod->cache,
&header->lumps[LUMP_AREAS]); &header->lumps[LUMP_AREAS]);
CMod_LoadAreaPortals(mod->name, &mod->map_areaportals, CMod_LoadAreaPortals(mod->name, &mod->map_areaportals,
&mod->portalopen, &mod->numareaportals, &mod->portalopen, &mod->numareaportals,
cmod_base, &header->lumps[LUMP_AREAPORTALS]); mod->cache, &header->lumps[LUMP_AREAPORTALS]);
Mod_LoadVisibility(mod->name, &mod->map_vis, &mod->numvisibility, Mod_LoadVisibility(mod->name, &mod->map_vis, &mod->numvisibility,
cmod_base, &header->lumps[LUMP_VISIBILITY]); mod->cache, &header->lumps[LUMP_VISIBILITY]);
if (!mod->map_vis) if (!mod->map_vis)
{ {
@ -1840,7 +1839,7 @@ CM_LoadCachedMap(const char *name, model_t *mod)
/* From kmquake2: adding an extra parameter for .ent support. */ /* From kmquake2: adding an extra parameter for .ent support. */
CMod_LoadEntityString(mod->name, &mod->map_entitystring, &mod->numentitychars, CMod_LoadEntityString(mod->name, &mod->map_entitystring, &mod->numentitychars,
cmod_base, &header->lumps[LUMP_ENTITIES]); mod->cache, &header->lumps[LUMP_ENTITIES]);
mod->extradatasize = Hunk_End(); mod->extradatasize = Hunk_End();
Com_DPrintf("Allocated %d from expected %d hunk size\n", Com_DPrintf("Allocated %d from expected %d hunk size\n",
mod->extradatasize, hunkSize); mod->extradatasize, hunkSize);