removed glfw and portaudio. SDL is now a requirement

6 files changed, 11 insertions, 20 deletions

diff --git a/src/game/client/components/binds.cpp b/src/game/client/components/binds.cpp
index de5f4f05..68f76f35 100644
--- a/src/game/client/components/binds.cpp
+++ b/src/game/client/components/binds.cpp
@@ -87,13 +87,9 @@ void BINDS::set_defaults()
 	bind(KEY_TAB, "+scoreboard");
 	bind(KEY_F10, "screenshot");
 
-#ifdef CONFIG_NO_SDL
-	bind('A', "+left");
-	bind('D', "+right");
-#else
 	bind('a', "+left");
 	bind('d', "+right");
-#endif
+
 	bind(KEY_SPACE, "+jump");
 	bind(KEY_MOUSE_1, "+fire");
 	bind(KEY_MOUSE_2, "+hook");
@@ -108,13 +104,8 @@ void BINDS::set_defaults()
 	bind(KEY_MOUSE_WHEEL_UP, "+prevweapon");
 	bind(KEY_MOUSE_WHEEL_DOWN, "+nextweapon");
 	
-#ifdef CONFIG_NO_SDL
-	bind('T', "chat all");
-	bind('Y', "chat team");	
-#else
 	bind('t', "chat all");
 	bind('y', "chat team");	
-#endif
 
 	bind(KEY_F3, "vote yes");
 	bind(KEY_F4, "vote no");	
diff --git a/src/game/client/components/chat.cpp b/src/game/client/components/chat.cpp
index 998ba6ed..e58814cb 100644
--- a/src/game/client/components/chat.cpp
+++ b/src/game/client/components/chat.cpp
@@ -51,9 +51,9 @@ bool CHAT::on_input(INPUT_EVENT e)
 	if(mode == MODE_NONE)
 		return false;
 
-	if(e.flags&INPFLAG_PRESS && e.key == KEY_ESC)
+	if(e.flags&INPFLAG_PRESS && e.key == KEY_ESCAPE)
 		mode = MODE_NONE;
-	else if(e.flags&INPFLAG_PRESS && (e.key == KEY_ENTER || e.key == KEY_KP_ENTER))
+	else if(e.flags&INPFLAG_PRESS && (e.key == KEY_RETURN || e.key == KEY_KP_ENTER))
 	{
 		if(input.get_string()[0])
 			gameclient.chat->say(mode == MODE_ALL ? 0 : 1, input.get_string());
diff --git a/src/game/client/components/console.cpp b/src/game/client/components/console.cpp
index ab0c9aae..9efebd92 100644
--- a/src/game/client/components/console.cpp
+++ b/src/game/client/components/console.cpp
@@ -61,7 +61,7 @@ void CONSOLE::INSTANCE::on_input(INPUT_EVENT e)
 	
 	if(e.flags&INPFLAG_PRESS)
 	{
-		if(e.key == KEY_ENTER || e.key == KEY_KP_ENTER)
+		if(e.key == KEY_RETURN || e.key == KEY_KP_ENTER)
 		{
 			if(input.get_string()[0])
 			{
@@ -298,7 +298,7 @@ bool CONSOLE::on_input(INPUT_EVENT e)
 	if(e.key >= KEY_F1 && e.key <= KEY_F15)
 		return false;
 
-	if(e.key == KEY_ESC && (e.flags&INPFLAG_PRESS))
+	if(e.key == KEY_ESCAPE && (e.flags&INPFLAG_PRESS))
 		toggle(console_type);
 	else
 		current_console()->on_input(e);
diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
index e4351260..f1830308 100644
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@@ -259,12 +259,12 @@ int MENUS::ui_do_edit_box(void *id, const RECT *rect, char *str, int str_size, f
 					at_index--;
 					r = 1;
 				}
-				else if (k == KEY_DEL && at_index < len)
+				else if (k == KEY_DELETE && at_index < len)
 				{
 					memmove(str + at_index, str + at_index + 1, len - at_index);
 					r = 1;
 				}
-				else if (k == KEY_ENTER)
+				else if (k == KEY_RETURN)
 					ui_clear_last_active_item();
 				else if (k == KEY_LEFT && at_index > 0)
 					at_index--;
@@ -933,7 +933,7 @@ bool MENUS::on_input(INPUT_EVENT e)
 	// special handle esc and enter for popup purposes
 	if(e.flags&INPFLAG_PRESS)
 	{
-		if(e.key == KEY_ESC)
+		if(e.key == KEY_ESCAPE)
 		{
 			escape_pressed = true;
 			set_active(!is_active());
@@ -944,7 +944,7 @@ bool MENUS::on_input(INPUT_EVENT e)
 	if(is_active())
 	{
 		// special for popups
-		if(e.flags&INPFLAG_PRESS || e.key == KEY_ENTER)
+		if(e.flags&INPFLAG_PRESS || e.key == KEY_RETURN)
 			enter_pressed = true;
 		
 		if(num_inputevents < MAX_INPUTEVENTS)
diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp
index c536753c..c461b542 100644
--- a/src/game/client/components/menus_settings.cpp
+++ b/src/game/client/components/menus_settings.cpp
@@ -30,7 +30,7 @@ bool MENUS_KEYBINDER::on_input(INPUT_EVENT e)
 {
 	if(take_key)
 	{
-		if(e.flags&INPFLAG_PRESS && e.key != KEY_ESC)
+		if(e.flags&INPFLAG_PRESS && e.key != KEY_ESCAPE)
 		{
 			key = e;
 			got_key = true;
diff --git a/src/game/client/components/motd.cpp b/src/game/client/components/motd.cpp
index 19693390..3b8f2243 100644
--- a/src/game/client/components/motd.cpp
+++ b/src/game/client/components/motd.cpp
@@ -77,7 +77,7 @@ void MOTD::on_message(int msgtype, void *rawmsg)
 
 bool MOTD::on_input(INPUT_EVENT e)
 {
-	if(is_active() && e.flags&INPFLAG_PRESS && e.key == KEY_ESC)
+	if(is_active() && e.flags&INPFLAG_PRESS && e.key == KEY_ESCAPE)
 	{
 		clear();
 		return true;