From f3a8e1a45303b600f547e9927dc39364d1d5d2df Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 8 Apr 2004 10:14:23 +0000 Subject: [PATCH] wdw-spezifische fehler. kleiner umbau an den jamrules --- src/Jamrules | 18 ++- src/common/kernel/xmlreader.c | 1 - src/eressea/Jamfile | 14 ++- src/mapper/Jamfile | 6 +- src/res/vinyambar-wdw.xml | 4 +- src/res/vinyambar/wdw-strings.xml | 190 ++++++++++++++---------------- 6 files changed, 122 insertions(+), 111 deletions(-) diff --git a/src/Jamrules b/src/Jamrules index c8ecd88cf..ecd5a4aec 100644 --- a/src/Jamrules +++ b/src/Jamrules @@ -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 ; diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c index 07457cf81..a92080518 100644 --- a/src/common/kernel/xmlreader.c +++ b/src/common/kernel/xmlreader.c @@ -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]; diff --git a/src/eressea/Jamfile b/src/eressea/Jamfile index 1e217cd56..cc6bfd495 100644 --- a/src/eressea/Jamfile +++ b/src/eressea/Jamfile @@ -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 ] ; diff --git a/src/mapper/Jamfile b/src/mapper/Jamfile index bdadf535f..a2fdb61e3 100644 --- a/src/mapper/Jamfile +++ b/src/mapper/Jamfile @@ -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 ; diff --git a/src/res/vinyambar-wdw.xml b/src/res/vinyambar-wdw.xml index 74c843a1a..4f856b0db 100644 --- a/src/res/vinyambar-wdw.xml +++ b/src/res/vinyambar-wdw.xml @@ -35,10 +35,10 @@ - vinyambar@eressea.amber.kn-bremen.de + vinyambar@eressea.amber.kn-bremen.de - WDW BEFEHLE + WDW BEFEHLE diff --git a/src/res/vinyambar/wdw-strings.xml b/src/res/vinyambar/wdw-strings.xml index 61ef2bd7d..1e0e306e8 100644 --- a/src/res/vinyambar/wdw-strings.xml +++ b/src/res/vinyambar/wdw-strings.xml @@ -1,103 +1,93 @@ - - - Schriftrolle - scroll - - - Schriftrollen - scrolls - - - - - Edelstein - gem - - - Edelsteine - gems - - - - - Opal - opal - - - Opale - opals - - - - - Diamant - diamond - - - Diamanten - diamonds - - - - - Saphir - zaphire - - - Saphire - zaphires - - - - - Topas - topaz - - - Topase - topazes - - - - - Beryll - beryl - - - Berylle - beryls - - - - - Achat - agate - - - Achate - agates - - - - - Granat - garnet - - - Granate - garnets - - - - - Smaragd - emerald - - - Smaragde - emeralds - - + + + Schriftrolle + scroll + + + Schriftrollen + scrolls + + + + Edelstein + gem + + + Edelsteine + gems + + + + Opal + opal + + + Opale + opals + + + + Diamant + diamond + + + Diamanten + diamonds + + + + Saphir + zaphire + + + Saphire + zaphires + + + + Topas + topaz + + + Topase + topazes + + + + Beryll + beryl + + + Berylle + beryls + + + + Achat + agate + + + Achate + agates + + + + Granat + garnet + + + Granate + garnets + + + + Smaragd + emerald + + + Smaragde + emeralds +