diff --git a/src/common/kernel/region.c b/src/common/kernel/region.c index 533d7076f..59781eceb 100644 --- a/src/common/kernel/region.c +++ b/src/common/kernel/region.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: region.c,v 1.8 2001/02/10 19:24:05 enno Exp $ + * $Id: region.c,v 1.9 2001/02/11 08:55:48 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) @@ -713,7 +713,11 @@ void setluxuries(region * r, const luxury_type * sale) { const luxury_type * ltype; + assert(r->land); + + if(r->land->demands) freelist(r->land->demands); + for (ltype=luxurytypes; ltype; ltype=ltype->next) { struct demand * dmd = calloc(sizeof(struct demand), 1); dmd->type = ltype; diff --git a/src/mapper/mapper.c b/src/mapper/mapper.c index d842883de..e6487d57b 100644 --- a/src/mapper/mapper.c +++ b/src/mapper/mapper.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: mapper.c,v 1.11 2001/02/10 15:27:10 corwin Exp $ + * $Id: mapper.c,v 1.12 2001/02/11 08:55:48 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) @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -1246,6 +1247,8 @@ main(int argc, char *argv[]) init_arena(); init_xmas2000(); + init_gmcmd(); + if(!*datafile) sprintf(datafile, "%s/%d", datapath(), turn);