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

maps: prepare code for use formats with different position of lumps

Browse source
This commit is contained in:
Denis Pauk 2024-05-04 18:38:12 +03:00
parent fbc91514eb
commit dbc7a5fbe5
4 changed files with 114 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/client/vid/glimp_sdl2.c
View file

@ -272,11 +272,11 @@ InitDisplayIndices()
for ( int i = 0; i < num_displays; i++ ) for ( int i = 0; i < num_displays; i++ )
{ {
/* There are a maximum of 10 digits in 32 bit int + 1 for the NULL terminator. */ /* There are a maximum of 12 digits in 32 bit int + 1 for the NULL terminator. */
displayindices[ i ] = malloc(11 * sizeof( char )); displayindices[ i ] = malloc(16 * sizeof( char ));
YQ2_COM_CHECK_OOM(displayindices[i], "malloc()", 11 * sizeof( char )) YQ2_COM_CHECK_OOM(displayindices[i], "malloc()", 16 * sizeof( char ))
snprintf( displayindices[ i ], 11, "%d", i ); snprintf( displayindices[ i ], 16, "%d", i );
} }
/* The last entry is NULL to indicate the list of strings ends. */ /* The last entry is NULL to indicate the list of strings ends. */

211
src/common/cmodels.c
View file

@ -924,119 +924,120 @@ typedef void (*funcrule_t)(byte *outbuf, dheader_t *outheader, const byte *inbuf
typedef struct typedef struct
{ {
int pos; /* Lump position in relation to Q2 in final size */
size_t size; size_t size;
funcrule_t func; funcrule_t func;
} rule_t; } rule_t;
static const rule_t idbsplumps[HEADER_LUMPS] = { static const rule_t idq2bsplumps[HEADER_LUMPS] = {
{sizeof(char), Mod_Load2QBSP_IBSP_ENTITIES}, {0, sizeof(char), Mod_Load2QBSP_IBSP_ENTITIES},
{sizeof(dplane_t), Mod_Load2QBSP_IBSP_PLANES}, {1, sizeof(dplane_t), Mod_Load2QBSP_IBSP_PLANES},
{sizeof(dvertex_t), Mod_Load2QBSP_IBSP_VERTEXES}, {2, sizeof(dvertex_t), Mod_Load2QBSP_IBSP_VERTEXES},
{sizeof(char), Mod_Load2QBSP_IBSP_VISIBILITY}, {3, sizeof(char), Mod_Load2QBSP_IBSP_VISIBILITY},
{sizeof(dnode_t), Mod_Load2QBSP_IBSP_NODES}, {4, sizeof(dnode_t), Mod_Load2QBSP_IBSP_NODES},
{sizeof(texinfo_t), Mod_Load2QBSP_IBSP_TEXINFO}, {5, sizeof(texinfo_t), Mod_Load2QBSP_IBSP_TEXINFO},
{sizeof(dface_t), Mod_Load2QBSP_IBSP_FACES}, {6, sizeof(dface_t), Mod_Load2QBSP_IBSP_FACES},
{sizeof(char), Mod_Load2QBSP_IBSP_LIGHTING}, {7, sizeof(char), Mod_Load2QBSP_IBSP_LIGHTING},
{sizeof(dleaf_t), Mod_Load2QBSP_IBSP_LEAFS}, {8, sizeof(dleaf_t), Mod_Load2QBSP_IBSP_LEAFS},
{sizeof(short), Mod_Load2QBSP_IBSP_LEAFFACES}, {9, sizeof(short), Mod_Load2QBSP_IBSP_LEAFFACES},
{sizeof(short), Mod_Load2QBSP_IBSP_LEAFBRUSHES}, {10, sizeof(short), Mod_Load2QBSP_IBSP_LEAFBRUSHES},
{sizeof(dedge_t), Mod_Load2QBSP_IBSP_EDGES}, {11, sizeof(dedge_t), Mod_Load2QBSP_IBSP_EDGES},
{sizeof(int), Mod_Load2QBSP_IBSP_SURFEDGES}, {12, sizeof(int), Mod_Load2QBSP_IBSP_SURFEDGES},
{sizeof(dmodel_t), Mod_Load2QBSP_IBSP_MODELS}, {13, sizeof(dmodel_t), Mod_Load2QBSP_IBSP_MODELS},
{sizeof(dbrush_t), Mod_Load2QBSP_IBSP_BRUSHES}, {14, sizeof(dbrush_t), Mod_Load2QBSP_IBSP_BRUSHES},
{sizeof(dbrushside_t), Mod_Load2QBSP_IBSP_BRUSHSIDES}, {15, sizeof(dbrushside_t), Mod_Load2QBSP_IBSP_BRUSHSIDES},
{0, NULL}, // LUMP_POP {-1, 0, NULL}, // LUMP_POP
{sizeof(darea_t), Mod_Load2QBSP_IBSP_AREAS}, {17, sizeof(darea_t), Mod_Load2QBSP_IBSP_AREAS},
{sizeof(dareaportal_t), Mod_Load2QBSP_IBSP_AREAPORTALS}, {18, sizeof(dareaportal_t), Mod_Load2QBSP_IBSP_AREAPORTALS},
}; };
static const rule_t dkbsplumps[HEADER_LUMPS] = { static const rule_t dkbsplumps[HEADER_LUMPS] = {
{sizeof(char), Mod_Load2QBSP_IBSP_ENTITIES}, {0, sizeof(char), Mod_Load2QBSP_IBSP_ENTITIES},
{sizeof(dplane_t), Mod_Load2QBSP_IBSP_PLANES}, {1, sizeof(dplane_t), Mod_Load2QBSP_IBSP_PLANES},
{sizeof(dvertex_t), Mod_Load2QBSP_IBSP_VERTEXES}, {2, sizeof(dvertex_t), Mod_Load2QBSP_IBSP_VERTEXES},
{sizeof(char), Mod_Load2QBSP_IBSP_VISIBILITY}, {3, sizeof(char), Mod_Load2QBSP_IBSP_VISIBILITY},
{sizeof(dnode_t), Mod_Load2QBSP_IBSP_NODES}, {4, sizeof(dnode_t), Mod_Load2QBSP_IBSP_NODES},
{sizeof(texinfo_t), Mod_Load2QBSP_IBSP_TEXINFO}, {5, sizeof(texinfo_t), Mod_Load2QBSP_IBSP_TEXINFO},
{sizeof(dface_t), Mod_Load2QBSP_IBSP_FACES}, {6, sizeof(dface_t), Mod_Load2QBSP_IBSP_FACES},
{sizeof(char), Mod_Load2QBSP_IBSP_LIGHTING}, {7, sizeof(char), Mod_Load2QBSP_IBSP_LIGHTING},
{sizeof(ddkleaf_t), Mod_Load2QBSP_DKBSP_LEAFS}, {8, sizeof(ddkleaf_t), Mod_Load2QBSP_DKBSP_LEAFS},
{sizeof(short), Mod_Load2QBSP_IBSP_LEAFFACES}, {9, sizeof(short), Mod_Load2QBSP_IBSP_LEAFFACES},
{sizeof(short), Mod_Load2QBSP_IBSP_LEAFBRUSHES}, {10, sizeof(short), Mod_Load2QBSP_IBSP_LEAFBRUSHES},
{sizeof(dedge_t), Mod_Load2QBSP_IBSP_EDGES}, {11, sizeof(dedge_t), Mod_Load2QBSP_IBSP_EDGES},
{sizeof(int), Mod_Load2QBSP_IBSP_SURFEDGES}, {12, sizeof(int), Mod_Load2QBSP_IBSP_SURFEDGES},
{sizeof(dmodel_t), Mod_Load2QBSP_IBSP_MODELS}, {13, sizeof(dmodel_t), Mod_Load2QBSP_IBSP_MODELS},
{sizeof(dbrush_t), Mod_Load2QBSP_IBSP_BRUSHES}, {14, sizeof(dbrush_t), Mod_Load2QBSP_IBSP_BRUSHES},
{sizeof(dbrushside_t), Mod_Load2QBSP_IBSP_BRUSHSIDES}, {15, sizeof(dbrushside_t), Mod_Load2QBSP_IBSP_BRUSHSIDES},
{0, NULL}, // LUMP_POP {-1, 0, NULL}, // LUMP_POP
{sizeof(darea_t), Mod_Load2QBSP_IBSP_AREAS}, {17, sizeof(darea_t), Mod_Load2QBSP_IBSP_AREAS},
{sizeof(dareaportal_t), Mod_Load2QBSP_IBSP_AREAPORTALS}, {18, sizeof(dareaportal_t), Mod_Load2QBSP_IBSP_AREAPORTALS},
}; };
static const rule_t rbsplumps[HEADER_LUMPS] = { static const rule_t rbsplumps[HEADER_LUMPS] = {
{sizeof(char), Mod_Load2QBSP_IBSP_ENTITIES}, {0, sizeof(char), Mod_Load2QBSP_IBSP_ENTITIES},
{sizeof(dplane_t), Mod_Load2QBSP_IBSP_PLANES}, {1, sizeof(dplane_t), Mod_Load2QBSP_IBSP_PLANES},
{sizeof(dvertex_t), Mod_Load2QBSP_IBSP_VERTEXES}, {2, sizeof(dvertex_t), Mod_Load2QBSP_IBSP_VERTEXES},
{sizeof(char), Mod_Load2QBSP_IBSP_VISIBILITY}, {3, sizeof(char), Mod_Load2QBSP_IBSP_VISIBILITY},
{sizeof(dnode_t), Mod_Load2QBSP_IBSP_NODES}, {4, sizeof(dnode_t), Mod_Load2QBSP_IBSP_NODES},
{sizeof(texrinfo_t), Mod_Load2QBSP_RBSP_TEXINFO}, {5, sizeof(texrinfo_t), Mod_Load2QBSP_RBSP_TEXINFO},
{sizeof(drface_t), Mod_Load2QBSP_RBSP_FACES}, {6, sizeof(drface_t), Mod_Load2QBSP_RBSP_FACES},
{sizeof(char), Mod_Load2QBSP_IBSP_LIGHTING}, {7, sizeof(char), Mod_Load2QBSP_IBSP_LIGHTING},
{sizeof(dleaf_t), Mod_Load2QBSP_IBSP_LEAFS}, {8, sizeof(dleaf_t), Mod_Load2QBSP_IBSP_LEAFS},
{sizeof(short), Mod_Load2QBSP_IBSP_LEAFFACES}, {9, sizeof(short), Mod_Load2QBSP_IBSP_LEAFFACES},
{sizeof(short), Mod_Load2QBSP_IBSP_LEAFBRUSHES}, {10, sizeof(short), Mod_Load2QBSP_IBSP_LEAFBRUSHES},
{sizeof(dedge_t), Mod_Load2QBSP_IBSP_EDGES}, {11, sizeof(dedge_t), Mod_Load2QBSP_IBSP_EDGES},
{sizeof(int), Mod_Load2QBSP_IBSP_SURFEDGES}, {12, sizeof(int), Mod_Load2QBSP_IBSP_SURFEDGES},
{sizeof(dmodel_t), Mod_Load2QBSP_IBSP_MODELS}, {13, sizeof(dmodel_t), Mod_Load2QBSP_IBSP_MODELS},
{sizeof(dbrush_t), Mod_Load2QBSP_IBSP_BRUSHES}, {14, sizeof(dbrush_t), Mod_Load2QBSP_IBSP_BRUSHES},
{sizeof(drbrushside_t), Mod_Load2QBSP_RBSP_BRUSHSIDES}, {15, sizeof(drbrushside_t), Mod_Load2QBSP_RBSP_BRUSHSIDES},
{0, NULL}, // LUMP_POP {-1, 0, NULL}, // LUMP_POP
{sizeof(darea_t), Mod_Load2QBSP_IBSP_AREAS}, {17, sizeof(darea_t), Mod_Load2QBSP_IBSP_AREAS},
{sizeof(dareaportal_t), Mod_Load2QBSP_IBSP_AREAPORTALS}, {18, sizeof(dareaportal_t), Mod_Load2QBSP_IBSP_AREAPORTALS},
}; };
static const rule_t qbsplumps[HEADER_LUMPS] = { static const rule_t qbsplumps[HEADER_LUMPS] = {
{sizeof(char), Mod_Load2QBSP_IBSP_ENTITIES}, {0, sizeof(char), Mod_Load2QBSP_IBSP_ENTITIES},
{sizeof(dplane_t), Mod_Load2QBSP_IBSP_PLANES}, {1, sizeof(dplane_t), Mod_Load2QBSP_IBSP_PLANES},
{sizeof(dvertex_t), Mod_Load2QBSP_IBSP_VERTEXES}, {2, sizeof(dvertex_t), Mod_Load2QBSP_IBSP_VERTEXES},
{sizeof(char), Mod_Load2QBSP_IBSP_VISIBILITY}, {3, sizeof(char), Mod_Load2QBSP_IBSP_VISIBILITY},
{sizeof(dqnode_t), Mod_Load2QBSP_QBSP_NODES}, {4, sizeof(dqnode_t), Mod_Load2QBSP_QBSP_NODES},
{sizeof(texinfo_t), Mod_Load2QBSP_IBSP_TEXINFO}, {5, sizeof(texinfo_t), Mod_Load2QBSP_IBSP_TEXINFO},
{sizeof(dqface_t), Mod_Load2QBSP_QBSP_FACES}, {6, sizeof(dqface_t), Mod_Load2QBSP_QBSP_FACES},
{sizeof(char), Mod_Load2QBSP_IBSP_LIGHTING}, {7, sizeof(char), Mod_Load2QBSP_IBSP_LIGHTING},
{sizeof(dqleaf_t), Mod_Load2QBSP_QBSP_LEAFS}, {8, sizeof(dqleaf_t), Mod_Load2QBSP_QBSP_LEAFS},
{sizeof(int), Mod_Load2QBSP_QBSP_LEAFFACES}, {9, sizeof(int), Mod_Load2QBSP_QBSP_LEAFFACES},
{sizeof(int), Mod_Load2QBSP_QBSP_LEAFBRUSHES}, {10, sizeof(int), Mod_Load2QBSP_QBSP_LEAFBRUSHES},
{sizeof(dqedge_t), Mod_Load2QBSP_QBSP_EDGES}, {11, sizeof(dqedge_t), Mod_Load2QBSP_QBSP_EDGES},
{sizeof(int), Mod_Load2QBSP_IBSP_SURFEDGES}, {12, sizeof(int), Mod_Load2QBSP_IBSP_SURFEDGES},
{sizeof(dmodel_t), Mod_Load2QBSP_IBSP_MODELS}, {13, sizeof(dmodel_t), Mod_Load2QBSP_IBSP_MODELS},
{sizeof(dbrush_t), Mod_Load2QBSP_IBSP_BRUSHES}, {14, sizeof(dbrush_t), Mod_Load2QBSP_IBSP_BRUSHES},
{sizeof(dqbrushside_t), Mod_Load2QBSP_QBSP_BRUSHSIDES}, {15, sizeof(dqbrushside_t), Mod_Load2QBSP_QBSP_BRUSHSIDES},
{0, NULL}, // LUMP_POP {-1, 0, NULL}, // LUMP_POP
{sizeof(darea_t), Mod_Load2QBSP_IBSP_AREAS}, {17, sizeof(darea_t), Mod_Load2QBSP_IBSP_AREAS},
{sizeof(dareaportal_t), Mod_Load2QBSP_IBSP_AREAPORTALS}, {18, sizeof(dareaportal_t), Mod_Load2QBSP_IBSP_AREAPORTALS},
}; };
/* custom format with extended texture name */ /* custom format with extended texture name */
static const rule_t xbsplumps[HEADER_LUMPS] = { static const rule_t xbsplumps[HEADER_LUMPS] = {
{sizeof(char), Mod_Load2QBSP_IBSP_ENTITIES}, {0, sizeof(char), Mod_Load2QBSP_IBSP_ENTITIES},
{sizeof(dplane_t), Mod_Load2QBSP_IBSP_PLANES}, {1, sizeof(dplane_t), Mod_Load2QBSP_IBSP_PLANES},
{sizeof(dvertex_t), Mod_Load2QBSP_IBSP_VERTEXES}, {2, sizeof(dvertex_t), Mod_Load2QBSP_IBSP_VERTEXES},
{sizeof(char), Mod_Load2QBSP_IBSP_VISIBILITY}, {3, sizeof(char), Mod_Load2QBSP_IBSP_VISIBILITY},
{sizeof(dqnode_t), Mod_Load2QBSP_QBSP_NODES}, {4, sizeof(dqnode_t), Mod_Load2QBSP_QBSP_NODES},
{sizeof(xtexinfo_t), Mod_Load2QBSP_IBSP_TEXINFO}, {5, sizeof(xtexinfo_t), Mod_Load2QBSP_IBSP_TEXINFO},
{sizeof(dqface_t), Mod_Load2QBSP_QBSP_FACES}, {6, sizeof(dqface_t), Mod_Load2QBSP_QBSP_FACES},
{sizeof(char), Mod_Load2QBSP_IBSP_LIGHTING}, {7, sizeof(char), Mod_Load2QBSP_IBSP_LIGHTING},
{sizeof(dqleaf_t), Mod_Load2QBSP_QBSP_LEAFS}, {8, sizeof(dqleaf_t), Mod_Load2QBSP_QBSP_LEAFS},
{sizeof(int), Mod_Load2QBSP_QBSP_LEAFFACES}, {9, sizeof(int), Mod_Load2QBSP_QBSP_LEAFFACES},
{sizeof(int), Mod_Load2QBSP_QBSP_LEAFBRUSHES}, {10, sizeof(int), Mod_Load2QBSP_QBSP_LEAFBRUSHES},
{sizeof(dqedge_t), Mod_Load2QBSP_QBSP_EDGES}, {11, sizeof(dqedge_t), Mod_Load2QBSP_QBSP_EDGES},
{sizeof(int), Mod_Load2QBSP_IBSP_SURFEDGES}, {12, sizeof(int), Mod_Load2QBSP_IBSP_SURFEDGES},
{sizeof(dmodel_t), Mod_Load2QBSP_IBSP_MODELS}, {13, sizeof(dmodel_t), Mod_Load2QBSP_IBSP_MODELS},
{sizeof(dbrush_t), Mod_Load2QBSP_IBSP_BRUSHES}, {14, sizeof(dbrush_t), Mod_Load2QBSP_IBSP_BRUSHES},
{sizeof(dqbrushside_t), Mod_Load2QBSP_QBSP_BRUSHSIDES}, {15, sizeof(dqbrushside_t), Mod_Load2QBSP_QBSP_BRUSHSIDES},
{0, NULL}, // LUMP_POP {-1, 0, NULL}, // LUMP_POP
{sizeof(darea_t), Mod_Load2QBSP_IBSP_AREAS}, {17, sizeof(darea_t), Mod_Load2QBSP_IBSP_AREAS},
{sizeof(dareaportal_t), Mod_Load2QBSP_IBSP_AREAPORTALS}, {18, sizeof(dareaportal_t), Mod_Load2QBSP_IBSP_AREAPORTALS},
}; };
static const char* static const char*
@ -1086,7 +1087,7 @@ Mod_LoadGetRules(const dheader_t *header, const rule_t **rules, int *numlumps, i
} }
else else
{ {
*rules = idbsplumps; *rules = idq2bsplumps;
} }
*numrules = HEADER_LUMPS; *numrules = HEADER_LUMPS;
@ -1096,7 +1097,7 @@ Mod_LoadGetRules(const dheader_t *header, const rule_t **rules, int *numlumps, i
} }
else if (header->version == BSPVERSION) else if (header->version == BSPVERSION)
{ {
*rules = idbsplumps; *rules = idq2bsplumps;
*numrules = *numlumps = HEADER_LUMPS; *numrules = *numlumps = HEADER_LUMPS;
return map_quake2rr; return map_quake2rr;
} }
@ -1160,20 +1161,24 @@ Mod_Load2QBSP(const char *name, byte *inbuf, size_t filesize, size_t *out_len,
error = true; error = true;
} }
result_size += ( if (rules[s].pos >= 0)
xbsplumps[s].size * header->lumps[s].filelen / rules[s].size {
); result_size += (
xbsplumps[rules[s].pos].size * header->lumps[s].filelen / rules[s].size
);
}
} }
} }
} }
Com_Printf("Map %s %c%c%c%c with version %d (%s)\n", Com_Printf("Map %s %c%c%c%c with version %d (%s): " YQ2_COM_PRIdS " bytes\n",
name, name,
(header->ident >> 0) & 0xFF, (header->ident >> 0) & 0xFF,
(header->ident >> 8) & 0xFF, (header->ident >> 8) & 0xFF,
(header->ident >> 16) & 0xFF, (header->ident >> 16) & 0xFF,
(header->ident >> 24) & 0xFF, (header->ident >> 24) & 0xFF,
header->version, Mod_MaptypeName(*maptype)); header->version, Mod_MaptypeName(*maptype),
result_size);
if (error || !rules) if (error || !rules)
{ {

2
src/common/collision.c
View file

@ -2141,7 +2141,7 @@ CM_LoadFile(const char *path, void **buffer)
} }
} }
Com_Printf("%s: render asked about '%s' but have loaded it yet?\n", Com_Printf("%s: render asked about '%s' but have not loaded it yet?\n",
__func__, path); __func__, path);
return -1; return -1;
} }

3
src/common/header/files.h
View file

@ -681,7 +681,6 @@ typedef struct
#define LUMP_AREAS 17 #define LUMP_AREAS 17
#define LUMP_AREAPORTALS 18 #define LUMP_AREAPORTALS 18
#define HEADER_LUMPS 19 #define HEADER_LUMPS 19
#define HEADER_DKLUMPS 21
typedef struct typedef struct
{ {
@ -955,6 +954,7 @@ typedef struct
/* Daikatana */ /* Daikatana */
#define BSPDKMVERSION 41 #define BSPDKMVERSION 41
#define HEADER_DKLUMPS 21
/* Leafs struct */ /* Leafs struct */
typedef struct typedef struct
@ -1078,6 +1078,5 @@ typedef struct
int ofs_end; // end of file int ofs_end; // end of file
} sin_sam_header_t; } sin_sam_header_t;
#endif #endif