lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Standardize P_LoadVertices and P_LoadSidedefs

Browse source
This commit is contained in:
MascaraSnake 2019-12-28 16:58:48 +01:00
parent 86d1fb73f4
commit 85de3614cb
1 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/p_setup.c
View file

@ -835,15 +835,15 @@ void P_WriteThings(lumpnum_t lumpnum)
static void P_LoadVertices(UINT8 *data) static void P_LoadVertices(UINT8 *data)
{ {
mapvertex_t *ml = (mapvertex_t *)data; mapvertex_t *mv = (mapvertex_t *)data;
vertex_t *li = vertexes; vertex_t *v = vertexes;
size_t i; size_t i;
// Copy and convert vertex coordinates, internal representation as fixed. // Copy and convert vertex coordinates, internal representation as fixed.
for (i = 0; i < numvertexes; i++, li++, ml++) for (i = 0; i < numvertexes; i++, v++, mv++)
{ {
li->x = SHORT(ml->x)<<FRACBITS; v->x = SHORT(mv->x)<<FRACBITS;
li->y = SHORT(ml->y)<<FRACBITS; v->y = SHORT(mv->y)<<FRACBITS;
} }
} }
@ -1035,36 +1035,32 @@ static void P_SetupLines(void)
static void P_LoadSidedefs(UINT8 *data) static void P_LoadSidedefs(UINT8 *data)
{ {
UINT16 i; mapsidedef_t *msd = (mapsidedef_t*)data;
side_t *sd = sides;
size_t i;
for (i = 0; i < numsides; i++) for (i = 0; i < numsides; i++, sd++, msd++)
{ {
register mapsidedef_t *msd = (mapsidedef_t *)data + i; UINT16 sector_num;
register side_t *sd = sides + i;
register sector_t *sec;
sd->textureoffset = SHORT(msd->textureoffset)<<FRACBITS; sd->textureoffset = SHORT(msd->textureoffset)<<FRACBITS;
sd->rowoffset = SHORT(msd->rowoffset)<<FRACBITS; sd->rowoffset = SHORT(msd->rowoffset)<<FRACBITS;
{ /* cph 2006/09/30 - catch out-of-range sector numbers; use sector 0 instead */ // cph 2006/09/30 - catch out-of-range sector numbers; use sector 0 instead
UINT16 sector_num = SHORT(msd->sector); sector_num = SHORT(msd->sector);
if (sector_num >= numsectors)
if (sector_num >= numsectors) {
{ CONS_Debug(DBG_SETUP, "P_LoadSidedefs: sidedef %u has out-of-range sector num %u\n", i, sector_num);
CONS_Debug(DBG_SETUP, "P_LoadSidedefs: sidedef %u has out-of-range sector num %u\n", i, sector_num); sector_num = 0;
sector_num = 0;
}
sd->sector = sec = &sectors[sector_num];
} }
sd->sector = &sectors[sector_num];
sd->sector = sec = &sectors[SHORT(msd->sector)];
sd->colormap_data = NULL; sd->colormap_data = NULL;
// Colormaps! // Special info stored in texture fields!
switch (sd->special) switch (sd->special)
{ {
case 63: // variable colormap via 242 linedef case 63: // Fake floor/ceiling planes
case 606: //SoM: 4/4/2000: Just colormap transfer case 606: //SoM: 4/4/2000: Just colormap transfer
case 447: // Change colormap of tagged sectors! -- Monster Iestyn 14/06/18 case 447: // Change colormap of tagged sectors! -- Monster Iestyn 14/06/18
case 455: // Fade colormaps! mazmazz 9/12/2018 (:flag_us:) case 455: // Fade colormaps! mazmazz 9/12/2018 (:flag_us:)