lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove MINIAUTOMAP code

This commit is contained in:
MPC 2018-12-12 18:53:13 -03:00
parent 6b22dc183b
commit 649b6c9ca1
3 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/am_map.c
View File

@ -365,12 +365,6 @@ static void AM_LevelInit(void)
f_w = vid.width; f_w = vid.width;
f_h = vid.height; f_h = vid.height;
// Jimita
#ifdef MINIAUTOMAP
f_x = f_w / 2;
f_y = f_h / 2;
#endif
AM_drawFline = AM_drawFline_soft; AM_drawFline = AM_drawFline_soft;
#ifdef HWRENDER #ifdef HWRENDER
if (rendermode == render_opengl) if (rendermode == render_opengl)
@ -757,7 +751,6 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
#endif #endif
#define PUTDOT(xx,yy,cc) V_DrawFill(xx,yy,1,1,cc|V_NOSCALESTART); #define PUTDOT(xx,yy,cc) V_DrawFill(xx,yy,1,1,cc|V_NOSCALESTART);
#define CLIPDOT (x >= f_x && y >= f_y && x < f_x + f_w && y < f_y + f_h)
dx = fl->b.x - fl->a.x; dx = fl->b.x - fl->a.x;
ax = 2 * (dx < 0 ? -dx : dx); ax = 2 * (dx < 0 ? -dx : dx);
@ -775,8 +768,7 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
d = ay - ax/2; d = ay - ax/2;
for (;;) for (;;)
{ {
if (CLIPDOT) PUTDOT(x, y, color)
PUTDOT(x, y, color)
if (x == fl->b.x) if (x == fl->b.x)
return; return;
if (d >= 0) if (d >= 0)
@ -793,8 +785,7 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
d = ax - ay/2; d = ax - ay/2;
for (;;) for (;;)
{ {
if (CLIPDOT) PUTDOT(x, y, color)
PUTDOT(x, y, color)
if (y == fl->b.y) if (y == fl->b.y)
return; return;
if (d >= 0) if (d >= 0)
@ -807,7 +798,6 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
} }
} }
#undef CLIPDOT
#undef PUTDOT #undef PUTDOT
} }

3
src/am_map.h
View File

@ -31,9 +31,6 @@ typedef struct
#define AM_MSGENTERED (AM_MSGHEADER | ('e'<<8)) #define AM_MSGENTERED (AM_MSGHEADER | ('e'<<8))
#define AM_MSGEXITED (AM_MSGHEADER | ('x'<<8)) #define AM_MSGEXITED (AM_MSGHEADER | ('x'<<8))
// Jimita
//#define MINIAUTOMAP
extern boolean am_recalc; // true if screen size changes extern boolean am_recalc; // true if screen size changes
extern boolean automapactive; // In AutoMap mode? extern boolean automapactive; // In AutoMap mode?

19
src/d_main.c
View File

@ -319,6 +319,7 @@ static void D_Display(void)
if (!gametic) if (!gametic)
break; break;
HU_Erase(); HU_Erase();
AM_Drawer();
break; break;
case GS_INTERMISSION: case GS_INTERMISSION:
@ -375,19 +376,7 @@ static void D_Display(void)
if (gamestate == GS_LEVEL) if (gamestate == GS_LEVEL)
{ {
// draw the view directly // draw the view directly
boolean dorenderview = cv_renderview.value; if (cv_renderview.value && !automapactive)
boolean dorenderautomap = false;
// Jimita
if (automapactive)
{
dorenderautomap = true;
#ifndef MINIAUTOMAP
dorenderview = false;
#endif
}
if (dorenderview)
{ {
if (players[displayplayer].mo || players[displayplayer].playerstate == PST_DEAD) if (players[displayplayer].mo || players[displayplayer].playerstate == PST_DEAD)
{ {
@ -444,10 +433,6 @@ static void D_Display(void)
lastdraw = false; lastdraw = false;
} }
// Jimita
if (dorenderautomap)
AM_Drawer();
ST_Drawer(); ST_Drawer();
HU_Drawer(); HU_Drawer();
} }