rnd-19981017-1

[rocksndiamonds.git] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index 6445ee2894655da2331d777b733e12b81fe847cf..6cbd9655e60cd32ed28a514fef251691a8736932 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -84,7 +84,8 @@ void Delay(unsigned long delay)       /* Sleep specified number of milliseconds */
   sleep_milliseconds(delay);
 }
 
-BOOL FrameReached(unsigned long *frame_counter_var, unsigned long frame_delay)
+boolean FrameReached(unsigned long *frame_counter_var,
+                    unsigned long frame_delay)
 {
   unsigned long actual_frame_counter = FrameCounter;
 
@@ -96,7 +97,8 @@ BOOL FrameReached(unsigned long *frame_counter_var, unsigned long frame_delay)
   return(TRUE);
 }
 
-BOOL DelayReached(unsigned long *counter_var, unsigned long delay)
+boolean DelayReached(unsigned long *counter_var,
+                    unsigned long delay)
 {
   unsigned long actual_counter = Counter();
 
@@ -193,6 +195,14 @@ void GetOptions(char *argv[])
 {
   char **options_left = &argv[1];
 
+  /* initialize global program options */
+  options.display_name = NULL;
+  options.server_host = NULL;
+  options.server_port = 0;
+  options.serveronly = FALSE;
+  options.network = FALSE;
+  options.verbose = FALSE;
+
   while (*options_left)
   {
     char option_str[MAX_OPTION_LEN];
@@ -208,7 +218,7 @@ void GetOptions(char *argv[])
       break;
 
     if (option_len >= MAX_OPTION_LEN)
-      Error(ERR_EXITHELP, "unrecognized option '%s'", option);
+      Error(ERR_EXIT_HELP, "unrecognized option '%s'", option);
 
     if (strncmp(option, "--", 2) == 0)         /* treat '--' like '-' */
       option++;
@@ -220,19 +230,21 @@ void GetOptions(char *argv[])
     {
       *option_arg++ = '\0';                    /* cut argument from option */
       if (*option_arg == '\0')                 /* no argument after '=' */
-       Error(ERR_EXITHELP, "option '%s' has invalid argument", option_str);
+       Error(ERR_EXIT_HELP, "option '%s' has invalid argument", option_str);
     }
 
     option_len = strlen(option);
 
     if (strcmp(option, "-") == 0)
-      Error(ERR_EXITHELP, "unrecognized option '%s'", option);
+      Error(ERR_EXIT_HELP, "unrecognized option '%s'", option);
     else if (strncmp(option, "-help", option_len) == 0)
     {
       printf("Usage: %s [options] [server.name [port]]\n"
             "Options:\n"
             "  -d, --display machine:0       X server display\n"
             "  -l, --levels directory        alternative level directory\n"
+            "  -s, --serveronly              only start network server\n"
+            "  -n, --network                 network multiplayer game\n"
             "  -v, --verbose                 verbose mode\n",
             program_name);
       exit(0);
@@ -240,18 +252,18 @@ void GetOptions(char *argv[])
     else if (strncmp(option, "-display", option_len) == 0)
     {
       if (option_arg == NULL)
-       Error(ERR_EXITHELP, "option '%s' requires an argument", option_str);
+       Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str);
 
-      display_name = option_arg;
+      options.display_name = option_arg;
       if (option_arg == next_option)
        options_left++;
 
-      printf("--display == '%s'\n", display_name);
+      printf("--display == '%s'\n", options.display_name);
     }
     else if (strncmp(option, "-levels", option_len) == 0)
     {
       if (option_arg == NULL)
-       Error(ERR_EXITHELP, "option '%s' requires an argument", option_str);
+       Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str);
 
       level_directory = option_arg;
       if (option_arg == next_option)
@@ -259,30 +271,42 @@ void GetOptions(char *argv[])
 
       printf("--levels == '%s'\n", level_directory);
     }
+    else if (strncmp(option, "-network", option_len) == 0)
+    {
+      printf("--network\n");
+
+      options.network = TRUE;
+    }
+    else if (strncmp(option, "-serveronly", option_len) == 0)
+    {
+      printf("--serveronly\n");
+
+      options.serveronly = TRUE;
+    }
     else if (strncmp(option, "-verbose", option_len) == 0)
     {
       printf("--verbose\n");
 
-      verbose = TRUE;
+      options.verbose = TRUE;
     }
     else if (*option == '-')
-      Error(ERR_EXITHELP, "unrecognized option '%s'", option_str);
-    else if (server_host == NULL)
+      Error(ERR_EXIT_HELP, "unrecognized option '%s'", option_str);
+    else if (options.server_host == NULL)
     {
-      server_host = *options_left;
+      options.server_host = *options_left;
 
-      printf("server.name == '%s'\n", server_host);
+      printf("server.name == '%s'\n", options.server_host);
     }
-    else if (server_port == 0)
+    else if (options.server_port == 0)
     {
-      server_port = atoi(*options_left);
-      if (server_port < 1024)
-       Error(ERR_EXITHELP, "bad port number '%d'", server_port);
+      options.server_port = atoi(*options_left);
+      if (options.server_port < 1024)
+       Error(ERR_EXIT_HELP, "bad port number '%d'", options.server_port);
 
-      printf("port == %d\n", server_port);
+      printf("port == %d\n", options.server_port);
     }
     else
-      Error(ERR_EXITHELP, "too many arguments");
+      Error(ERR_EXIT_HELP, "too many arguments");
 
     options_left++;
   }
@@ -291,6 +315,10 @@ void GetOptions(char *argv[])
 void Error(int mode, char *format_str, ...)
 {
   FILE *output_stream = stderr;
+  char *process_name = "";
+
+  if (mode == ERR_EXIT_SOUNDSERVER)
+    process_name = " sound server";
 
   if (format_str)
   {
@@ -300,7 +328,7 @@ void Error(int mode, char *format_str, ...)
     int i_value;
     double d_value;
 
-    fprintf(output_stream, "%s: ", program_name);
+    fprintf(output_stream, "%s%s: ", program_name, process_name);
 
     va_start(ap, format_str);  /* ap points to first unnamed argument */
   
@@ -330,7 +358,8 @@ void Error(int mode, char *format_str, ...)
          break;
   
        default:
-         fprintf(stderr, "\nError(): invalid format string: %s\n",format_str);
+         fprintf(stderr, "\n%s: Error(): invalid format string: %s\n",
+                 program_name, format_str);
          CloseAllAndExit(10);
       }
     }
@@ -340,13 +369,25 @@ void Error(int mode, char *format_str, ...)
     fprintf(output_stream, "\n");
   }
   
-  if (mode == ERR_EXITHELP)
+  if (mode == ERR_EXIT_HELP)
     fprintf(output_stream, "%s: Try option '--help' for more information.\n",
            program_name);
 
-  if (mode == ERR_EXIT || mode == ERR_EXITHELP)
+  if (mode != ERR_RETURN)
   {
-    fprintf(output_stream, "%s: aborting\n", program_name);
+    fprintf(output_stream, "%s%s: aborting\n", program_name, process_name);
     CloseAllAndExit(1);
   }
 }
+
+void *checked_malloc(unsigned long size)
+{
+  void *ptr;
+
+  ptr = malloc(size);
+
+  if (ptr == NULL)
+    Error(ERR_EXIT, "cannot allocate %d bytes -- out of memory", size);
+
+  return ptr;
+}