diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c index f4b045f56..26c220120 100644 --- a/src/common/kernel/save.c +++ b/src/common/kernel/save.c @@ -1,6 +1,6 @@ /* 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 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -455,7 +455,7 @@ readfaction(void) * muß in "Gänsefüßchen" stehen!! */ /* War vorher in main.c:getgarbage() */ - if (!quiet) printf(" %s;", factionid(f)); + if (!quiet) { printf(" %s;", factionid(f)); fflush(stdout); } freestrlist(f->mistakes); f->mistakes = 0; @@ -541,6 +541,7 @@ readorders(const char *filename) } fclose(F); + printf("\n"); return 0; } /* ------------------------------------------------------------- */ @@ -1691,6 +1692,7 @@ writegame(char *path, char quiet) if ((n%1024)==0) { /* das spart extrem Zeit */ printf(" - Schreibe Regionen: %d \r", n); + fflush(stdout); } wnl(F); diff --git a/src/mapper/mapper.c b/src/mapper/mapper.c index ab3a05c4e..d842883de 100644 --- a/src/mapper/mapper.c +++ b/src/mapper/mapper.c @@ -1,6 +1,6 @@ /* 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 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -179,25 +179,26 @@ RegionSymbol(region *r) { } } break; -#ifdef NEW_ITEMS - /* todo */ -#else case 2: { - int tg; - - if(r->land) { - for(tg = 0; tg != MAXLUXURIES; tg++) { - if(!rdemand(r, tg)) break; - } - rs = (unsigned char)itemdata[FIRSTLUXURY + tg].name[1][0]; - } else { + if(r->land == NULL || r->land->demands == NULL) { 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; -#endif case 3: { const herb_type *herb = rherbtype(r);