mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-01-18 07:22:28 +00:00
-Set defaults for vertex and mapthing fields in textmap
-Fix P_InitializeSector being called too early (band-aid fix for now, will reorganize this properly later)
This commit is contained in:
parent
05a97530c1
commit
013f1f70d9
1 changed files with 20 additions and 8 deletions
|
@ -865,11 +865,6 @@ static void P_InitializeSector(sector_t *ss)
|
||||||
ss->lightingdata = NULL;
|
ss->lightingdata = NULL;
|
||||||
ss->fadecolormapdata = NULL;
|
ss->fadecolormapdata = NULL;
|
||||||
|
|
||||||
ss->floor_xoffs = ss->floor_yoffs = 0;
|
|
||||||
ss->ceiling_xoffs = ss->ceiling_yoffs = 0;
|
|
||||||
|
|
||||||
ss->floorpic_angle = ss->ceilingpic_angle = 0;
|
|
||||||
|
|
||||||
ss->heightsec = -1;
|
ss->heightsec = -1;
|
||||||
ss->camsec = -1;
|
ss->camsec = -1;
|
||||||
|
|
||||||
|
@ -945,6 +940,11 @@ static void P_LoadSectors(UINT8 *data)
|
||||||
ss->special = SHORT(ms->special);
|
ss->special = SHORT(ms->special);
|
||||||
ss->tag = SHORT(ms->tag);
|
ss->tag = SHORT(ms->tag);
|
||||||
|
|
||||||
|
ss->floor_xoffs = ss->floor_yoffs = 0;
|
||||||
|
ss->ceiling_xoffs = ss->ceiling_yoffs = 0;
|
||||||
|
|
||||||
|
ss->floorpic_angle = ss->ceilingpic_angle = 0;
|
||||||
|
|
||||||
P_InitializeSector(ss);
|
P_InitializeSector(ss);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1235,6 +1235,8 @@ static void P_LoadThings(UINT8 *data)
|
||||||
mt->z = mt->options; // NiGHTS Hoops use the full flags bits to set the height.
|
mt->z = mt->options; // NiGHTS Hoops use the full flags bits to set the height.
|
||||||
else
|
else
|
||||||
mt->z = mt->options >> ZSHIFT;
|
mt->z = mt->options >> ZSHIFT;
|
||||||
|
|
||||||
|
mt->mobj = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1529,7 +1531,7 @@ static void P_LoadTextmap(void)
|
||||||
for (i = 0, vt = vertexes; i < numvertexes; i++, vt++)
|
for (i = 0, vt = vertexes; i < numvertexes; i++, vt++)
|
||||||
{
|
{
|
||||||
// Defaults.
|
// Defaults.
|
||||||
vt->z = 0;
|
vt->x = vt->y = vt->z = 0;
|
||||||
|
|
||||||
TextmapParse(vertexesPos[i], i, ParseTextmapVertexParameter);
|
TextmapParse(vertexesPos[i], i, ParseTextmapVertexParameter);
|
||||||
}
|
}
|
||||||
|
@ -1548,8 +1550,13 @@ static void P_LoadTextmap(void)
|
||||||
sc->special = 0;
|
sc->special = 0;
|
||||||
sc->tag = 0;
|
sc->tag = 0;
|
||||||
|
|
||||||
P_InitializeSector(sc);
|
sc->floor_xoffs = sc->floor_yoffs = 0;
|
||||||
|
sc->ceiling_xoffs = sc->ceiling_yoffs = 0;
|
||||||
|
|
||||||
|
sc->floorpic_angle = sc->ceilingpic_angle = 0;
|
||||||
|
|
||||||
TextmapParse(sectorsPos[i], i, ParseTextmapSectorParameter);
|
TextmapParse(sectorsPos[i], i, ParseTextmapSectorParameter);
|
||||||
|
P_InitializeSector(sc);
|
||||||
TextmapFixFlatOffsets(sc);
|
TextmapFixFlatOffsets(sc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1582,8 +1589,13 @@ static void P_LoadTextmap(void)
|
||||||
for (i = 0, mt = mapthings; i < nummapthings; i++, mt++)
|
for (i = 0, mt = mapthings; i < nummapthings; i++, mt++)
|
||||||
{
|
{
|
||||||
// Defaults.
|
// Defaults.
|
||||||
mt->z = 0;
|
mt->x = mt->y = 0;
|
||||||
mt->angle = 0;
|
mt->angle = 0;
|
||||||
|
mt->type = 0;
|
||||||
|
mt->options = 0;
|
||||||
|
mt->z = 0;
|
||||||
|
mt->extrainfo = 0;
|
||||||
|
mt->mobj = NULL;
|
||||||
|
|
||||||
TextmapParse(mapthingsPos[i], i, ParseTextmapThingParameter);
|
TextmapParse(mapthingsPos[i], i, ParseTextmapThingParameter);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue