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: move surface flag to QBSP convert logic

Browse source 
Only Mod_LoadVisibility has LittleLong format convertion logic on
server side.
This commit is contained in:
Denis Pauk 2024-04-14 17:37:31 +03:00
parent 3e46e777c0
commit 606451cc9c
2 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/common/cmodels.c
View file

@ -133,22 +133,22 @@ Mod_LoadPlanes(const char *name, cplane_t **planes, int *numplanes,
bits = 0;
for (j = 0; j < 3; j++)
{
out->normal[j] = LittleFloat(in->normal[j]);
out->normal[j] = in->normal[j];
if (out->normal[j] < 0)
{
bits |= 1<<j;
}
}
out->dist = LittleFloat(in->dist);
out->type = LittleLong(in->type);
out->dist = in->dist;
out->type = in->type;
out->signbits = bits;
}
}
static void
Mod_Load2QBSP_IBSP_ENTITIES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
memcpy(outbuf + outheader->lumps[LUMP_ENTITIES].fileofs,
inbuf + inheader->lumps[LUMP_ENTITIES].fileofs,
@ -157,7 +157,7 @@ Mod_Load2QBSP_IBSP_ENTITIES(byte *outbuf, dheader_t *outheader, const byte *inbu
static void
Mod_Load2QBSP_IBSP_PLANES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
dplane_t *in, *out;
int i, count;
@ -185,7 +185,7 @@ Mod_Load2QBSP_IBSP_PLANES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
static void
Mod_Load2QBSP_IBSP_VERTEXES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
dvertex_t *in, *out;
int i, count;
@ -210,7 +210,7 @@ Mod_Load2QBSP_IBSP_VERTEXES(byte *outbuf, dheader_t *outheader, const byte *inbu
static void
Mod_Load2QBSP_IBSP_VISIBILITY(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
memcpy(outbuf + outheader->lumps[LUMP_VISIBILITY].fileofs,
inbuf + inheader->lumps[LUMP_VISIBILITY].fileofs,
@ -219,7 +219,7 @@ Mod_Load2QBSP_IBSP_VISIBILITY(byte *outbuf, dheader_t *outheader, const byte *in
static void
Mod_Load2QBSP_IBSP_NODES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
dqnode_t *out;
dnode_t *in;
@ -255,7 +255,7 @@ Mod_Load2QBSP_IBSP_NODES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
static void
Mod_Load2QBSP_QBSP_NODES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
dqnode_t *in, *out;
int i, count;
@ -290,7 +290,7 @@ Mod_Load2QBSP_QBSP_NODES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
static void
Mod_Load2QBSP_IBSP_TEXINFO(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
texinfo_t *in, *out;
int i, count;
@ -309,7 +309,7 @@ Mod_Load2QBSP_IBSP_TEXINFO(byte *outbuf, dheader_t *outheader, const byte *inbuf
out->vecs[1][j] = LittleFloat(in->vecs[1][j]);
}
out->flags = LittleLong(in->flags);
out->flags = Mod_LoadSurfConvertFlags(LittleLong(in->flags), maptype);
out->nexttexinfo = LittleLong(in->nexttexinfo);
strncpy(out->texture, in->texture,
Q_min(sizeof(out->texture), sizeof(in->texture)));
@ -321,7 +321,7 @@ Mod_Load2QBSP_IBSP_TEXINFO(byte *outbuf, dheader_t *outheader, const byte *inbuf
static void
Mod_Load2QBSP_RBSP_TEXINFO(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
texrinfo_t *in;
texinfo_t *out;
@ -341,7 +341,7 @@ Mod_Load2QBSP_RBSP_TEXINFO(byte *outbuf, dheader_t *outheader, const byte *inbuf
out->vecs[1][j] = LittleFloat(in->vecs[1][j]);
}
out->flags = LittleLong(in->flags);
out->flags = Mod_LoadSurfConvertFlags(LittleLong(in->flags), maptype);
out->nexttexinfo = LittleLong(in->nexttexinfo);
strncpy(out->texture, in->texture,
Q_min(sizeof(out->texture), sizeof(in->texture)));
@ -353,7 +353,7 @@ Mod_Load2QBSP_RBSP_TEXINFO(byte *outbuf, dheader_t *outheader, const byte *inbuf
static void
Mod_Load2QBSP_IBSP_FACES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
int i, count;
dface_t *in;
@ -380,7 +380,7 @@ Mod_Load2QBSP_IBSP_FACES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
static void
Mod_Load2QBSP_RBSP_FACES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
int i, count;
drface_t *in;
@ -407,7 +407,7 @@ Mod_Load2QBSP_RBSP_FACES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
static void
Mod_Load2QBSP_QBSP_FACES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
int i, count;
dqface_t *in;
@ -434,7 +434,7 @@ Mod_Load2QBSP_QBSP_FACES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
static void
Mod_Load2QBSP_IBSP_LIGHTING(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
memcpy(outbuf + outheader->lumps[LUMP_LIGHTING].fileofs,
inbuf + inheader->lumps[LUMP_LIGHTING].fileofs,
@ -443,7 +443,7 @@ Mod_Load2QBSP_IBSP_LIGHTING(byte *outbuf, dheader_t *outheader, const byte *inbu
static void
Mod_Load2QBSP_IBSP_LEAFS(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
int i, count;
dleaf_t *in;
@ -480,7 +480,7 @@ Mod_Load2QBSP_IBSP_LEAFS(byte *outbuf, dheader_t *outheader, const byte *inbuf,
static void
Mod_Load2QBSP_DKBSP_LEAFS(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
int i, count;
ddkleaf_t *in;
@ -517,7 +517,7 @@ Mod_Load2QBSP_DKBSP_LEAFS(byte *outbuf, dheader_t *outheader, const byte *inbuf,
static void
Mod_Load2QBSP_QBSP_LEAFS(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
int i, count;
dqleaf_t *in;
@ -554,7 +554,7 @@ Mod_Load2QBSP_QBSP_LEAFS(byte *outbuf, dheader_t *outheader, const byte *inbuf,
static void
Mod_Load2QBSP_IBSP_LEAFFACES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
int i, count;
short *in;
@ -575,7 +575,7 @@ Mod_Load2QBSP_IBSP_LEAFFACES(byte *outbuf, dheader_t *outheader, const byte *inb
static void
Mod_Load2QBSP_QBSP_LEAFFACES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
int i, count;
int *in, *out;
@ -595,7 +595,7 @@ Mod_Load2QBSP_QBSP_LEAFFACES(byte *outbuf, dheader_t *outheader, const byte *inb
static void
Mod_Load2QBSP_IBSP_LEAFBRUSHES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
int i, count;
short *in;
@ -616,7 +616,7 @@ Mod_Load2QBSP_IBSP_LEAFBRUSHES(byte *outbuf, dheader_t *outheader, const byte *i
static void
Mod_Load2QBSP_QBSP_LEAFBRUSHES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
int i, count;
int *in, *out;
@ -636,7 +636,7 @@ Mod_Load2QBSP_QBSP_LEAFBRUSHES(byte *outbuf, dheader_t *outheader, const byte *i
static void
Mod_Load2QBSP_IBSP_EDGES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
dedge_t *in;
dqedge_t *out;
@ -658,7 +658,7 @@ Mod_Load2QBSP_IBSP_EDGES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
static void
Mod_Load2QBSP_QBSP_EDGES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
dqedge_t *in, *out;
int i, count;
@ -679,7 +679,7 @@ Mod_Load2QBSP_QBSP_EDGES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
static void
Mod_Load2QBSP_IBSP_SURFEDGES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
int i, count;
int *in, *out;
@ -699,7 +699,7 @@ Mod_Load2QBSP_IBSP_SURFEDGES(byte *outbuf, dheader_t *outheader, const byte *inb
static void
Mod_Load2QBSP_IBSP_MODELS(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
dmodel_t *in, *out;
int i, count;
@ -730,7 +730,7 @@ Mod_Load2QBSP_IBSP_MODELS(byte *outbuf, dheader_t *outheader, const byte *inbuf,
static void
Mod_Load2QBSP_IBSP_BRUSHES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
dbrush_t *in, *out;
int i, count;
@ -752,7 +752,7 @@ Mod_Load2QBSP_IBSP_BRUSHES(byte *outbuf, dheader_t *outheader, const byte *inbuf
static void
Mod_Load2QBSP_IBSP_BRUSHSIDES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
dbrushside_t *in;
dqbrushside_t *out;
@ -774,7 +774,7 @@ Mod_Load2QBSP_IBSP_BRUSHSIDES(byte *outbuf, dheader_t *outheader, const byte *in
static void
Mod_Load2QBSP_RBSP_BRUSHSIDES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
drbrushside_t *in;
dqbrushside_t *out;
@ -796,7 +796,7 @@ Mod_Load2QBSP_RBSP_BRUSHSIDES(byte *outbuf, dheader_t *outheader, const byte *in
static void
Mod_Load2QBSP_QBSP_BRUSHSIDES(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
dqbrushside_t *in, *out;
int i, count;
@ -817,7 +817,7 @@ Mod_Load2QBSP_QBSP_BRUSHSIDES(byte *outbuf, dheader_t *outheader, const byte *in
static void
Mod_Load2QBSP_IBSP_AREAS(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
darea_t *in, *out;
int i, count;
@ -838,7 +838,7 @@ Mod_Load2QBSP_IBSP_AREAS(byte *outbuf, dheader_t *outheader, const byte *inbuf,
static void
Mod_Load2QBSP_IBSP_AREAPORTALS(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, size_t rule_size)
const dheader_t *inheader, size_t rule_size, maptype_t maptype)
{
dareaportal_t *in, *out;
int count;
@ -850,7 +850,7 @@ Mod_Load2QBSP_IBSP_AREAPORTALS(byte *outbuf, dheader_t *outheader, const byte *i
}
typedef void (*funcrule_t)(byte *outbuf, dheader_t *outheader, const byte *inbuf,
const dheader_t *inheader, const size_t size);
const dheader_t *inheader, const size_t size, maptype_t maptype);
typedef struct
{
@ -1228,7 +1228,7 @@ Mod_Load2QBSP(const char *name, byte *inbuf, size_t filesize, size_t *out_len,
__func__, name, s);
}
rules[s].func(outbuf, outheader, inbuf, &header, rules[s].size);
rules[s].func(outbuf, outheader, inbuf, &header, rules[s].size, *maptype);
}
*out_len = result_size;

22
src/common/collision.c
View file

@ -1341,7 +1341,7 @@ CMod_LoadSubmodels(const char *name, cmodel_t *map_cmodels, int *numcmodels,
static void
CMod_LoadSurfaces(const char *name, mapsurface_t **map_surfaces, int *numtexinfo,
const byte *cmod_base, const lump_t *l, maptype_t maptype)
const byte *cmod_base, const lump_t *l)
{
texinfo_t *in;
mapsurface_t *out;
@ -1368,12 +1368,12 @@ CMod_LoadSurfaces(const char *name, mapsurface_t **map_surfaces, int *numtexinfo
{
Q_strlcpy(out->c.name, in->texture, sizeof(out->c.name));
Q_strlcpy(out->rname, in->texture, sizeof(out->rname));
out->c.flags = Mod_LoadSurfConvertFlags(in->flags, maptype);
out->c.flags = in->flags;
}
}
static void
CMod_LoadQNodes(const char *name, cnode_t **map_nodes, int *numnodes,
CMod_LoadNodes(const char *name, cnode_t **map_nodes, int *numnodes,
cplane_t *map_planes, const byte *cmod_base, const lump_t *l)
{
dqnode_t *in;
@ -1447,7 +1447,7 @@ CMod_LoadBrushes(const char* name, cbrush_t **map_brushes, int *numbrushes,
}
static void
CMod_LoadQLeafs(const char *name, cleaf_t **map_leafs, int *numleafs, int *emptyleaf,
CMod_LoadLeafs(const char *name, cleaf_t **map_leafs, int *numleafs, int *emptyleaf,
int *numclusters, const byte *cmod_base, const lump_t *l)
{
int i;
@ -1510,7 +1510,7 @@ CMod_LoadQLeafs(const char *name, cleaf_t **map_leafs, int *numleafs, int *empty
}
static void
CMod_LoadQLeafBrushes(const char *name, unsigned int **map_leafbrushes,
CMod_LoadLeafBrushes(const char *name, unsigned int **map_leafbrushes,
int *numleafbrushes, const byte *cmod_base, const lump_t *l)
{
unsigned int *out, *in;
@ -1537,7 +1537,7 @@ CMod_LoadQLeafBrushes(const char *name, unsigned int **map_leafbrushes,
}
static void
CMod_LoadQBrushSides(const char *name, cbrushside_t **map_brushsides, int *numbrushsides,
CMod_LoadBrushSides(const char *name, cbrushside_t **map_brushsides, int *numbrushsides,
cplane_t *map_planes, int numplanes, mapsurface_t *map_surfaces, int numtexinf,
const byte *cmod_base, const lump_t *l)
{
@ -1792,21 +1792,21 @@ CM_LoadCachedMap(const char *name, model_t *mod)
mod->extradata = Hunk_Begin(hunkSize);
CMod_LoadSurfaces(mod->name, &mod->map_surfaces, &mod->numtexinfo,
cmod_base, &header->lumps[LUMP_TEXINFO], maptype);
CMod_LoadQLeafs(mod->name, &mod->map_leafs, &mod->numleafs, &mod->emptyleaf,
cmod_base, &header->lumps[LUMP_TEXINFO]);
CMod_LoadLeafs(mod->name, &mod->map_leafs, &mod->numleafs, &mod->emptyleaf,
&mod->numclusters, cmod_base, &header->lumps[LUMP_LEAFS]);
CMod_LoadQLeafBrushes(mod->name, &mod->map_leafbrushes, &mod->numleafbrushes,
CMod_LoadLeafBrushes(mod->name, &mod->map_leafbrushes, &mod->numleafbrushes,
cmod_base, &header->lumps[LUMP_LEAFBRUSHES]);
Mod_LoadPlanes(mod->name, &mod->map_planes, &mod->numplanes,
cmod_base, &header->lumps[LUMP_PLANES]);
CMod_LoadBrushes(mod->name, &mod->map_brushes, &mod->numbrushes,
cmod_base, &header->lumps[LUMP_BRUSHES]);
CMod_LoadQBrushSides(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,
cmod_base, &header->lumps[LUMP_BRUSHSIDES]);
CMod_LoadSubmodels(mod->name, mod->map_cmodels, &mod->numcmodels,
cmod_base, &header->lumps[LUMP_MODELS]);
CMod_LoadQNodes(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]);
CMod_LoadAreas(mod->name, &mod->map_areas, &mod->numareas, cmod_base,
&header->lumps[LUMP_AREAS]);