delay.tv_usec = 1000 * (milliseconds_delay % 1000);
if (select(0, NULL, NULL, NULL, &delay) != 0)
- Error(ERR_RETURN, "sleep_milliseconds(): select() failed");
+ Error(ERR_WARN, "sleep_milliseconds(): select() failed");
}
}
*counter_var = actual_counter;
}
-char *int2str(int ct, int nr)
+char *int2str(int number, int size)
{
- static char str[20];
+ static char s[40];
- sprintf(str,"%09d",ct);
- return(&str[strlen(str)-nr]);
+ if (size > 20)
+ size = 20;
+
+ if (size)
+ {
+ sprintf(s, " %09d", number);
+ return &s[strlen(s) - size];
+ }
+ else
+ {
+ sprintf(s, "%d", number);
+ return s;
+ }
}
unsigned int SimpleRND(unsigned int max)
gettimeofday(¤t_time,NULL);
root = root * 4253261 + current_time.tv_sec + current_time.tv_usec;
- return(root % max);
+ return (root % max);
}
unsigned int RND(unsigned int max)
{
- return(random_linux_libc() % max);
+ return (random_linux_libc() % max);
}
unsigned int InitRND(long seed)
{
struct timeval current_time;
- if (seed==NEW_RANDOMIZE)
+ if (seed == NEW_RANDOMIZE)
{
gettimeofday(¤t_time,NULL);
srandom_linux_libc((unsigned int) current_time.tv_usec);
- return((unsigned int) current_time.tv_usec);
+ return (unsigned int)current_time.tv_usec;
}
else
{
srandom_linux_libc((unsigned int) seed);
- return((unsigned int) seed);
+ return (unsigned int)seed;
}
}
-char *GetLoginName()
+char *getLoginName()
{
struct passwd *pwd;
- if (!(pwd=getpwuid(getuid())))
- return("ANONYMOUS");
+ if (!(pwd = getpwuid(getuid())))
+ return "ANONYMOUS";
else
- return(pwd->pw_name);
+ return pwd->pw_name;
+}
+
+char *getHomeDir()
+{
+ static char *home_dir = NULL;
+
+ if (!home_dir)
+ {
+ if (!(home_dir = getenv("HOME")))
+ {
+ struct passwd *pwd;
+
+ if ((pwd = getpwuid(getuid())))
+ home_dir = pwd->pw_dir;
+ else
+ home_dir = ".";
+ }
+ }
+
+ return home_dir;
}
void MarkTileDirty(int x, int y)
int yy = redraw_y1 + y;
if (!redraw[xx][yy])
- {
- redraw[xx][yy] = TRUE;
redraw_tiles++;
- redraw_mask |= REDRAW_TILES;
- }
+
+ redraw[xx][yy] = TRUE;
+ redraw_mask |= REDRAW_TILES;
}
void GetOptions(char *argv[])
options.display_name = NULL;
options.server_host = NULL;
options.server_port = 0;
+ options.base_directory = BASE_PATH;
+ options.level_directory = BASE_PATH "/" LEVELS_DIRECTORY;
options.serveronly = FALSE;
options.network = FALSE;
options.verbose = FALSE;
printf("Usage: %s [options] [server.name [port]]\n"
"Options:\n"
" -d, --display machine:0 X server display\n"
+ " -b, --basepath directory alternative base directory\n"
" -l, --levels directory alternative level directory\n"
" -s, --serveronly only start network server\n"
" -n, --network network multiplayer game\n"
printf("--display == '%s'\n", options.display_name);
}
+ else if (strncmp(option, "-basepath", option_len) == 0)
+ {
+ if (option_arg == NULL)
+ Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str);
+
+ options.base_directory = option_arg;
+ 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);
+ }
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;
+ options.level_directory = option_arg;
if (option_arg == next_option)
options_left++;
- printf("--levels == '%s'\n", level_directory);
+ printf("--levels == '%s'\n", options.level_directory);
}
else if (strncmp(option, "-network", option_len) == 0)
{
FILE *output_stream = stderr;
char *process_name = "";
- if (mode == ERR_EXIT_SOUNDSERVER)
+ if (mode & ERR_SOUNDSERVER)
process_name = " sound server";
if (format_str)
fprintf(output_stream, "%s%s: ", program_name, process_name);
+ if (mode & ERR_WARN)
+ fprintf(output_stream, "warning: ");
+
va_start(ap, format_str); /* ap points to first unnamed argument */
for(format_ptr=format_str; *format_ptr; format_ptr++)
fprintf(output_stream, "\n");
}
- if (mode == ERR_EXIT_HELP)
+ if (mode & ERR_HELP)
fprintf(output_stream, "%s: Try option '--help' for more information.\n",
program_name);
- if (mode != ERR_RETURN)
+ if (mode & ERR_EXIT)
{
fprintf(output_stream, "%s%s: aborting\n", program_name, process_name);
CloseAllAndExit(1);
return ptr;
}
+void *checked_calloc(unsigned long size)
+{
+ void *ptr;
+
+ ptr = calloc(1, size);
+
+ if (ptr == NULL)
+ Error(ERR_EXIT, "cannot allocate %d bytes -- out of memory", size);
+
+ return ptr;
+}
+
#define TRANSLATE_KEYSYM_TO_KEYNAME 0
#define TRANSLATE_KEYSYM_TO_X11KEYNAME 1
#define TRANSLATE_X11KEYNAME_TO_KEYSYM 2