From 0afae4e25cc157fa05b8b62a4cea3a41f1dd1b1f Mon Sep 17 00:00:00 2001
From: zicodxx <>
Date: Mon, 19 May 2008 11:31:15 +0000
Subject: [PATCH] If a key combo is called which uses key of default wepaon
 binding, flush inputs

---
 CHANGELOG.txt   | 4 ++++
 main/gamecntl.c | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index fb222492e..438f6190a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+20080519
+--------
+main/gamecntl.c: If a key combo is called which uses key of default wepaon binding, flush inputs
+
 20080518
 --------
 include/physfsx.h, main/config.c: set "Jukebox" as the default jukebox path, for Mac OS 9 look for d2x.ini outside the app bundle
diff --git a/main/gamecntl.c b/main/gamecntl.c
index 23d7fd7ab..567b9e7a1 100644
--- a/main/gamecntl.c
+++ b/main/gamecntl.c
@@ -1312,6 +1312,7 @@ void HandleGameKey(int key)
 					set_escort_special_goal(key);
 				else
 					HUD_init_message ("No Guide-Bot in Multiplayer!");
+				game_flush_inputs();
 				break;
 			}
 
@@ -1335,6 +1336,7 @@ void HandleGameKey(int key)
 					RefuseThisPlayer=1;
 					HUD_init_message ("Player accepted!");
 					RefuseTeam=1;
+					game_flush_inputs();
 				}
 			break;
 		case KEY_ALTED + KEY_2:
@@ -1343,6 +1345,7 @@ void HandleGameKey(int key)
 					RefuseThisPlayer=1;
 					HUD_init_message ("Player accepted!");
 					RefuseTeam=2;
+					game_flush_inputs();
 				}
 			break;
 #endif
@@ -1368,6 +1371,7 @@ void HandleGameKey(int key)
 #ifdef NETWORK
 			case KEY_0 + KEY_ALTED:
 				DropFlag ();
+				game_flush_inputs();
 				break;
 #endif