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

- Handelskarte im Mapper repariert

This commit is contained in:
Christian Schlittchen 2001-02-10 15:27:10 +00:00
parent 7d45756141
commit 0467736f70
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: save.c,v 1.13 2001/02/10 14:18:00 enno Exp $ * $Id: save.c,v 1.14 2001/02/10 15:27:09 corwin Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de)
@ -455,7 +455,7 @@ readfaction(void)
* muß in "Gänsefüßchen" stehen!! */ * muß in "Gänsefüßchen" stehen!! */
/* War vorher in main.c:getgarbage() */ /* War vorher in main.c:getgarbage() */
if (!quiet) printf(" %s;", factionid(f)); if (!quiet) { printf(" %s;", factionid(f)); fflush(stdout); }
freestrlist(f->mistakes); freestrlist(f->mistakes);
f->mistakes = 0; f->mistakes = 0;
@ -541,6 +541,7 @@ readorders(const char *filename)
} }
fclose(F); fclose(F);
printf("\n");
return 0; return 0;
} }
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */
@ -1691,6 +1692,7 @@ writegame(char *path, char quiet)
if ((n%1024)==0) { /* das spart extrem Zeit */ if ((n%1024)==0) { /* das spart extrem Zeit */
printf(" - Schreibe Regionen: %d \r", n); printf(" - Schreibe Regionen: %d \r", n);
fflush(stdout);
} }
wnl(F); wnl(F);

29
src/mapper/mapper.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: mapper.c,v 1.10 2001/02/09 19:52:59 corwin Exp $ * $Id: mapper.c,v 1.11 2001/02/10 15:27:10 corwin Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de)
@ -179,25 +179,26 @@ RegionSymbol(region *r) {
} }
} }
break; break;
#ifdef NEW_ITEMS
/* todo */
#else
case 2: case 2:
{ {
int tg; if(r->land == NULL || r->land->demands == NULL) {
if(r->land) {
for(tg = 0; tg != MAXLUXURIES; tg++) {
if(!rdemand(r, tg)) break;
}
rs = (unsigned char)itemdata[FIRSTLUXURY + tg].name[1][0];
} else {
rs = terrain[rterrain(r)].symbol; rs = terrain[rterrain(r)].symbol;
if(rs == 'P' && rtrees(r) >= 600) rs = 'F'; } else {
const luxury_type *sale=NULL;
struct demand *dmd;
for (dmd=r->land->demands;dmd;dmd=dmd->next) {
if (dmd->value==0) sale = dmd->type;
}
if(sale == NULL) { /* Kann nur bei einem Bug passieren */
rs = terrain[rterrain(r)].symbol;
} else {
rs = resourcename(sale->itype->rtype, 0)[0];
}
} }
} }
break; break;
#endif
case 3: case 3:
{ {
const herb_type *herb = rherbtype(r); const herb_type *herb = rherbtype(r);