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

fix tolua, I guess

This commit is contained in:
Enno Rehling 2015-07-11 23:45:59 +02:00
parent 252d8b8d88
commit c6da0c2189
13 changed files with 151 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf/e2/catalog.xml
View File

@ -5,12 +5,12 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<rewriteURI <rewriteURI
uriStartString="config:///core/" uriStartString="config://core/"
rewritePrefix="../../res/core/" /> rewritePrefix="../../res/core/" />
<rewriteURI <rewriteURI
uriStartString="config:///game/" uriStartString="config://game/"
rewritePrefix="../../res/eressea/" /> rewritePrefix="../../res/eressea/" />
<rewriteURI <rewriteURI
uriStartString="config:///default/" uriStartString="config://default/"
rewritePrefix="../../res/" /> rewritePrefix="../../res/" />
</catalog> </catalog>

64
conf/e2/config.xml
View File

@ -1,36 +1,36 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea xmlns:xi="http://www.w3.org/2001/XInclude"> <eressea xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="config:///core/messages.xml"/> <xi:include href="config://core/messages.xml"/>
<!-- Localization --> <!-- Localization -->
<xi:include href="config:///core/de/strings.xml"/> <xi:include href="config://core/de/strings.xml"/>
<xi:include href="config:///core/en/strings.xml"/> <xi:include href="config://core/en/strings.xml"/>
<xi:include href="config:///game/spellinfo.xml" /> <xi:include href="config://game/spellinfo.xml" />
<xi:include href="config:///core/common/items.xml" /> <xi:include href="config://core/common/items.xml" />
<xi:include href="config:///core/common/armor.xml" /> <xi:include href="config://core/common/armor.xml" />
<xi:include href="config:///core/common/weapons.xml" /> <xi:include href="config://core/common/weapons.xml" />
<xi:include href="config:///core/common/resources.xml" /> <xi:include href="config://core/common/resources.xml" />
<xi:include href="config:///core/common/luxuries.xml" /> <xi:include href="config://core/common/luxuries.xml" />
<xi:include href="config:///core/common/herbs.xml" /> <xi:include href="config://core/common/herbs.xml" />
<xi:include href="config:///core/common/potions.xml" /> <xi:include href="config://core/common/potions.xml" />
<xi:include href="config:///core/spoils.xml"/> <xi:include href="config://core/spoils.xml"/>
<xi:include href="config:///game/races.xml"/> <xi:include href="config://game/races.xml"/>
<xi:include href="config:///core/prefixes.xml"/> <xi:include href="config://core/prefixes.xml"/>
<xi:include href="config:///core/ships.xml"/> <xi:include href="config://core/ships.xml"/>
<xi:include href="config:///core/common/buildings.xml"/> <xi:include href="config://core/common/buildings.xml"/>
<xi:include href="config:///game/familiars.xml"/> <xi:include href="config://game/familiars.xml"/>
<xi:include href="config:///core/terrains.xml"/> <xi:include href="config://core/terrains.xml"/>
<xi:include href="config:///game/terrains.xml"/> <xi:include href="config://game/terrains.xml"/>
<xi:include href="config:///game/artrewards.xml"/> <xi:include href="config://game/artrewards.xml"/>
<xi:include href="config:///game/buildings.xml"/> <xi:include href="config://game/buildings.xml"/>
<xi:include href="config:///core/calendar.xml"/> <xi:include href="config://core/calendar.xml"/>
<calendar name="secondage" newyear="month_1" start="184"/> <calendar name="secondage" newyear="month_1" start="184"/>
<xi:include href="config:///game/equipment.xml"/> <xi:include href="config://game/equipment.xml"/>
<xi:include href="config:///game/items.xml"/> <xi:include href="config://game/items.xml"/>
<xi:include href="config:///game/spells.xml"/> <xi:include href="config://game/spells.xml"/>
<xi:include href="config:///game/strings.xml"/> <xi:include href="config://game/strings.xml"/>
<xi:include href="config:///default/adamantium.xml"/> <xi:include href="config://default/adamantium.xml"/>
<equipment> <equipment>
<set name="first_unit"> <set name="first_unit">
<item name="conquesttoken" amount="1"/> <item name="conquesttoken" amount="1"/>
@ -43,11 +43,11 @@
</set> </set>
</equipment> </equipment>
<xi:include href="config:///default/names-undead.xml"/> <xi:include href="config://default/names-undead.xml"/>
<xi:include href="config:///default/names-skeletons.xml"/> <xi:include href="config://default/names-skeletons.xml"/>
<xi:include href="config:///default/names-zombies.xml"/> <xi:include href="config://default/names-zombies.xml"/>
<xi:include href="config:///default/names-ghouls.xml"/> <xi:include href="config://default/names-ghouls.xml"/>
<xi:include href="config:///default/names-dragons.xml"/> <xi:include href="config://default/names-dragons.xml"/>
<game name="Eressea"> <game name="Eressea">
<!-- Game specific settings --> <!-- Game specific settings -->

6
conf/e3/catalog.xml
View File

@ -5,12 +5,12 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<rewriteURI <rewriteURI
uriStartString="config:///core/" uriStartString="config://core/"
rewritePrefix="../../res/core/" /> rewritePrefix="../../res/core/" />
<rewriteURI <rewriteURI
uriStartString="config:///game/" uriStartString="config://game/"
rewritePrefix="../../res/e3a/" /> rewritePrefix="../../res/e3a/" />
<rewriteURI <rewriteURI
uriStartString="config:///default/" uriStartString="config://default/"
rewritePrefix="../../res/" /> rewritePrefix="../../res/" />
</catalog> </catalog>

60
conf/e3/config.xml
View File

@ -1,32 +1,32 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea xmlns:xi="http://www.w3.org/2001/XInclude"> <eressea xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="config:///core/messages.xml"/> <xi:include href="config://core/messages.xml"/>
<xi:include href="config:///core/de/strings.xml"/> <xi:include href="config://core/de/strings.xml"/>
<xi:include href="config:///core/en/strings.xml"/> <xi:include href="config://core/en/strings.xml"/>
<xi:include href="config:///core/common/items.xml"/> <xi:include href="config://core/common/items.xml"/>
<xi:include href="config:///core/common/herbs.xml" /> <xi:include href="config://core/common/herbs.xml" />
<xi:include href="config:///core/spoils.xml"/> <xi:include href="config://core/spoils.xml"/>
<xi:include href="config:///core/prefixes.xml"/> <xi:include href="config://core/prefixes.xml"/>
<xi:include href="config:///core/common/buildings.xml"/> <xi:include href="config://core/common/buildings.xml"/>
<xi:include href="config:///game/familiars.xml"/> <xi:include href="config://game/familiars.xml"/>
<xi:include href="config:///default/adamantium.xml" /> <xi:include href="config://default/adamantium.xml" />
<xi:include href="config:///game/ships.xml"/> <xi:include href="config://game/ships.xml"/>
<xi:include href="config:///game/shipnames.xml"/> <xi:include href="config://game/shipnames.xml"/>
<xi:include href="config:///game/terrains.xml"/> <xi:include href="config://game/terrains.xml"/>
<xi:include href="config:///core/calendar.xml"/> <xi:include href="config://core/calendar.xml"/>
<xi:include href="config:///game/items.xml" /> <xi:include href="config://game/items.xml" />
<xi:include href="config:///game/strings.xml"/> <xi:include href="config://game/strings.xml"/>
<xi:include href="config:///game/messages.xml"/> <xi:include href="config://game/messages.xml"/>
<xi:include href="config:///game/races.xml"/> <xi:include href="config://game/races.xml"/>
<xi:include href="config:///game/buildings.xml"/> <xi:include href="config://game/buildings.xml"/>
<xi:include href="config:///game/equipment.xml"/> <xi:include href="config://game/equipment.xml"/>
<xi:include href="config:///game/spells.xml"/> <xi:include href="config://game/spells.xml"/>
<xi:include href="config:///game/luxuries.xml" /> <xi:include href="config://game/luxuries.xml" />
<xi:include href="config:///game/weapons.xml" /> <xi:include href="config://game/weapons.xml" />
<xi:include href="config:///game/armor.xml" /> <xi:include href="config://game/armor.xml" />
<xi:include href="config:///game/resources.xml" /> <xi:include href="config://game/resources.xml" />
<calendar name="thirdage" newyear="month_1" start="1"/> <calendar name="thirdage" newyear="month_1" start="1"/>
@ -39,11 +39,11 @@
</set> </set>
</equipment> </equipment>
<xi:include href="config:///default/names-undead.xml"/> <xi:include href="config://default/names-undead.xml"/>
<xi:include href="config:///default/names-skeletons.xml"/> <xi:include href="config://default/names-skeletons.xml"/>
<xi:include href="config:///default/names-zombies.xml"/> <xi:include href="config://default/names-zombies.xml"/>
<xi:include href="config:///default/names-ghouls.xml"/> <xi:include href="config://default/names-ghouls.xml"/>
<xi:include href="config:///default/names-dragons.xml"/> <xi:include href="config://default/names-dragons.xml"/>
<game name="E3"> <game name="E3">
<!-- Game specific settings --> <!-- Game specific settings -->

6
conf/e4/catalog.xml
View File

@ -5,12 +5,12 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<rewriteURI <rewriteURI
uriStartString="config:///core/" uriStartString="config://core/"
rewritePrefix="../../res/core/" /> rewritePrefix="../../res/core/" />
<rewriteURI <rewriteURI
uriStartString="config:///game/" uriStartString="config://game/"
rewritePrefix="../../res/e3a/" /> rewritePrefix="../../res/e3a/" />
<rewriteURI <rewriteURI
uriStartString="config:///default/" uriStartString="config://default/"
rewritePrefix="../../res/" /> rewritePrefix="../../res/" />
</catalog> </catalog>

60
conf/e4/config.xml
View File

@ -1,32 +1,32 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea xmlns:xi="http://www.w3.org/2001/XInclude"> <eressea xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="config:///core/messages.xml"/> <xi:include href="config://core/messages.xml"/>
<xi:include href="config:///core/de/strings.xml"/> <xi:include href="config://core/de/strings.xml"/>
<xi:include href="config:///core/en/strings.xml"/> <xi:include href="config://core/en/strings.xml"/>
<xi:include href="config:///core/common/items.xml"/> <xi:include href="config://core/common/items.xml"/>
<xi:include href="config:///core/common/herbs.xml" /> <xi:include href="config://core/common/herbs.xml" />
<xi:include href="config:///core/spoils.xml"/> <xi:include href="config://core/spoils.xml"/>
<xi:include href="config:///core/prefixes.xml"/> <xi:include href="config://core/prefixes.xml"/>
<xi:include href="config:///core/common/buildings.xml"/> <xi:include href="config://core/common/buildings.xml"/>
<xi:include href="config:///game/familiars.xml"/> <xi:include href="config://game/familiars.xml"/>
<xi:include href="config:///default/adamantium.xml" /> <xi:include href="config://default/adamantium.xml" />
<xi:include href="config:///game/ships.xml"/> <xi:include href="config://game/ships.xml"/>
<xi:include href="config:///game/shipnames.xml"/> <xi:include href="config://game/shipnames.xml"/>
<xi:include href="config:///game/terrains.xml"/> <xi:include href="config://game/terrains.xml"/>
<xi:include href="config:///core/calendar.xml"/> <xi:include href="config://core/calendar.xml"/>
<xi:include href="config:///game/items.xml" /> <xi:include href="config://game/items.xml" />
<xi:include href="config:///game/strings.xml"/> <xi:include href="config://game/strings.xml"/>
<xi:include href="config:///game/messages.xml"/> <xi:include href="config://game/messages.xml"/>
<xi:include href="config:///game/races.xml"/> <xi:include href="config://game/races.xml"/>
<xi:include href="config:///game/buildings.xml"/> <xi:include href="config://game/buildings.xml"/>
<xi:include href="config:///game/equipment.xml"/> <xi:include href="config://game/equipment.xml"/>
<xi:include href="config:///game/spells.xml"/> <xi:include href="config://game/spells.xml"/>
<xi:include href="config:///game/luxuries.xml" /> <xi:include href="config://game/luxuries.xml" />
<xi:include href="config:///game/weapons.xml" /> <xi:include href="config://game/weapons.xml" />
<xi:include href="config:///game/armor.xml" /> <xi:include href="config://game/armor.xml" />
<xi:include href="config:///game/resources.xml" /> <xi:include href="config://game/resources.xml" />
<calendar name="thirdage" newyear="month_1" start="1"/> <calendar name="thirdage" newyear="month_1" start="1"/>
@ -39,11 +39,11 @@
</set> </set>
</equipment> </equipment>
<xi:include href="config:///default/names-undead.xml"/> <xi:include href="config://default/names-undead.xml"/>
<xi:include href="config:///default/names-skeletons.xml"/> <xi:include href="config://default/names-skeletons.xml"/>
<xi:include href="config:///default/names-zombies.xml"/> <xi:include href="config://default/names-zombies.xml"/>
<xi:include href="config:///default/names-ghouls.xml"/> <xi:include href="config://default/names-ghouls.xml"/>
<xi:include href="config:///default/names-dragons.xml"/> <xi:include href="config://default/names-dragons.xml"/>
<game name="Deveron"> <game name="Deveron">
<!-- Game specific settings --> <!-- Game specific settings -->

2
res/e3a/buildings.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<buildings xmlns:xi="http://www.w3.org/2001/XInclude"> <buildings xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="config:///default/buildings/castle-2.xml" /> <xi:include href="config://default/buildings/castle-2.xml" />
<building name="watch" capacity="1" maxsize="10"> <building name="watch" capacity="1" maxsize="10">
<function name="name" value="fort_name"/> <function name="name" value="fort_name"/>

8
res/e3a/races.xml
View File

@ -3,10 +3,10 @@
<!-- begin main races --> <!-- begin main races -->
<xi:include href="config:///default/races/goblin-3.xml"/> <xi:include href="config://default/races/goblin-3.xml"/>
<xi:include href="config:///default/races/wyrm.xml"/> <xi:include href="config://default/races/wyrm.xml"/>
<xi:include href="config:///default/races/dragon.xml"/> <xi:include href="config://default/races/dragon.xml"/>
<xi:include href="config:///default/races/youngdragon.xml"/> <xi:include href="config://default/races/youngdragon.xml"/>
<race name="lynx" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.0" hp="20" damage="2d3" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="5" walk="yes" teach="no" giveitem="yes" getitem="yes"> <race name="lynx" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.0" hp="20" damage="2d3" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="5" walk="yes" teach="no" giveitem="yes" getitem="yes">
<ai splitsize="99999"/> <ai splitsize="99999"/>

14
res/e3a/resources.xml
View File

@ -2,13 +2,13 @@
<resources xmlns:xi="http://www.w3.org/2001/XInclude"> <resources xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- this file contains resources that can be mined in some way (anything with a resourcelimit) --> <!-- this file contains resources that can be mined in some way (anything with a resourcelimit) -->
<xi:include href="config:///core/resources/cart.xml"/> <xi:include href="config://core/resources/cart.xml"/>
<xi:include href="config:///core/resources/horse.xml"/> <xi:include href="config://core/resources/horse.xml"/>
<xi:include href="config:///core/resources/hp.xml"/> <xi:include href="config://core/resources/hp.xml"/>
<xi:include href="config:///core/resources/laen.xml"/> <xi:include href="config://core/resources/laen.xml"/>
<xi:include href="config:///core/resources/log.xml"/> <xi:include href="config://core/resources/log.xml"/>
<xi:include href="config:///core/resources/mallorn.xml"/> <xi:include href="config://core/resources/mallorn.xml"/>
<xi:include href="config:///core/resources/peasant.xml"/> <xi:include href="config://core/resources/peasant.xml"/>
<xi:include href="resources/iron.xml"/> <xi:include href="resources/iron.xml"/>
<xi:include href="resources/mallornseed.xml"/> <xi:include href="resources/mallornseed.xml"/>
<xi:include href="resources/seed.xml"/> <xi:include href="resources/seed.xml"/>

44
res/e3a/weapons.xml
View File

@ -1,25 +1,25 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<resources xmlns:xi="http://www.w3.org/2001/XInclude"> <resources xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="config:///core/weapons/axe.xml"/> <xi:include href="config://core/weapons/axe.xml"/>
<xi:include href="config:///core/weapons/bow.xml"/> <xi:include href="config://core/weapons/bow.xml"/>
<xi:include href="config:///core/weapons/catapult.xml"/> <xi:include href="config://core/weapons/catapult.xml"/>
<xi:include href="config:///core/weapons/lance.xml"/> <xi:include href="config://core/weapons/lance.xml"/>
<xi:include href="config:///core/weapons/mallornbow.xml"/> <xi:include href="config://core/weapons/mallornbow.xml"/>
<xi:include href="config:///core/weapons/mallornspear.xml"/> <xi:include href="config://core/weapons/mallornspear.xml"/>
<xi:include href="config:///core/weapons/rep_crossbow.xml"/> <xi:include href="config://core/weapons/rep_crossbow.xml"/>
<xi:include href="config:///core/weapons/runesword.xml"/> <xi:include href="config://core/weapons/runesword.xml"/>
<xi:include href="config:///core/weapons/rustyaxe.xml"/> <xi:include href="config://core/weapons/rustyaxe.xml"/>
<xi:include href="config:///core/weapons/rustysword.xml"/> <xi:include href="config://core/weapons/rustysword.xml"/>
<xi:include href="config:///core/weapons/spear.xml"/> <xi:include href="config://core/weapons/spear.xml"/>
<xi:include href="config:///core/weapons/sword.xml"/> <xi:include href="config://core/weapons/sword.xml"/>
<xi:include href="config:///core/weapons/firesword.xml"/> <xi:include href="config://core/weapons/firesword.xml"/>
<xi:include href="config:///game/weapons/crossbow.xml"/> <xi:include href="config://game/weapons/crossbow.xml"/>
<xi:include href="config:///game/weapons/greatbow.xml"/> <xi:include href="config://game/weapons/greatbow.xml"/>
<xi:include href="config:///game/weapons/greatsword.xml"/> <xi:include href="config://game/weapons/greatsword.xml"/>
<xi:include href="config:///game/weapons/halberd.xml"/> <xi:include href="config://game/weapons/halberd.xml"/>
<xi:include href="config:///game/weapons/laensword.xml"/> <xi:include href="config://game/weapons/laensword.xml"/>
<xi:include href="config:///game/weapons/mallorncrossbow.xml"/> <xi:include href="config://game/weapons/mallorncrossbow.xml"/>
<xi:include href="config:///game/weapons/mallornlance.xml"/> <xi:include href="config://game/weapons/mallornlance.xml"/>
<xi:include href="config:///game/weapons/rustygreatsword.xml"/> <xi:include href="config://game/weapons/rustygreatsword.xml"/>
<xi:include href="config:///game/weapons/rustyhalberd.xml"/> <xi:include href="config://game/weapons/rustyhalberd.xml"/>
</resources> </resources>

10
src/inc Normal file
View File

@ -0,0 +1,10 @@
if (CMAKE_COMPILER_IS_GNUCC)
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
OUTPUT_VARIABLE GCC_VERSION)
string(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${GCC_VERSION})
list(GET GCC_VERSION_COMPONENTS 0 GCC_MAJOR)
list(GET GCC_VERSION_COMPONENTS 1 GCC_MINOR)
message(STATUS ${GCC_MAJOR})
message(STATUS ${GCC_MINOR})
endif()

9
src/kernel/region.c
View File

@ -611,8 +611,9 @@ int rpeasants(const region * r)
void rsetpeasants(region * r, int value) void rsetpeasants(region * r, int value)
{ {
((r)->land ? ((r)->land->peasants = if (r->land) r->land->peasants = value;
(value)) : (assert((value) >= 0), (value)), 0); else assert(value>=0);
} }
int rmoney(const region * r) int rmoney(const region * r)
@ -634,8 +635,8 @@ int rhorses(const region * r)
void rsetmoney(region * r, int value) void rsetmoney(region * r, int value)
{ {
((r)->land ? ((r)->land->money = if (r->land) r->land->money = value;
(value)) : (assert((value) >= 0), (value)), 0); else assert(value >= 0);
} }
void r_setdemand(region * r, const luxury_type * ltype, int value) void r_setdemand(region * r, const luxury_type * ltype, int value)

2
tolua

@ -1 +1 @@
Subproject commit eebd697f736af4807f7e4b3a17a7eb4a2c9a061f Subproject commit 6773a27c9b57c7639404711d0d6c4a27c6e7eb37