From 649b6c9ca19648602996f2fae9c86cd0c301342b Mon Sep 17 00:00:00 2001
From: MPC <lazymyuutsu@gmail.com>
Date: Wed, 12 Dec 2018 18:53:13 -0300
Subject: [PATCH] Remove MINIAUTOMAP code

---
 src/am_map.c | 14 ++------------
 src/am_map.h |  3 ---
 src/d_main.c | 19 ++-----------------
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/src/am_map.c b/src/am_map.c
index ee6900179..36fd69e94 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -365,12 +365,6 @@ static void AM_LevelInit(void)
 	f_w = vid.width;
 	f_h = vid.height;
 
-	// Jimita
-#ifdef MINIAUTOMAP
-	f_x = f_w / 2;
-	f_y = f_h / 2;
-#endif
-
 	AM_drawFline = AM_drawFline_soft;
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
@@ -757,7 +751,6 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
 #endif
 
 	#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;
 	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;
 		for (;;)
 		{
-			if (CLIPDOT)
-				PUTDOT(x, y, color)
+			PUTDOT(x, y, color)
 			if (x == fl->b.x)
 				return;
 			if (d >= 0)
@@ -793,8 +785,7 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
 		d = ax - ay/2;
 		for (;;)
 		{
-			if (CLIPDOT)
-				PUTDOT(x, y, color)
+			PUTDOT(x, y, color)
 			if (y == fl->b.y)
 				return;
 			if (d >= 0)
@@ -807,7 +798,6 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
 		}
 	}
 
-	#undef CLIPDOT
 	#undef PUTDOT
 }
 
diff --git a/src/am_map.h b/src/am_map.h
index bd4221fb1..4e8c782a9 100644
--- a/src/am_map.h
+++ b/src/am_map.h
@@ -31,9 +31,6 @@ typedef struct
 #define AM_MSGENTERED (AM_MSGHEADER | ('e'<<8))
 #define AM_MSGEXITED (AM_MSGHEADER | ('x'<<8))
 
-// Jimita
-//#define MINIAUTOMAP
-
 extern boolean am_recalc; // true if screen size changes
 extern boolean automapactive; // In AutoMap mode?
 
diff --git a/src/d_main.c b/src/d_main.c
index 773ff91bb..df422232e 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -319,6 +319,7 @@ static void D_Display(void)
 			if (!gametic)
 				break;
 			HU_Erase();
+			AM_Drawer();
 			break;
 
 		case GS_INTERMISSION:
@@ -375,19 +376,7 @@ static void D_Display(void)
 	if (gamestate == GS_LEVEL)
 	{
 		// draw the view directly
-		boolean dorenderview = cv_renderview.value;
-		boolean dorenderautomap = false;
-
-		// Jimita
-		if (automapactive)
-		{
-			dorenderautomap = true;
-#ifndef MINIAUTOMAP
-			dorenderview = false;
-#endif
-		}
-
-		if (dorenderview)
+		if (cv_renderview.value && !automapactive)
 		{
 			if (players[displayplayer].mo || players[displayplayer].playerstate == PST_DEAD)
 			{
@@ -444,10 +433,6 @@ static void D_Display(void)
 			lastdraw = false;
 		}
 
-		// Jimita
-		if (dorenderautomap)
-			AM_Drawer();
-
 		ST_Drawer();
 		HU_Drawer();
 	}