diff --git a/.gitignore b/.gitignore index 24ed2df2e..78d475c70 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ build-*/ ipch/ *.log src/Release/ +game-e3/data/ +game-e3/reports/ diff --git a/eressea b/eressea index cde0ce074..79feb5723 160000 --- a/eressea +++ b/eressea @@ -1 +1 @@ -Subproject commit cde0ce07424e19db30c2d61ce6356cf58fa12ba8 +Subproject commit 79feb5723c075a45a1a94ed286c87993314ce8da diff --git a/game-e3/eressea.ini b/game-e3/eressea.ini index 98dd9fc1b..efc181a02 100644 --- a/game-e3/eressea.ini +++ b/game-e3/eressea.ini @@ -11,7 +11,7 @@ locales = de,en [config] game = e3a source_dir = .. -maxnmrs = 10 +maxnmrs = 20 [editor] color = 1 diff --git a/src/main.c b/src/main.c index 5180af4b0..c2fb6cc8a 100644 --- a/src/main.c +++ b/src/main.c @@ -89,6 +89,10 @@ static int parse_args(int argc, char **argv, int *exitcode) case 't': turn = atoi(argv[i][2] ? argv[i]+2 : argv[++i]); break; + case 'r': + entry_point = "run_turn"; + turn = atoi(argv[i][2] ? argv[i]+2 : argv[++i]); + break; case 'q': verbosity = 0; break;