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;
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();
{
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];
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++;
{
*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);
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)
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++;
}
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)
{
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 */
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);
}
}
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;
+}
+
+char *getKeySymName(KeySym key)
+{
+ static char key_name[20];
+ static struct
+ {
+ KeySym keysym;
+ char *name;
+ } translate[] =
+ {
+ { XK_Left, "cursor left" },
+ { XK_Right, "cursor right" },
+ { XK_Up, "cursor up" },
+ { XK_Down, "cursor down" },
+
+#ifdef XK_KP_Left
+ { XK_KP_Left, "keypad left" },
+ { XK_KP_Right, "keypad right" },
+ { XK_KP_Up, "keypad up" },
+ { XK_KP_Down, "keypad down" },
+#endif
+
+ { XK_BackSpace, "backspace" },
+ { XK_Delete, "delete" },
+ { XK_Insert, "insert" },
+ { XK_Tab, "tab" },
+ { XK_Home, "home" },
+ { XK_End, "end" },
+ { XK_Page_Up, "page up" },
+ { XK_Page_Down, "page down" },
+ { XK_space, "space" },
+
+ { XK_Shift_L, "left shift" },
+ { XK_Shift_R, "right shift" },
+ { XK_Control_L, "left ctrl" },
+ { XK_Control_R, "right ctrl" },
+ { XK_Meta_L, "left meta" },
+ { XK_Meta_R, "right meta" },
+ { XK_Alt_L, "left alt" },
+ { XK_Alt_R, "right alt" },
+ { XK_Mode_switch, "mode switch" },
+ { XK_Multi_key, "multi key" },
+
+ { 0, NULL }
+ };
+
+ if (key >= XK_A && key <= XK_Z)
+ {
+ sprintf(key_name, "%c", 'A' + (char)(key - XK_A));
+ return key_name;
+ }
+ else if (key >= XK_a && key <= XK_z)
+ {
+ sprintf(key_name, "%c", 'a' + (char)(key - XK_a));
+ return key_name;
+ }
+ else if (key >= XK_0 && key <= XK_9)
+ {
+ sprintf(key_name, "%c", '0' + (char)(key - XK_0));
+ return key_name;
+ }
+ else if (key >= XK_KP_0 && key <= XK_KP_9)
+ {
+ sprintf(key_name, "keypad %c", '0' + (char)(key - XK_KP_0));
+ return key_name;
+ }
+ else
+ {
+ int i = 0;
+
+ do
+ {
+ if (key == translate[i].keysym)
+ return translate[i].name;
+ }
+ while (translate[++i].name);
+
+ sprintf(key_name, "(unknown)");
+ return key_name;
+ }
+}
projects / rocksndiamonds.git / blobdiff