X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmisc.c;h=15c8099f24755b0d8d6f0155a52281ff2c9f98ca;hp=c2c85e400067b206a849aa016d7685de687c83b7;hb=0918c3eb2f6219a8cc72aa85bd9c4889788dd474;hpb=19004e830980892c3abc3021bd1b868861836bb8 diff --git a/src/misc.c b/src/misc.c index c2c85e40..15c8099f 100644 --- a/src/misc.c +++ b/src/misc.c @@ -26,10 +26,25 @@ #include "sound.h" #include "random.h" #include "joystick.h" +#include "files.h" + +#ifdef MSDOS +volatile unsigned long counter = 0; + +void increment_counter() +{ + counter++; +} + +END_OF_FUNCTION(increment_counter); +#endif + + /* maximal allowed length of a command line option */ #define MAX_OPTION_LEN 256 +#ifndef MSDOS static unsigned long mainCounter(int mode) { static struct timeval base_time = { 0, 0 }; @@ -46,20 +61,39 @@ static unsigned long mainCounter(int mode) return counter_ms; /* return milliseconds since last init */ } +#endif void InitCounter() /* set counter back to zero */ { +#ifndef MSDOS mainCounter(INIT_COUNTER); +#else + LOCK_VARIABLE(counter); + LOCK_FUNCTION(increment_counter); + install_int_ex(increment_counter, BPS_TO_TIMER(100)); +#endif } unsigned long Counter() /* get milliseconds since last call of InitCounter() */ { - return(mainCounter(READ_COUNTER)); +#ifndef MSDOS + return mainCounter(READ_COUNTER); +#else + return (counter * 10); +#endif } static void sleep_milliseconds(unsigned long milliseconds_delay) { - if (milliseconds_delay < 5) + boolean do_busy_waiting = (milliseconds_delay < 5 ? TRUE : FALSE); + +#ifdef MSDOS + /* donït use select() to perform waiting operations under DOS/Windows + environment; always use a busy loop for waiting instead */ + do_busy_waiting = TRUE; +#endif + + if (do_busy_waiting) { /* 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; @@ -209,6 +243,7 @@ char *getLoginName() char *getHomeDir() { +#ifndef MSDOS static char *home_dir = NULL; if (!home_dir) @@ -225,6 +260,9 @@ char *getHomeDir() } return home_dir; +#else + return "."; +#endif } char *getPath2(char *path1, char *path2) @@ -299,15 +337,15 @@ void GetOptions(char *argv[]) char *option_arg = NULL; int option_len = strlen(option); + if (option_len >= MAX_OPTION_LEN) + Error(ERR_EXIT_HELP, "unrecognized option '%s'", 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++; @@ -346,8 +384,6 @@ void GetOptions(char *argv[]) options.display_name = option_arg; if (option_arg == next_option) options_left++; - - printf("--display == '%s'\n", options.display_name); } else if (strncmp(option, "-basepath", option_len) == 0) { @@ -358,13 +394,9 @@ void GetOptions(char *argv[]) if (option_arg == next_option) options_left++; - printf("--basepath == '%s'\n", options.base_directory); - /* adjust path for level directory accordingly */ - options.level_directory = checked_malloc(strlen(options.base_directory) + - strlen(LEVELS_DIRECTORY) + 2); - sprintf(options.level_directory, "%s/%s", - options.base_directory, LEVELS_DIRECTORY); + options.level_directory = + getPath2(options.base_directory, LEVELS_DIRECTORY); } else if (strncmp(option, "-levels", option_len) == 0) { @@ -374,42 +406,32 @@ void GetOptions(char *argv[]) options.level_directory = option_arg; if (option_arg == next_option) options_left++; - - printf("--levels == '%s'\n", options.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"); @@ -420,36 +442,56 @@ void GetOptions(char *argv[]) void Error(int mode, char *format, ...) { - FILE *output_stream = stderr; char *process_name = ""; + FILE *error = stderr; - if (mode & ERR_SOUNDSERVER) +#ifdef MSDOS + if ((error = openErrorFile()) == NULL) + { + printf("Cannot write to error output file!\n"); + CloseAllAndExit(1); + } +#endif + + if (mode & ERR_SOUND_SERVER) process_name = " sound server"; + else if (mode & ERR_NETWORK_SERVER) + process_name = " network server"; + else if (mode & ERR_NETWORK_CLIENT) + process_name = " network client **"; if (format) { va_list ap; - fprintf(output_stream, "%s%s: ", program_name, process_name); + fprintf(error, "%s%s: ", program_name, process_name); if (mode & ERR_WARN) - fprintf(output_stream, "warning: "); + fprintf(error, "warning: "); va_start(ap, format); - vfprintf(output_stream, format, ap); + vfprintf(error, format, ap); va_end(ap); - fprintf(output_stream, "\n"); + fprintf(error, "\n"); } if (mode & ERR_HELP) - fprintf(output_stream, "%s: Try option '--help' for more information.\n", + fprintf(error, "%s: Try option '--help' for more information.\n", program_name); + if (mode & ERR_EXIT) + fprintf(error, "%s%s: aborting\n", program_name, process_name); + + if (error != stderr) + fclose(error); + if (mode & ERR_EXIT) { - fprintf(output_stream, "%s%s: aborting\n", program_name, process_name); - CloseAllAndExit(1); + if (mode & ERR_FROM_SERVER) + exit(1); /* child process: normal exit */ + else + CloseAllAndExit(1); /* main process: clean up stuff */ } } @@ -544,9 +586,15 @@ void translate_keyname(KeySym *keysym, char **x11name, char **name, int mode) { XK_apostrophe, "XK_apostrophe", "'" }, { XK_plus, "XK_plus", "+" }, { XK_minus, "XK_minus", "-" }, + { XK_equal, "XK_equal", "equal" }, { XK_comma, "XK_comma", "," }, { XK_period, "XK_period", "." }, + { XK_colon, "XK_colon", ";" }, + { XK_slash, "XK_slash", "/" }, { XK_numbersign, "XK_numbersign", "#" }, + { XK_backslash, "XK_backslash", "backslash" }, + { XK_braceleft, "XK_braceleft", "brace left" }, + { XK_braceright, "XK_braceright", "brace right" }, { XK_less, "XK_less", "less" }, { XK_greater, "XK_greater", "greater" }, { XK_asciicircum, "XK_asciicircum", "circumflex" }, @@ -806,7 +854,29 @@ int getJoySymbolFromJoyName(char *name) return joysymbol; } +int getJoystickNrFromDeviceName(char *device_name) +{ + char c; + int joystick_nr = 0; + + if (device_name == NULL || device_name[0] == '\0') + return 0; + + c = device_name[strlen(device_name) - 1]; + + if (c >= '0' && c <= '9') + joystick_nr = (int)(c - '0'); + + if (joystick_nr < 0 || joystick_nr >= MAX_PLAYERS) + joystick_nr = 0; + + return joystick_nr; +} + +/* ----------------------------------------------------------------- */ /* the following is only for debugging purpose and normally not used */ +/* ----------------------------------------------------------------- */ + #define DEBUG_NUM_TIMESTAMPS 3 void debug_print_timestamp(int counter_nr, char *message)