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

- setluxuries

This commit is contained in:
Christian Schlittchen 2001-02-11 08:55:48 +00:00
parent c3b06cca5e
commit 93192b01ff
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
/* vi: set ts=2: /* 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 * 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)
@ -713,7 +713,11 @@ void
setluxuries(region * r, const luxury_type * sale) setluxuries(region * r, const luxury_type * sale)
{ {
const luxury_type * ltype; const luxury_type * ltype;
assert(r->land); assert(r->land);
if(r->land->demands) freelist(r->land->demands);
for (ltype=luxurytypes; ltype; ltype=ltype->next) { for (ltype=luxurytypes; ltype; ltype=ltype->next) {
struct demand * dmd = calloc(sizeof(struct demand), 1); struct demand * dmd = calloc(sizeof(struct demand), 1);
dmd->type = ltype; dmd->type = ltype;

5
src/mapper/mapper.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* 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 * 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)
@ -30,6 +30,7 @@
#include <modules/xmas2000.h> #include <modules/xmas2000.h>
#include <modules/arena.h> #include <modules/arena.h>
#include <modules/museum.h> #include <modules/museum.h>
#include <modules/gmcmd.h>
#include <item.h> #include <item.h>
#include <faction.h> #include <faction.h>
@ -1246,6 +1247,8 @@ main(int argc, char *argv[])
init_arena(); init_arena();
init_xmas2000(); init_xmas2000();
init_gmcmd();
if(!*datafile) if(!*datafile)
sprintf(datafile, "%s/%d", datapath(), turn); sprintf(datafile, "%s/%d", datapath(), turn);