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

- Mapper startet wieder

This commit is contained in:
Christian Schlittchen 2001-02-04 18:51:00 +00:00
parent cbf2f72788
commit 6b39b789c5
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/gamecode/report.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: report.c,v 1.9 2001/02/04 13:47:25 corwin Exp $ * $Id: report.c,v 1.10 2001/02/04 18:50:59 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)
@ -861,9 +861,7 @@ see_border(border * b, faction * f, region * r)
return cs; return cs;
} }
attrib_type at_roads_override = { extern attrib_type at_roads_override;
"roads_override", NULL, NULL, NULL, &a_writestring, &a_readstring
};
static void static void
describe(FILE * F, region * r, int partial, faction * f) describe(FILE * F, region * r, int partial, faction * f)

3
src/common/kernel/magic.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: magic.c,v 1.4 2001/02/03 13:45:32 enno Exp $ * $Id: magic.c,v 1.5 2001/02/04 18:50:59 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)
@ -2440,7 +2440,6 @@ set_familiar(unit * mage, unit * familiar)
skillmod_data * smd = (skillmod_data *)a->data.v; skillmod_data * smd = (skillmod_data *)a->data.v;
smd->special = sm_familiar; smd->special = sm_familiar;
smd->skill=NOSKILL; smd->skill=NOSKILL;
assert(!nonplayer(mage));
} }
a = a_find(mage->attribs, &at_familiar); a = a_find(mage->attribs, &at_familiar);

2
src/corwin.mk
View File

@ -1,6 +1,4 @@
CONVERT_TRIGGERS = 1
ifndef ERESSEA ifndef ERESSEA
export ERESSEA=$(PWD) export ERESSEA=$(PWD)
endif endif

6
src/mapper/mapper.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: mapper.c,v 1.4 2001/02/03 13:45:34 enno Exp $ * $Id: mapper.c,v 1.5 2001/02/04 18:51:00 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)
@ -25,6 +25,7 @@
#include <attributes/attributes.h> #include <attributes/attributes.h>
#include <triggers/triggers.h> #include <triggers/triggers.h>
#include <items/weapons.h> #include <items/weapons.h>
#include <items/items.h>
#include <modules/xmas2000.h> #include <modules/xmas2000.h>
#include <modules/arena.h> #include <modules/arena.h>
@ -1199,7 +1200,8 @@ main(int argc, char *argv[])
init_attributes(); init_attributes();
init_resources(); init_resources();
init_weapons(); /* init_weapons(); */
init_items();
init_museum(); init_museum();
init_arena(); init_arena();