wdw-spezifische fehler. kleiner umbau an den jamrules

This commit is contained in:
Enno Rehling 2004-04-08 10:14:23 +00:00
parent e8b5e62aaa
commit f3a8e1a453
6 changed files with 122 additions and 111 deletions

View File

@ -26,9 +26,25 @@ CCFLAGS += -Wall ;
CCFLAGS += -Wwrite-strings
-Wstrict-prototypes
-Werror-implicit-function-declaration
-Wno-char-subscripts
-Wno-char-subscripts
;
rule iconv
{
LINKLIBS on $(<) += -liconv ;
}
rule luabind
{
LINKLIBS on $(<) += -L$(LUABIND_ROOT)/lib -llua50 -llualib50 ;
LINKLIBS on $(<) += -lm -lluabind ;
}
rule libxml2
{
LINKLIBS on $(<) += -lxml2 ;
}
rule UsingLuabind
{
SubDirHdrs $(LUABIND_ROOT)/include ;

View File

@ -783,7 +783,6 @@ parse_races(xmlDocPtr doc)
/* reading eressea/races/race/attack */
xpath->node = node;
result = xmlXPathEvalExpression(BAD_CAST "attack", xpath);
assert(rc->attack[0].data.dice==NULL || !"attacks are already initialized");
for (k=0;k!=result->nodesetval->nodeNr;++k) {
xmlNodePtr node = result->nodesetval->nodeTab[k];
struct att * a = &rc->attack[k];

View File

@ -28,11 +28,15 @@ LinkLibraries $(SERVER) :
gamecode kernel items modules attributes spells races triggers util ;
LinkLibraries $(LUASERVER) :
gamecode kernel items modules attributes spells races triggers util ;
LINKLIBS on $(SERVER) += -L$(LUABIND_ROOT)/lib -lm -lxml2 ;
LINKLIBS on $(LUASERVER) += -L$(LUABIND_ROOT)/lib -llua50 -llualib50 ;
LINKLIBS on $(LUASERVER) += -lm -lluabind -ldl -lstdc++ -lxml2 -liconv ;
# -Wl,-R,$(HOME)/software/$(HOST)/lib ;
iconv $(SERVER) ;
libxml2 $(SERVER) ;
LINKLIBS on $(SERVER) += -L$(LUABIND_ROOT)/lib -lm ;
luabind $(LUASERVER) ;
iconv $(LUASERVER) ;
libxml2 $(LUASERVER) ;
LINKLIBS on $(LUASERVER) += -lm -ldl -lstdc++ ;
if $(HAVE_LUA) {
SEARCH_SOURCE += [ FDirName $(SUBDIR) lua ] ;

View File

@ -29,5 +29,7 @@ LinkLibraries mapper :
races
triggers
util ;
LINKLIBS on mapper += -L$(LUABIND_ROOT)/lib -lm -lncurses -lxml2 ;
iconv mapper ;
libxml2 mapper ;
LINKLIBS on mapper += -L$(LUABIND_ROOT)/lib -lm -lncurses ;

View File

@ -35,10 +35,10 @@
<strings>
<string name="mailto">
<text>vinyambar@eressea.amber.kn-bremen.de</text>
<text locale="de">vinyambar@eressea.amber.kn-bremen.de</text>
</string>
<string name="mailcmd">
<text>WDW BEFEHLE</text>
<text locale="de">WDW BEFEHLE</text>
</string>
</strings>
</eressea>

View File

@ -1,103 +1,93 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<strings>
<string>
<string name="magicskillboost">
<text locale="de">Schriftrolle</text>
<text locale="en">scroll</text>
</string>
<string name="magicskillboost_p">
<text locale="de">Schriftrollen</text>
<text locale="en">scrolls</text>
</string>
</string>
<string>
<string name="gem">
<text locale="de">Edelstein</text>
<text locale="en">gem</text>
</string>
<string name="gem_p">
<text locale="de">Edelsteine</text>
<text locale="en">gems</text>
</string>
</string>
<string>
<string name="opal">
<text locale="de">Opal</text>
<text locale="en">opal</text>
</string>
<string name="opal_p">
<text locale="de">Opale</text>
<text locale="en">opals</text>
</string>
</string>
<string>
<string name="diamond">
<text locale="de">Diamant</text>
<text locale="en">diamond</text>
</string>
<string name="diamond_p">
<text locale="de">Diamanten</text>
<text locale="en">diamonds</text>
</string>
</string>
<string>
<string name="zaphire">
<text locale="de">Saphir</text>
<text locale="en">zaphire</text>
</string>
<string name="zaphire_p">
<text locale="de">Saphire</text>
<text locale="en">zaphires</text>
</string>
</string>
<string>
<string name="topaz">
<text locale="de">Topas</text>
<text locale="en">topaz</text>
</string>
<string name="topaz_p">
<text locale="de">Topase</text>
<text locale="en">topazes</text>
</string>
</string>
<string>
<string name="beryl">
<text locale="de">Beryll</text>
<text locale="en">beryl</text>
</string>
<string name="beryl_p">
<text locale="de">Berylle</text>
<text locale="en">beryls</text>
</string>
</string>
<string>
<string name="agate">
<text locale="de">Achat</text>
<text locale="en">agate</text>
</string>
<string name="agate_p">
<text locale="de">Achate</text>
<text locale="en">agates</text>
</string>
</string>
<string>
<string name="garnet">
<text locale="de">Granat</text>
<text locale="en">garnet</text>
</string>
<string name="garnet_p">
<text locale="de">Granate</text>
<text locale="en">garnets</text>
</string>
</string>
<string>
<string name="emerald">
<text locale="de">Smaragd</text>
<text locale="en">emerald</text>
</string>
<string name="emerald_p">
<text locale="de">Smaragde</text>
<text locale="en">emeralds</text>
</string>
</string>
<string name="magicskillboost">
<text locale="de">Schriftrolle</text>
<text locale="en">scroll</text>
</string>
<string name="magicskillboost_p">
<text locale="de">Schriftrollen</text>
<text locale="en">scrolls</text>
</string>
<string name="gem">
<text locale="de">Edelstein</text>
<text locale="en">gem</text>
</string>
<string name="gem_p">
<text locale="de">Edelsteine</text>
<text locale="en">gems</text>
</string>
<string name="opal">
<text locale="de">Opal</text>
<text locale="en">opal</text>
</string>
<string name="opal_p">
<text locale="de">Opale</text>
<text locale="en">opals</text>
</string>
<string name="diamond">
<text locale="de">Diamant</text>
<text locale="en">diamond</text>
</string>
<string name="diamond_p">
<text locale="de">Diamanten</text>
<text locale="en">diamonds</text>
</string>
<string name="zaphire">
<text locale="de">Saphir</text>
<text locale="en">zaphire</text>
</string>
<string name="zaphire_p">
<text locale="de">Saphire</text>
<text locale="en">zaphires</text>
</string>
<string name="topaz">
<text locale="de">Topas</text>
<text locale="en">topaz</text>
</string>
<string name="topaz_p">
<text locale="de">Topase</text>
<text locale="en">topazes</text>
</string>
<string name="beryl">
<text locale="de">Beryll</text>
<text locale="en">beryl</text>
</string>
<string name="beryl_p">
<text locale="de">Berylle</text>
<text locale="en">beryls</text>
</string>
<string name="agate">
<text locale="de">Achat</text>
<text locale="en">agate</text>
</string>
<string name="agate_p">
<text locale="de">Achate</text>
<text locale="en">agates</text>
</string>
<string name="garnet">
<text locale="de">Granat</text>
<text locale="en">garnet</text>
</string>
<string name="garnet_p">
<text locale="de">Granate</text>
<text locale="en">garnets</text>
</string>
<string name="emerald">
<text locale="de">Smaragd</text>
<text locale="en">emerald</text>
</string>
<string name="emerald_p">
<text locale="de">Smaragde</text>
<text locale="en">emeralds</text>
</string>
</strings>