X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmisc.c;h=6cbd9655e60cd32ed28a514fef251691a8736932;hb=e5c5bf5c4a76a04f9bf64e92227bf2ef969fd25c;hp=944458f5669d0bd63d486123b3978d773c5aa8cc;hpb=c4baa69cc8d5e8398425e67498b49f4b77f8e477;p=rocksndiamonds.git diff --git a/src/misc.c b/src/misc.c index 944458f5..6cbd9655 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1,28 +1,29 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* ©1995 Artsoft Development * -* Holger Schemel * -* 33659 Bielefeld-Senne * -* Telefon: (0521) 493245 * -* eMail: aeglos@valinor.owl.de * -* aeglos@uni-paderborn.de * -* q99492@pbhrzx.uni-paderborn.de * +* (c) 1995-98 Artsoft Entertainment * +* Holger Schemel * +* Oststrasse 11a * +* 33604 Bielefeld * +* phone: ++49 +521 290471 * +* email: aeglos@valinor.owl.de * *----------------------------------------------------------* * misc.c * ***********************************************************/ -#include "misc.h" -#include "tools.h" -#include "sound.h" -#include "random.h" - #include #include #include #include #include #include +#include + +#include "misc.h" +#include "init.h" +#include "tools.h" +#include "sound.h" +#include "random.h" static unsigned long mainCounter(int mode) { @@ -53,9 +54,9 @@ unsigned long Counter() /* get milliseconds since last call of InitCounter() */ static void sleep_milliseconds(unsigned long milliseconds_delay) { - if (milliseconds_delay < 5 || !cpu_friendly) + if (milliseconds_delay < 5) { - /* we want to wait less than 5 ms -- if we assume that we have a + /* we want to wait only a few ms -- if we assume that we have a kernel timer resolution of 10 ms, we would wait far to long; therefore it's better to do a short interval of busy waiting to get our sleeping time more accurate */ @@ -74,8 +75,7 @@ static void sleep_milliseconds(unsigned long milliseconds_delay) delay.tv_usec = 1000 * (milliseconds_delay % 1000); if (select(0, NULL, NULL, NULL, &delay) != 0) - fprintf(stderr,"%s: in function sleep_milliseconds: select() failed!\n", - progname); + Error(ERR_RETURN, "sleep_milliseconds(): select() failed"); } } @@ -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(); @@ -110,10 +112,18 @@ BOOL DelayReached(unsigned long *counter_var, unsigned long delay) void WaitUntilDelayReached(unsigned long *counter_var, unsigned long delay) { - unsigned long actual_counter = Counter(); + unsigned long actual_counter; - if (actual_counter < *counter_var + delay && actual_counter >= *counter_var) - sleep_milliseconds(*counter_var + delay - actual_counter); + while(1) + { + actual_counter = Counter(); + + if (actual_counter < *counter_var + delay && + actual_counter >= *counter_var) + sleep_milliseconds((*counter_var + delay - actual_counter) / 2); + else + break; + } *counter_var = actual_counter; } @@ -180,3 +190,204 @@ void MarkTileDirty(int x, int y) redraw_mask |= REDRAW_TILES; } } + +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]; + char *option = options_left[0]; + char *next_option = options_left[1]; + char *option_arg = NULL; + int option_len = strlen(option); + + strcpy(option_str, option); /* copy argument into buffer */ + option = option_str; + + if (strcmp(option, "--") == 0) /* stop scanning arguments */ + break; + + if (option_len >= MAX_OPTION_LEN) + Error(ERR_EXIT_HELP, "unrecognized option '%s'", option); + + if (strncmp(option, "--", 2) == 0) /* treat '--' like '-' */ + option++; + + option_arg = strchr(option, '='); + if (option_arg == NULL) /* no '=' in option */ + option_arg = next_option; + else + { + *option_arg++ = '\0'; /* cut argument from option */ + if (*option_arg == '\0') /* no argument after '=' */ + Error(ERR_EXIT_HELP, "option '%s' has invalid argument", option_str); + } + + option_len = strlen(option); + + if (strcmp(option, "-") == 0) + 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); + } + else if (strncmp(option, "-display", option_len) == 0) + { + if (option_arg == NULL) + Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str); + + options.display_name = option_arg; + if (option_arg == next_option) + options_left++; + + printf("--display == '%s'\n", options.display_name); + } + else if (strncmp(option, "-levels", option_len) == 0) + { + if (option_arg == NULL) + Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str); + + level_directory = option_arg; + if (option_arg == next_option) + options_left++; + + 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"); + + options.verbose = TRUE; + } + else if (*option == '-') + Error(ERR_EXIT_HELP, "unrecognized option '%s'", option_str); + else if (options.server_host == NULL) + { + options.server_host = *options_left; + + printf("server.name == '%s'\n", options.server_host); + } + else if (options.server_port == 0) + { + 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", options.server_port); + } + else + Error(ERR_EXIT_HELP, "too many arguments"); + + options_left++; + } +} + +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) + { + va_list ap; + char *format_ptr; + char *s_value; + int i_value; + double d_value; + + fprintf(output_stream, "%s%s: ", program_name, process_name); + + va_start(ap, format_str); /* ap points to first unnamed argument */ + + for(format_ptr=format_str; *format_ptr; format_ptr++) + { + if (*format_ptr != '%') + { + fprintf(output_stream, "%c", *format_ptr); + continue; + } + + switch(*++format_ptr) + { + case 'd': + i_value = va_arg(ap, int); + fprintf(output_stream, "%d", i_value); + break; + + case 'f': + d_value = va_arg(ap, double); + fprintf(output_stream, "%f", d_value); + break; + + case 's': + s_value = va_arg(ap, char *); + fprintf(output_stream, "%s", s_value); + break; + + default: + fprintf(stderr, "\n%s: Error(): invalid format string: %s\n", + program_name, format_str); + CloseAllAndExit(10); + } + } + + va_end(ap); + + fprintf(output_stream, "\n"); + } + + if (mode == ERR_EXIT_HELP) + fprintf(output_stream, "%s: Try option '--help' for more information.\n", + program_name); + + if (mode != ERR_RETURN) + { + 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; +}