From bb517b73e33558daca184d6bb15c5ea1c401e45c Mon Sep 17 00:00:00 2001 From: terminx Date: Thu, 18 Apr 2019 17:24:01 +0000 Subject: [PATCH] clip.cpp usectortype cleanup git-svn-id: https://svn.eduke32.com/eduke32@7585 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/build/src/clip.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/build/src/clip.cpp b/source/build/src/clip.cpp index 238dfdaf0..c4032db01 100644 --- a/source/build/src/clip.cpp +++ b/source/build/src/clip.cpp @@ -1088,7 +1088,7 @@ int32_t clipmove(vec3_t * const pos, int16_t * const sectnum, int32_t xvect, int { if (wal->nextsector>=0) { - const usectortype *sec2 = (usectortype *)§or[wal->nextsector]; + auto const sec2 = (usectortype *)§or[wal->nextsector]; clipmove_tweak_pos(pos, diff.x, diff.y, p1.x, p1.y, p2.x, p2.y, &v.x, &v.y); @@ -1141,7 +1141,7 @@ int32_t clipmove(vec3_t * const pos, int16_t * const sectnum, int32_t xvect, int if (clipyou == 0) { - const usectortype *sec2 = (usectortype *)§or[wal->nextsector]; + auto const sec2 = (usectortype *)§or[wal->nextsector]; int32_t daz2 = getceilzofslope(wal->nextsector, v.x, v.y); clipyou = ((sec2->ceilingstat&1) == 0 && @@ -1460,7 +1460,7 @@ int32_t pushmove(vec3_t * const vect, int16_t * const sectnum, if (wal->cstat&dawalclipmask) j = 1; if (j == 0) { - const usectortype *const sec2 = (usectortype *)§or[wal->nextsector]; + auto const sec2 = (usectortype *)§or[wal->nextsector]; int32_t daz2; //Find closest point on wall (dax, day) to (vect->x, vect->y) @@ -1622,7 +1622,7 @@ restart_grand: #endif ////////// Walls ////////// - const sectortype *const startsec = §or[clipsectorlist[clipsectcnt]]; + auto const startsec = (usectortype *)§or[clipsectorlist[clipsectcnt]]; const int startwall = startsec->wallptr; const int endwall = startwall + startsec->wallnum; @@ -1649,7 +1649,7 @@ restart_grand: continue; if (wall[j].cstat&dawalclipmask) continue; // XXX? - const sectortype *const sec = §or[k]; + auto const sec = (usectortype *)§or[k]; #ifdef HAVE_CLIPSHAPE_FEATURE if (curspr) @@ -2141,7 +2141,7 @@ restart_grand: } #endif dasector = clipsectorlist[tempshortcnt]; - auto const * sec = (usectortype *)§or[dasector]; + auto const sec = (usectortype *)§or[dasector]; i = 1; #ifdef HAVE_CLIPSHAPE_FEATURE