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

http://eressea.upb.de/mantis/view.php?id=849 

BENUTZE Dumpfbackenbrot
This commit is contained in:
Enno Rehling 2006-05-07 20:26:39 +00:00
parent d47f599537
commit 78d222138e
7 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/kernel/region.h
View File

@ -18,7 +18,7 @@
extern "C" { extern "C" {
#endif #endif
#include "language.h" #include <util/language.h>
#include <assert.h> #include <assert.h>
/* FAST_CONNECT: regions are directly connected to neighbours, saves doing /* FAST_CONNECT: regions are directly connected to neighbours, saves doing
@ -69,7 +69,7 @@ typedef struct land_region {
} * demands; } * demands;
const struct item_type * herbtype; const struct item_type * herbtype;
short herbs; short herbs;
int trees[3]; /* 0 -> Samen, 1 -> Sprößlinge, 2 -> Bäume */ int trees[3]; /* 0 -> seeds, 1 -> shoots, 2 -> trees */
int horses; int horses;
int peasants; int peasants;
int newpeasants; int newpeasants;

5
src/common/kernel/xmlreader.c
View File

@ -816,9 +816,10 @@ xml_readitem(xmlXPathContextPtr xpath, resource_type * rtype)
assert(property!=NULL); assert(property!=NULL);
if (strcmp((const char*)property, "give")==0) { if (strcmp((const char*)property, "give")==0) {
itype->give = (boolean (*)(const struct unit*, const struct unit*, const struct item_type *, int, struct order *))fun; itype->give = (boolean (*)(const struct unit*, const struct unit*, const struct item_type *, int, struct order *))fun;
} } else if (strcmp((const char*)property, "use")==0) {
else if (strcmp((const char*)property, "use")==0) {
itype->use = (int (*)(struct unit *, const struct item_type *, int, struct order *))fun; itype->use = (int (*)(struct unit *, const struct item_type *, int, struct order *))fun;
} else if (strcmp((const char*)property, "useonother")==0) {
itype->useonother = (int (*)(struct unit *, int targetno, const struct item_type *, int, struct order *))fun;
} else { } else {
log_error(("unknown function type '%s' for item '%s'\n", log_error(("unknown function type '%s' for item '%s'\n",
(const char*)property, rtype->_name[0])); (const char*)property, rtype->_name[0]));

1
src/common/util/cvector.h
View File

@ -1,5 +1,4 @@
/* vi: set ts=2: /* vi: set ts=2:
*
* *
* Eressea PB(E)M host Copyright (C) 1998-2003 * Eressea PB(E)M host Copyright (C) 1998-2003
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)

1
src/common/util/event.h
View File

@ -1,5 +1,4 @@
/* vi: set ts=2: /* vi: set ts=2:
*
* *
* Eressea PB(E)M host Copyright (C) 1998-2003 * Eressea PB(E)M host Copyright (C) 1998-2003
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)

2
src/res/resources.xml
View File

@ -617,7 +617,7 @@
<resource name="p7" appearance="vial" sneak="yes"> <resource name="p7" appearance="vial" sneak="yes">
<item weight="0" score="90"> <item weight="0" score="90">
<function name="use" value="usefoolpotion"/> <function name="useonother" value="usefoolpotion"/>
<potion level="3"/> <potion level="3"/>
<construction skill="alchemy" minskill="6" reqsize="1"> <construction skill="alchemy" minskill="6" reqsize="1">
<requirement type="h2"/> <requirement type="h2"/>

12
src/tools/reduce.c
View File

@ -10,14 +10,14 @@
without prior permission by the authors of Eressea. without prior permission by the authors of Eressea.
*/ */
#include <config.h> #include <config.h>
#include <eressea.h> #include <kernel/eressea.h>
#include <region.h> #include <kernel/region.h>
#include <faction.h> #include <kernel/faction.h>
#include <unit.h> #include <kernel/unit.h>
#include <save.h> #include <kernel/save.h>
#include <base36.h> #include <util/base36.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

2
src/tools/translator.c
View File

@ -60,7 +60,7 @@ test_message(void)
} }
#include <string.h> #include <string.h>
#include <language.h> #include <util/language.h>
message * message *
new_message(struct faction * receiver, const char* sig, ...) new_message(struct faction * receiver, const char* sig, ...)