stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-29 20:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some minor cleanup

Browse source
This commit is contained in:
MascaraSnake 2020-01-10 19:56:29 +01:00
parent 641ac72b3f
commit ba7a1c0375
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_setup.c
View file

@ -3578,7 +3578,7 @@ boolean P_LoadLevel(boolean fromnetsave)
return false; return false;
// init gravity, tag lists, // init gravity, tag lists,
// anything that P_ResetDynamicSlopes/P_LoadThings needs to know // anything that P_SpawnSlopes/P_LoadThings needs to know
P_InitSpecials(); P_InitSpecials();
#ifdef ESLOPE #ifdef ESLOPE

19
src/p_slopes.c
View file

@ -508,7 +508,7 @@ static void line_SpawnViaVertexes(const int linenum, const boolean spawnthinker)
} }
/// Spawn textmap vertex slopes. /// Spawn textmap vertex slopes.
static void SpawnVertexSlopes (void) static void SpawnVertexSlopes(void)
{ {
line_t *l1, *l2; line_t *l1, *l2;
sector_t* sc; sector_t* sc;
@ -534,10 +534,10 @@ static void SpawnVertexSlopes (void)
if (v1->floorzset || v2->floorzset || v3->floorzset) if (v1->floorzset || v2->floorzset || v3->floorzset)
{ {
vector3_t vtx[3] = { vector3_t vtx[3] = {
{v1->x, v1->y, v1->floorzset == true ? v1->floorz : sc->floorheight}, {v1->x, v1->y, v1->floorzset ? v1->floorz : sc->floorheight},
{v2->x, v2->y, v2->floorzset == true ? v2->floorz : sc->floorheight}, {v2->x, v2->y, v2->floorzset ? v2->floorz : sc->floorheight},
{v3->x, v3->y, v3->floorzset == true ? v3->floorz : sc->floorheight}}; {v3->x, v3->y, v3->floorzset ? v3->floorz : sc->floorheight}};
pslope_t* slop = Slope_Add(0); pslope_t *slop = Slope_Add(0);
sc->f_slope = slop; sc->f_slope = slop;
sc->hasslope = true; sc->hasslope = true;
ReconfigureViaVertexes(slop, vtx[0], vtx[1], vtx[2]); ReconfigureViaVertexes(slop, vtx[0], vtx[1], vtx[2]);
@ -546,15 +546,14 @@ static void SpawnVertexSlopes (void)
if (v1->ceilingzset || v2->ceilingzset || v3->ceilingzset) if (v1->ceilingzset || v2->ceilingzset || v3->ceilingzset)
{ {
vector3_t vtx[3] = { vector3_t vtx[3] = {
{v1->x, v1->y, v1->ceilingzset == true ? v1->ceilingz : sc->ceilingheight}, {v1->x, v1->y, v1->ceilingzset ? v1->ceilingz : sc->ceilingheight},
{v2->x, v2->y, v2->ceilingzset == true ? v2->ceilingz : sc->ceilingheight}, {v2->x, v2->y, v2->ceilingzset ? v2->ceilingz : sc->ceilingheight},
{v3->x, v3->y, v3->ceilingzset == true ? v3->ceilingz : sc->ceilingheight}}; {v3->x, v3->y, v3->ceilingzset ? v3->ceilingz : sc->ceilingheight}};
pslope_t* slop = Slope_Add(0); pslope_t *slop = Slope_Add(0);
sc->c_slope = slop; sc->c_slope = slop;
sc->hasslope = true; sc->hasslope = true;
ReconfigureViaVertexes(slop, vtx[0], vtx[1], vtx[2]); ReconfigureViaVertexes(slop, vtx[0], vtx[1], vtx[2]);
} }
} }
} }

2
src/p_spec.c
View file

@ -6353,7 +6353,7 @@ static void P_RunLevelLoadExecutors(void)
} }
/** Before things are loaded, initialises certain stuff in case they're needed /** Before things are loaded, initialises certain stuff in case they're needed
* by P_ResetDynamicSlopes or P_LoadThings. This was split off from * by P_SpawnSlopes or P_LoadThings. This was split off from
* P_SpawnSpecials, in case you couldn't tell. * P_SpawnSpecials, in case you couldn't tell.
* *
* \sa P_SpawnSpecials, P_InitTagLists * \sa P_SpawnSpecials, P_InitTagLists