X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmisc.c;h=6cbd9655e60cd32ed28a514fef251691a8736932;hb=e5c5bf5c4a76a04f9bf64e92227bf2ef969fd25c;hp=e412be85952f6febbb39cba65c5311b400dfc850;hpb=2fe0fbc2a34fd4b50081f1829931dea3ca2c4c1c;p=rocksndiamonds.git

diff --git a/src/misc.c b/src/misc.c
index e412be85..6cbd9655 100644
--- 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];
@@ -233,6 +243,7 @@ void GetOptions(char *argv[])
 	     "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);
@@ -243,11 +254,11 @@ void GetOptions(char *argv[])
       if (option_arg == NULL)
 	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)
     {
@@ -260,27 +271,39 @@ 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_EXIT_HELP, "unrecognized option '%s'", option_str);
-    else if (server_host == NULL)
+    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_EXIT_HELP, "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_EXIT_HELP, "too many arguments");
@@ -356,3 +379,15 @@ void Error(int mode, char *format_str, ...)
     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;
+}