Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

Piraterie Crashfix

Browse source
This commit is contained in:
Enno Rehling 2007-01-21 09:25:23 +00:00
parent 5e2a2f3b9a
commit 2eb2bf56a9
2 changed files with 95 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/kernel/movement.c
View file

@ -2148,16 +2148,17 @@ piracy_cmd(unit *u, struct order * ord)
const faction * p = data->pirate; const faction * p = data->pirate;
const faction * t = data->target; const faction * t = data->target;
if (alliedunit(u, p, HELP_FIGHT) && (il == 0 || intlist_find(il, t->no))) { if (alliedunit(u, p, HELP_FIGHT)) {
if (il == 0 || (t && intlist_find(il, t->no))) {
target_dir = data->dir; target_dir = data->dir;
break; break;
} }
} }
}
/* Wenn nicht, sehen wir, ob wir ein Ziel finden. */ /* Wenn nicht, sehen wir, ob wir ein Ziel finden. */
if (target_dir == NODIRECTION) { if (target_dir == NODIRECTION) {
/* Einheit ist also Kapitän. Jetzt gucken, in wievielen /* Einheit ist also Kapitän. Jetzt gucken, in wievielen
* Nachbarregionen potentielle Opfer sind. */ * Nachbarregionen potentielle Opfer sind. */

16
src/eressea/gmtool.c
View file

@ -102,12 +102,13 @@ usage(const char * prog, const char * arg)
"-b basedir : gibt das basisverzeichnis an\n" "-b basedir : gibt das basisverzeichnis an\n"
"-d datadir : gibt das datenverzeichnis an\n" "-d datadir : gibt das datenverzeichnis an\n"
"-r resdir : gibt das resourceverzeichnis an\n" "-r resdir : gibt das resourceverzeichnis an\n"
"-t turn : read this datafile, not the most current one\n" "-t turn : read this datafile\n"
"-v : be verbose\n" "-v : be verbose\n"
"-l logfile : write messages to <logfile>\n" "-l logfile : write messages to <logfile>\n"
"--xml xmlfile : read settings from <xmlfile>.\n" "--xml xmlfile : read settings from <xmlfile>.\n"
"--lomem : save RAM\n" "--lomem : save RAM\n"
"--color : force color mode\n" "--color : force color mode\n"
"--current : read the most current datafile\n"
"--help : help\n", prog); "--help : help\n", prog);
return -1; return -1;
} }
@ -146,6 +147,8 @@ read_args(int argc, char **argv)
lomem = true; lomem = true;
} else if (strcmp(argv[i]+2, "color")==0) { } else if (strcmp(argv[i]+2, "color")==0) {
force_color = 1; force_color = 1;
} else if (strcmp(argv[i]+2, "current")==0) {
turn = -1;
} else if (strcmp(argv[i]+2, "help")==0) } else if (strcmp(argv[i]+2, "help")==0)
return usage(argv[0], NULL); return usage(argv[0], NULL);
else else
@ -186,6 +189,17 @@ read_args(int argc, char **argv)
} }
} }
} }
if (turn==-1) {
char fname[MAX_PATH];
sprintf(fname, "%s/turn", basepath());
FILE * F = fopen(fname, "r+");
if (F) {
fgets(fname, sizeof(fname), F);
turn = atoi(fname);
fclose(F);
}
else turn = 0;
}
return 0; return 0;
} }