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

tutorial and mapper run with new xml code.

This commit is contained in:
Enno Rehling 2004-03-29 17:41:19 +00:00
parent 20ef89f6ce
commit 55141617cb
5 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eressea/Jamfile
View File

@ -29,7 +29,7 @@ LinkLibraries $(SERVER) :
LinkLibraries $(LUASERVER) : LinkLibraries $(LUASERVER) :
gamecode kernel items modules attributes spells races triggers util ; gamecode kernel items modules attributes spells races triggers util ;
LINKLIBS on $(SERVER) += -L$(LUABIND_ROOT)/lib -lm -lxml2 -liconv ; LINKLIBS on $(SERVER) += -L$(LUABIND_ROOT)/lib -lm -lxml2 ;
LINKLIBS on $(LUASERVER) += -L$(LUABIND_ROOT)/lib -llua50 -llualib50 ; LINKLIBS on $(LUASERVER) += -L$(LUABIND_ROOT)/lib -llua50 -llualib50 ;
LINKLIBS on $(LUASERVER) += -lm -lluabind -ldl -lstdc++ -lxml2 -liconv ; LINKLIBS on $(LUASERVER) += -lm -lluabind -ldl -lstdc++ -lxml2 -liconv ;
# -Wl,-R,$(HOME)/software/$(HOST)/lib ; # -Wl,-R,$(HOME)/software/$(HOST)/lib ;

13
src/eressea/main.c
View File

@ -59,6 +59,7 @@
#include <laws.h> #include <laws.h>
/* kernel includes */ /* kernel includes */
#include <kernel/xmlreader.h>
#include <building.h> #include <building.h>
#include <creport.h> #include <creport.h>
#include <faction.h> #include <faction.h>
@ -79,6 +80,7 @@
/* util includes */ /* util includes */
#include <rand.h> #include <rand.h>
#include <util/xml.h>
#include <log.h> #include <log.h>
#include <sql.h> #include <sql.h>
#include <base36.h> #include <base36.h>
@ -171,12 +173,13 @@ game_init(void)
register_dungeon(); register_dungeon();
#endif #endif
init_data(xmlfile); register_xmlreader();
init_locales(); init_data(xmlfile);
init_attributes(); init_locales();
init_resources(); init_attributes();
init_items(); init_races();
init_items();
init_races(); init_races();
init_economy(); init_economy();
#if NEW_RESOURCEGROWTH #if NEW_RESOURCEGROWTH

2
src/mapper/Jamfile
View File

@ -30,4 +30,4 @@ LinkLibraries mapper :
triggers triggers
util ; util ;
LINKLIBS on mapper += -L$(LUABIND_ROOT)/lib -lm -lncurses -lxml2 -liconv ; LINKLIBS on mapper += -L$(LUABIND_ROOT)/lib -lm -lncurses -lxml2 ;

12
src/mapper/mapper.c
View File

@ -46,6 +46,7 @@
#endif #endif
/* kernel includes */ /* kernel includes */
#include <kernel/xmlreader.h>
#include <item.h> #include <item.h>
#include <faction.h> #include <faction.h>
#include <race.h> #include <race.h>
@ -1718,12 +1719,13 @@ main(int argc, char *argv[])
#endif #endif
/* register_dungeon(); */ /* register_dungeon(); */
init_data(xmlfile); register_xmlreader();
init_locales(); init_data(xmlfile);
init_resources(); init_locales();
register_items(); init_attributes();
init_attributes();
init_resources();
#if NEW_RESOURCEGROWTH #if NEW_RESOURCEGROWTH
init_rawmaterials(); init_rawmaterials();
#endif #endif

3
src/res/tutorial.xml
View File

@ -33,7 +33,8 @@
<xi:include file="eressea/dungeons.xml"/> <xi:include file="eressea/dungeons.xml"/>
<strings> <strings>
<string name="mailto"> <string name="mailto">
<text>tutorial@eressea.upb.de</text> <text locale="en">tutorial@eressea.upb.de</text>
<text locale="de">tutorial@eressea.upb.de</text>
</string> </string>
<string name="mailcmd"> <string name="mailcmd">
<text locale="de">ERESSEA BEFEHLE</text> <text locale="de">ERESSEA BEFEHLE</text>