From 62fca0f486e8bea79db16fa7a030fa96663f4df4 Mon Sep 17 00:00:00 2001
From: JustAnotherGuid <46401660+JustAnotherGuid@users.noreply.github.com>
Date: Sun, 6 Jan 2019 00:28:43 +0100
Subject: [PATCH] Cleanup gmenu_presskeys (#556)

---
 Source/gmenu.cpp | 33 +++++++++++++--------------------
 Source/gmenu.h   |  2 +-
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/Source/gmenu.cpp b/Source/gmenu.cpp
index 662b3e67b..0bd757ac9 100644
--- a/Source/gmenu.cpp
+++ b/Source/gmenu.cpp
@@ -289,11 +289,8 @@ int __fastcall gmenu_get_lfont(TMenuItem *pItem)
 	return i - 2;
 }
 
-int __fastcall gmenu_presskeys(int a1)
+BOOL __fastcall gmenu_presskeys(int a1)
 {
-	int v1; // ecx
-	int v2; // ecx
-
 	if (!dword_634480)
 		return 0;
 	switch (a1) {
@@ -302,31 +299,27 @@ int __fastcall gmenu_presskeys(int a1)
 			PlaySFX(IS_TITLEMOV);
 			((void(__fastcall *)(signed int))sgpCurrItem->fnMenu)(1);
 		}
-		return 1;
+		break;
 	case VK_ESCAPE:
 		PlaySFX(IS_TITLEMOV);
 		gmenu_call_proc(0, 0);
-		return 1;
+		break;
 	case VK_SPACE:
-		return 0;
+		return FALSE;
 	case VK_LEFT:
-		v2 = 0;
-		goto LABEL_12;
-	case VK_UP:
-		v1 = 0;
-		goto LABEL_10;
+		gmenu_left_right(0);
+		break;
 	case VK_RIGHT:
-		v2 = 1;
-	LABEL_12:
-		gmenu_left_right(v2);
-		return 1;
+		gmenu_left_right(1);
+		break;
+	case VK_UP:
+		gmenu_up_down(0);
+		break;
 	case VK_DOWN:
-		v1 = 1;
-	LABEL_10:
-		gmenu_up_down(v1);
+		gmenu_up_down(1);
 		break;
 	}
-	return 1;
+	return TRUE;
 }
 
 void __fastcall gmenu_left_right(int a1)
diff --git a/Source/gmenu.h b/Source/gmenu.h
index 1e9e41326..b08ee39e1 100644
--- a/Source/gmenu.h
+++ b/Source/gmenu.h
@@ -26,7 +26,7 @@ void __cdecl gmenu_draw();
 void __fastcall gmenu_draw_menu_item(TMenuItem *pItem, int a2);
 void __fastcall gmenu_clear_buffer(int x, int y, int width, int height);
 int __fastcall gmenu_get_lfont(TMenuItem *pItem);
-int __fastcall gmenu_presskeys(int a1);
+BOOL __fastcall gmenu_presskeys(int a1);
 void __fastcall gmenu_left_right(int a1);
 int __fastcall gmenu_on_mouse_move(LPARAM lParam);
 BOOLEAN __fastcall gmenu_valid_mouse_pos(int *plOffset);