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

persistente befehle - fix 

einladen einer einzelnen plane mit -p
This commit is contained in:
Enno Rehling 2002-05-05 09:34:36 +00:00
parent bcdcd556dd
commit 48241fae72
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/kernel/save.c
View File

@ -578,6 +578,8 @@ inner_world(region * r)
} }
int maxregions = -1; int maxregions = -1;
int loadplane = 0;
boolean dirtyload = false; boolean dirtyload = false;
enum { enum {
@ -843,6 +845,7 @@ readgame(boolean backup)
boolean skip = false; boolean skip = false;
int x = ri(F); int x = ri(F);
int y = ri(F); int y = ri(F);
plane * pl = findplane(x, y);
if (firstx && firsty) { if (firstx && firsty) {
if (x!=firstx || y!=firsty) { if (x!=firstx || y!=firsty) {
@ -853,6 +856,7 @@ readgame(boolean backup)
if (rmax>0) rmax = min(n, rmax)-1; if (rmax>0) rmax = min(n, rmax)-1;
} }
} }
if (loadplane && (!pl || pl->id!=loadplane)) skip = true;
if (rmax==0) { if (rmax==0) {
if (dirtyload) break; if (dirtyload) break;
skip = true; skip = true;
@ -1037,7 +1041,7 @@ readgame(boolean backup)
if(findfaction(0)) { if(findfaction(0)) {
findfaction(0)->alive = 1; findfaction(0)->alive = 1;
} }
if (maxregions>=0) { if (loadplane || maxregions>=0) {
remove_empty_factions(false); remove_empty_factions(false);
} }

5
src/eressea/main.c
View File

@ -100,6 +100,8 @@ extern boolean nobattle;
extern boolean nobattledebug; extern boolean nobattledebug;
extern boolean dirtyload; extern boolean dirtyload;
extern int loadplane;
extern void debug_messagetypes(FILE * out); extern void debug_messagetypes(FILE * out);
extern void free_region(region * r); extern void free_region(region * r);
extern void render_init(void); extern void render_init(void);
@ -526,6 +528,9 @@ read_args(int argc, char **argv)
if (i<argc) orders = argv[++i]; if (i<argc) orders = argv[++i];
else return usage(argv[0], argv[i]); else return usage(argv[0], argv[i]);
break; break;
case 'p':
loadplane = atoi(argv[++i]);
break;
case 'x': case 'x':
maxregions = atoi(argv[++i]); maxregions = atoi(argv[++i]);
maxregions = (maxregions*81+80) / 81; maxregions = (maxregions*81+80) / 81;