From 09197ee12fc70cfd85a830afc5a6a42a0edb6052 Mon Sep 17 00:00:00 2001
From: Ben Lankamp <b.lankamp@infoplaza.nl>
Date: Sat, 20 Jun 2020 11:48:49 +0200
Subject: [PATCH] * Added arrow keys * Fixed position of radar button

---
 code/REDALERT/RADAR.CPP      | 30 +++++++++---------------------
 code/REDALERT/SIDEBAR.CPP    |  2 +-
 code/REDALERT/io/UserInput.h |  5 +++++
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/code/REDALERT/RADAR.CPP b/code/REDALERT/RADAR.CPP
index a8dd0d4..2c40ad3 100644
--- a/code/REDALERT/RADAR.CPP
+++ b/code/REDALERT/RADAR.CPP
@@ -148,35 +148,23 @@ RadarClass::RadarClass(void) :
 void RadarClass::One_Time(void)
 {
 	RadWidth		= 80 * RESFACTOR;
-	RadHeight 	= 70 * RESFACTOR;
+	RadHeight 		= 70 * RESFACTOR;
 	RadX 			= SeenBuff.Get_Width() - RadWidth;
 	RadY 			= 7 * RESFACTOR;
-	RadPWidth 	= 64 * RESFACTOR;
-	RadPHeight 	= 64 * RESFACTOR;
-	#ifdef WIN32
-		RadOffX 		= 6;
-		RadOffY 		= 7;
-		RadIWidth 	= 128+18;//************
-		RadIHeight	= 128+2;//************
-	#else
-		RadOffX 		= 4;
-		RadOffY 		= 1;
-		RadIWidth 	= 72;
-		RadIHeight	= 69;
-	#endif
+	RadPWidth 		= 64 * RESFACTOR;
+	RadPHeight 		= 64 * RESFACTOR;
+
+	RadOffX 		= 6;
+	RadOffY 		= 7;
+	RadIWidth 		= 128+18;//************
+	RadIHeight		= 128+2;//************
 
 	DisplayClass::One_Time();
-#ifdef OBSOLETE
-	RadarButton.X			= RadX+RadOffX;
-	RadarButton.Y 			= RadY+RadOffY;
-	RadarButton.Width 	= RadIWidth;
-	RadarButton.Height 	= RadIHeight;
-#else
+
 	RadarButton.X			= RadX;
 	RadarButton.Y 			= RadY;
 	RadarButton.Width 	= RadWidth;
 	RadarButton.Height 	= RadHeight;
-#endif
 }
 
 
diff --git a/code/REDALERT/SIDEBAR.CPP b/code/REDALERT/SIDEBAR.CPP
index 212c1a1..f3db0df 100644
--- a/code/REDALERT/SIDEBAR.CPP
+++ b/code/REDALERT/SIDEBAR.CPP
@@ -325,7 +325,7 @@ void SidebarClass::Init_IO(void)
 
 		Zoom.IsSticky = true;
 		Zoom.ID = BUTTON_ZOOM;
-		Zoom.X = 1024 - (640 - ((0x24c/2)*RESFACTOR));
+		Zoom.X = ScreenWidth - (640 - ((0x24c/2)*RESFACTOR));
 		Zoom.Y = (0x96/2)*RESFACTOR;
 		Zoom.IsPressed = false;
 		Zoom.Set_Shape(MFCD::Retrieve("MAP.SHP"));
diff --git a/code/REDALERT/io/UserInput.h b/code/REDALERT/io/UserInput.h
index c98ff8a..7f405e2 100644
--- a/code/REDALERT/io/UserInput.h
+++ b/code/REDALERT/io/UserInput.h
@@ -78,6 +78,11 @@ std::map<SDL_KeyCode, KeyNumType> const sdl_keyMapping = {
 	{ SDLK_KP_ENTER, KN_RETURN },
 	{ SDLK_RETURN, KN_RETURN },
 	{ SDLK_ESCAPE, KN_ESC },
+
+	{ SDLK_UP, KN_UP },
+	{ SDLK_DOWN, KN_DOWN },
+	{ SDLK_LEFT, KN_LEFT },
+	{ SDLK_RIGHT, KN_RIGHT },
 };
 
 class UserInputClass