From 4ad4f9ebb7bc1405ebb0a52fe28d9a2ebc464b88 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sat, 29 Dec 2012 15:21:20 +0000 Subject: [PATCH] Remove commented code using former engine variable "automapping". git-svn-id: https://svn.eduke32.com/eduke32@3342 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/include/build.h | 4 ---- polymer/eduke32/build/src/engine.c | 10 ---------- polymer/eduke32/build/src/polymost.c | 1 - polymer/eduke32/source/premap.c | 2 -- 4 files changed, 17 deletions(-) diff --git a/polymer/eduke32/build/include/build.h b/polymer/eduke32/build/include/build.h index de4dd96d0..05494d264 100644 --- a/polymer/eduke32/build/include/build.h +++ b/polymer/eduke32/build/include/build.h @@ -517,14 +517,10 @@ EXTERN int32_t windowpos, windowx, windowy; //And if you want draw2dscreen() to not show sprite #54 then you say: // spritenum = 54; // show2dsprite[spritenum>>3] &= ~(1<<(spritenum&7)); - //Automapping defaults to 0 (do nothing). If you set automapping to 1, - // then in 3D mode, the walls and sprites that you see will show up the - // next time you flip to 2D mode. EXTERN char show2dsector[(MAXSECTORS+7)>>3]; EXTERN char show2dwall[(MAXWALLS+7)>>3]; EXTERN char show2dsprite[(MAXSPRITES+7)>>3]; -//EXTERN char automapping; // In the editor, gotpic is only referenced from inline assembly; // the compiler needs that hint or building with LTO will discard it. diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index fa3c9b7b0..dc9fa198c 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -2505,8 +2505,6 @@ static void scansector(int16_t sectnum) if (sectnum < 0) return; -// if (automapping) show2dsector[sectnum>>3] |= pow2char[sectnum&7]; - sectorborder[0] = sectnum, sectorbordercnt = 1; do { @@ -6387,7 +6385,6 @@ draw_as_face_sprite: #endif drawvox(tspr->x,tspr->y,tspr->z,i,daxrepeat,(int32_t)tspr->yrepeat,vtilenum,tspr->shade,tspr->pal,lwall,swall); } -// if (automapping == 1) show2dsprite[spritenum>>3] |= pow2char[spritenum&7]; } @@ -8365,7 +8362,6 @@ int32_t initengine(void) clearbuf(&show2dsprite[0],(int32_t)((MAXSPRITES+3)>>5),0L); clearbuf(&show2dwall[0],(int32_t)((MAXWALLS+3)>>5),0L); */ -// automapping = 0; totalclock = 0; g_visibility = 512; @@ -8720,12 +8716,6 @@ int32_t drawrooms(int32_t daposx, int32_t daposy, int32_t daposz, drawalls(closest); -// if (automapping) -// { -// for (z=bunchfirst[closest]; z>=0; z=p2[z]) -// show2dwall[thewall[z]>>3] |= pow2char[thewall[z]&7]; -// } - numbunches--; bunchfirst[closest] = bunchfirst[numbunches]; bunchlast[closest] = bunchlast[numbunches]; diff --git a/polymer/eduke32/build/src/polymost.c b/polymer/eduke32/build/src/polymost.c index 4b9289dc3..fe4b7a92f 100644 --- a/polymer/eduke32/build/src/polymost.c +++ b/polymer/eduke32/build/src/polymost.c @@ -4232,7 +4232,6 @@ void polymost_scansector(int32_t sectnum) int32_t xs, ys, x1, y1, x2, y2; if (sectnum < 0) return; -// if (automapping) show2dsector[sectnum>>3] |= pow2char[sectnum&7]; sectorborder[0] = sectnum, sectorbordercnt = 1; do diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c index bae3ffac3..9cf005312 100644 --- a/polymer/eduke32/source/premap.c +++ b/polymer/eduke32/source/premap.c @@ -1947,8 +1947,6 @@ int32_t G_EnterLevel(int32_t g) G_AlignWarpElevators(); resetpspritevars(g); -// automapping = 0; - G_FadeLoad(0,0,0, 63,0, -7, 4); G_CacheMapData(); G_FadeLoad(0,0,0, 0,63, 7, 4);