From 307c1196f36e5dab4b17ccc93480a1eb785f5291 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Wed, 1 May 2019 00:40:44 +0200
Subject: [PATCH] Clean up control_check_talk_btn

---
 Source/control.cpp | 35 ++++++++++++++++++-----------------
 Source/control.h   |  2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Source/control.cpp b/Source/control.cpp
index 32d08f48c..5e8a952b5 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -2782,29 +2782,30 @@ char *control_print_talk_msg(char *msg, int x, int y, int *a4, int just)
 	return v6;
 }
 
-int control_check_talk_btn()
+BOOL control_check_talk_btn()
 {
-	int v0;     // ecx
-	int result; // eax
+	int i;
 
 	if (!talkflag)
-		return 0;
+		return FALSE;
+
 	if (MouseX < 172)
-		return 0;
-	v0 = MouseY;
-	if (MouseY < 421 || MouseX > 233)
-		return 0;
-	result = 0;
-	if (MouseY <= 475) {
-		talkbtndown[0] = FALSE;
-		talkbtndown[1] = FALSE;
-		talkbtndown[2] = FALSE;
-		talkbtndown[(v0 - 421) / 18] = TRUE;
-		result = 1;
+		return FALSE;
+	if (MouseY < 421)
+		return FALSE;
+	if (MouseX > 233)
+		return FALSE;
+	if (MouseY > 475)
+		return FALSE;
+
+	for (i = 0; i < sizeof(talkbtndown) / sizeof(talkbtndown[0]); i++) {
+		talkbtndown[i] = FALSE;
 	}
-	return result;
+
+	talkbtndown[(MouseY - 421) / 18] = TRUE;
+
+	return TRUE;
 }
-// 4B8960: using guessed type int talkflag;
 
 void control_release_talk_btn()
 {
diff --git a/Source/control.h b/Source/control.h
index 6a841321b..9168182aa 100644
--- a/Source/control.h
+++ b/Source/control.h
@@ -109,7 +109,7 @@ void control_remove_gold(int pnum, int gold_index);
 void control_set_gold_curs(int pnum);
 void DrawTalkPan();
 char *control_print_talk_msg(char *msg, int x, int y, int *a4, int just);
-int control_check_talk_btn();
+BOOL control_check_talk_btn();
 void control_release_talk_btn();
 void control_reset_talk_msg();
 void control_type_message();