wdw-spezifische fehler. kleiner umbau an den jamrules

src/Jamrules

@@ -29,6 +29,22 @@ CCFLAGS += -Wwrite-strings
 		   -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 ;

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];

src/eressea/Jamfile

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

src/mapper/Jamfile

@@ -30,4 +30,6 @@ LinkLibraries mapper :
  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 ;

src/res/vinyambar-wdw.xml

@@ -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>

src/res/vinyambar/wdw-strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <strings>
-	<string>
+
     <string name="magicskillboost">
       <text locale="de">Schriftrolle</text>
       <text locale="en">scroll</text>
@@ -9,8 +9,7 @@
       <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>
@@ -19,8 +18,7 @@
       <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>
@@ -29,8 +27,7 @@
       <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>
@@ -39,8 +36,7 @@
       <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>
@@ -49,8 +45,7 @@
       <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>
@@ -59,8 +54,7 @@
       <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>
@@ -69,8 +63,7 @@
       <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>
@@ -79,8 +72,7 @@
       <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>
@@ -89,8 +81,7 @@
       <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>
@@ -99,5 +90,4 @@
       <text locale="de">Smaragde</text>
       <text locale="en">emeralds</text>
     </string>
-	</string>
 </strings>