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

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 6432523e..48fd6e12 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -336,7 +336,7 @@ boolean getTokenValueFromString(char *string, char **token, char **value)
 /* maximal allowed length of a command line option */
 #define MAX_OPTION_LEN		256
 
-static unsigned int getCurrentMS()
+static unsigned int getCurrentMS(void)
 {
   return SDL_GetTicks();
 }
@@ -558,7 +558,7 @@ static char *get_corrected_real_name(char *real_name)
 }
 #endif
 
-char *getLoginName()
+char *getLoginName(void)
 {
   static char *login_name = NULL;
 
@@ -588,7 +588,7 @@ char *getLoginName()
   return login_name;
 }
 
-char *getRealName()
+char *getRealName(void)
 {
   static char *real_name = NULL;
 
@@ -1141,7 +1141,7 @@ void SetError(char *format, ...)
   va_end(ap);
 }
 
-char *GetError()
+char *GetError(void)
 {
   return internal_error;
 }
@@ -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,12 +2043,37 @@ 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                                               */
 /* ------------------------------------------------------------------------- */
 
-ListNode *newListNode()
+ListNode *newListNode(void)
 {
   return checked_calloc(sizeof(ListNode));
 }
@@ -3848,7 +3877,7 @@ char *getLogFilename(char *basename)
   return getPath2(getUserGameDataDir(), basename);
 }
 
-void OpenLogFiles()
+void OpenLogFiles(void)
 {
   int i;
 
@@ -3870,7 +3899,7 @@ void OpenLogFiles()
   }
 }
 
-void CloseLogFiles()
+void CloseLogFiles(void)
 {
   int i;
 
@@ -3892,7 +3921,7 @@ void DumpLogFile(int nr)
   fclose(log_file);
 }
 
-void NotifyUserAboutErrorFile()
+void NotifyUserAboutErrorFile(void)
 {
 #if defined(PLATFORM_WIN32)
   char *title_text = getStringCat2(program.program_title, " Error Message");
@@ -3919,7 +3948,7 @@ void NotifyUserAboutErrorFile()
 #define DEBUG_TIME_IN_MICROSECONDS		0
 
 #if DEBUG_TIME_IN_MICROSECONDS
-static double Counter_Microseconds()
+static double Counter_Microseconds(void)
 {
   static struct timeval base_time = { 0, 0 };
   struct timeval current_time;