X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=28cc8bd5af3efdbb66387dbb11e0d14c36afeb06;hb=b7fe72dcb4068a6d989231654382bd457209509c;hp=6432523e41ce5c5755a6e385c28abd30995b5aee;hpb=1c9456dab9709209a2462afe72c65373a1294de5;p=rocksndiamonds.git

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 6432523e..28cc8bd5 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -1516,6 +1516,10 @@ void translate_keyname(Key *keysym, char **x11name, char **name, int mode)
     char *name;
   } translate_key[] =
   {
+    /* return and escape keys */
+    { KSYM_Return,	"XK_Return",		"return" },
+    { KSYM_Escape,	"XK_Escape",		"escape" },
+
     /* normal cursor keys */
     { KSYM_Left,	"XK_Left",		"cursor left" },
     { KSYM_Right,	"XK_Right",		"cursor right" },
@@ -2039,6 +2043,31 @@ int get_switch3_from_string(char *s)
   return result;
 }
 
+int get_player_nr_from_string(char *s)
+{
+  static char *player_text[] =
+  {
+    "player_1",
+    "player_2",
+    "player_3",
+    "player_4",
+
+    NULL
+  };
+
+  char *s_lower = getStringToLower(s);
+  int result = 0;
+  int i;
+
+  for (i = 0; player_text[i] != NULL; i++)
+    if (strEqual(s_lower, player_text[i]))
+      result = i;
+
+  free(s_lower);
+
+  return result;
+}
+
 
 /* ------------------------------------------------------------------------- */
 /* functions for generic lists                                               */