From 6e2b0bc961125b9a72606893c5b6233ba54ed2ed Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 14 Feb 2017 19:32:44 +0100
Subject: [PATCH] - renamed the internal InpuEvent to deconflict from the
 version in the event system.

---
 wadsrc/static/zscript/base.txt                 | 2 +-
 wadsrc/static/zscript/menu/listmenu.txt        | 2 +-
 wadsrc/static/zscript/menu/menu.txt            | 2 +-
 wadsrc/static/zscript/menu/optionmenu.txt      | 8 ++++----
 wadsrc/static/zscript/menu/optionmenuitems.txt | 6 +++---
 wadsrc/static/zscript/menu/videomenu.txt       | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/wadsrc/static/zscript/base.txt b/wadsrc/static/zscript/base.txt
index e354fe594..22bbcc790 100644
--- a/wadsrc/static/zscript/base.txt
+++ b/wadsrc/static/zscript/base.txt
@@ -1,4 +1,4 @@
-struct InputEvent native
+struct InputEventData native
 {
 	native uint8	type;
 	native uint8	subtype;
diff --git a/wadsrc/static/zscript/menu/listmenu.txt b/wadsrc/static/zscript/menu/listmenu.txt
index 742089a39..d920dc26c 100644
--- a/wadsrc/static/zscript/menu/listmenu.txt
+++ b/wadsrc/static/zscript/menu/listmenu.txt
@@ -86,7 +86,7 @@ class ListMenu : Menu native
 		return NULL;
 	}
 	
-	//bool Responder (InputEvent ev);
+	//bool Responder (InputEventData ev);
 	//bool MenuEvent (int mkey, bool fromcontroller);
 	//bool MouseEvent(int type, int x, int y);
 	//void Ticker ();
diff --git a/wadsrc/static/zscript/menu/menu.txt b/wadsrc/static/zscript/menu/menu.txt
index f0dacb017..1640e9d35 100644
--- a/wadsrc/static/zscript/menu/menu.txt
+++ b/wadsrc/static/zscript/menu/menu.txt
@@ -105,7 +105,7 @@ class Menu : Object native
 	virtual void ReleaseFocus() {}
 	virtual void ResetColor() {}
 
-	native virtual bool Responder(InputEvent ev);
+	native virtual bool Responder(InputEventData ev);
 	native virtual bool MenuEvent (int mkey, bool fromcontroller);
 	native virtual bool MouseEvent(int type, int mx, int my);
 	native virtual void Ticker();
diff --git a/wadsrc/static/zscript/menu/optionmenu.txt b/wadsrc/static/zscript/menu/optionmenu.txt
index 9eb26ac86..5b06f3020 100644
--- a/wadsrc/static/zscript/menu/optionmenu.txt
+++ b/wadsrc/static/zscript/menu/optionmenu.txt
@@ -120,17 +120,17 @@ class OptionMenu : Menu
 	//
 	//=============================================================================
 
-	override bool Responder (InputEvent ev)
+	override bool Responder (InputEventData ev)
 	{
-		if (ev.type == InputEvent.GUI_Event)
+		if (ev.type == InputEventData.GUI_Event)
 		{
-			if (ev.subtype == InputEvent.GUI_WheelUp)
+			if (ev.subtype == InputEventData.GUI_WheelUp)
 			{
 				int scrollamt = MIN(2, mDesc.mScrollPos);
 				mDesc.mScrollPos -= scrollamt;
 				return true;
 			}
-			else if (ev.subtype == InputEvent.GUI_WheelDown)
+			else if (ev.subtype == InputEventData.GUI_WheelDown)
 			{
 				if (CanScrollDown)
 				{
diff --git a/wadsrc/static/zscript/menu/optionmenuitems.txt b/wadsrc/static/zscript/menu/optionmenuitems.txt
index ad4e45677..8efe0cfb9 100644
--- a/wadsrc/static/zscript/menu/optionmenuitems.txt
+++ b/wadsrc/static/zscript/menu/optionmenuitems.txt
@@ -396,16 +396,16 @@ class EnterKey : Menu
 		}
 	}
 
-	override bool Responder(InputEvent ev)
+	override bool Responder(InputEventData ev)
 	{
 		// This checks raw keys, not GUI keys.
-		if (ev.type == InputEvent.KeyDown)
+		if (ev.type == InputEventData.KeyDown)
 		{
 			mOwner.SendKey(ev.data1);
 			menuactive = Menu.On;
 			SetMenuMessage(0);
 			Close();
-			mParentMenu.MenuEvent((ev.data1 == InputEvent.KEY_ESCAPE)? Menu.MKEY_Abort : Menu.MKEY_Input, 0);
+			mParentMenu.MenuEvent((ev.data1 == InputEventData.KEY_ESCAPE)? Menu.MKEY_Abort : Menu.MKEY_Input, 0);
 			return true;
 		}
 		return false;
diff --git a/wadsrc/static/zscript/menu/videomenu.txt b/wadsrc/static/zscript/menu/videomenu.txt
index a162781eb..1377f528e 100644
--- a/wadsrc/static/zscript/menu/videomenu.txt
+++ b/wadsrc/static/zscript/menu/videomenu.txt
@@ -57,9 +57,9 @@ class VideoModeMenu : OptionMenu
 		return Super.MenuEvent(mkey, fromcontroller);
 	}
 
-	override bool Responder(InputEvent ev)
+	override bool Responder(InputEventData ev)
 	{
-		if (ev.type == InputEvent.GUI_Event && ev.subtype == InputEvent.GUI_KeyDown && (ev.data1 == 0x54 || ev.data1 == 0x74))
+		if (ev.type == InputEventData.GUI_Event && ev.subtype == InputEventData.GUI_KeyDown && (ev.data1 == 0x54 || ev.data1 == 0x74))
 		{
 			if (SetSelectedSize())
 			{