diff --git a/src/p_setup.c b/src/p_setup.c index a2872cf4b..f1b12b2f9 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -3578,7 +3578,7 @@ boolean P_LoadLevel(boolean fromnetsave) return false; // init gravity, tag lists, - // anything that P_ResetDynamicSlopes/P_LoadThings needs to know + // anything that P_SpawnSlopes/P_LoadThings needs to know P_InitSpecials(); #ifdef ESLOPE diff --git a/src/p_slopes.c b/src/p_slopes.c index 13b283af6..18489c65e 100644 --- a/src/p_slopes.c +++ b/src/p_slopes.c @@ -508,7 +508,7 @@ static void line_SpawnViaVertexes(const int linenum, const boolean spawnthinker) } /// Spawn textmap vertex slopes. -static void SpawnVertexSlopes (void) +static void SpawnVertexSlopes(void) { line_t *l1, *l2; sector_t* sc; @@ -534,10 +534,10 @@ static void SpawnVertexSlopes (void) if (v1->floorzset || v2->floorzset || v3->floorzset) { vector3_t vtx[3] = { - {v1->x, v1->y, v1->floorzset == true ? v1->floorz : sc->floorheight}, - {v2->x, v2->y, v2->floorzset == true ? v2->floorz : sc->floorheight}, - {v3->x, v3->y, v3->floorzset == true ? v3->floorz : sc->floorheight}}; - pslope_t* slop = Slope_Add(0); + {v1->x, v1->y, v1->floorzset ? v1->floorz : sc->floorheight}, + {v2->x, v2->y, v2->floorzset ? v2->floorz : sc->floorheight}, + {v3->x, v3->y, v3->floorzset ? v3->floorz : sc->floorheight}}; + pslope_t *slop = Slope_Add(0); sc->f_slope = slop; sc->hasslope = true; ReconfigureViaVertexes(slop, vtx[0], vtx[1], vtx[2]); @@ -546,15 +546,14 @@ static void SpawnVertexSlopes (void) if (v1->ceilingzset || v2->ceilingzset || v3->ceilingzset) { vector3_t vtx[3] = { - {v1->x, v1->y, v1->ceilingzset == true ? v1->ceilingz : sc->ceilingheight}, - {v2->x, v2->y, v2->ceilingzset == true ? v2->ceilingz : sc->ceilingheight}, - {v3->x, v3->y, v3->ceilingzset == true ? v3->ceilingz : sc->ceilingheight}}; - pslope_t* slop = Slope_Add(0); + {v1->x, v1->y, v1->ceilingzset ? v1->ceilingz : sc->ceilingheight}, + {v2->x, v2->y, v2->ceilingzset ? v2->ceilingz : sc->ceilingheight}, + {v3->x, v3->y, v3->ceilingzset ? v3->ceilingz : sc->ceilingheight}}; + pslope_t *slop = Slope_Add(0); sc->c_slope = slop; sc->hasslope = true; ReconfigureViaVertexes(slop, vtx[0], vtx[1], vtx[2]); } - } } diff --git a/src/p_spec.c b/src/p_spec.c index 00a71602b..75cdb0cf1 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -6353,7 +6353,7 @@ static void P_RunLevelLoadExecutors(void) } /** 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. * * \sa P_SpawnSpecials, P_InitTagLists