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

Merge branch 'develop' of https://github.com/ennorehling/eressea.git

This commit is contained in:
Enno Rehling 2018-05-11 20:55:38 +02:00
parent 7b1038b0b1 94769a66f8
commit 5c26155f2f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/eressea/races.xml
View File

@ -6,7 +6,7 @@
regaura="0" weight="500" capacity="200" equipment="no" regaura="0" weight="500" capacity="200" equipment="no"
speed="1" hp="1000" ac="4" damage="2d4" unarmedattack="10" speed="1" hp="1000" ac="4" damage="2d4" unarmedattack="10"
unarmeddefense="10" attackmodifier="8" defensemodifier="8" unarmeddefense="10" attackmodifier="8" defensemodifier="8"
fly="no" walk="no" canteach="no" getitem="yes"> fly="no" walk="no" teach="no" getitem="yes">
<attack type="4" damage="2d6+2"/> <attack type="4" damage="2d6+2"/>
<attack type="3" damage="2d6+2"/> <attack type="3" damage="2d6+2"/>
</race> </race>

2
src/xmlreader.c
View File

@ -1355,7 +1355,7 @@ static int parse_races(xmlDocPtr doc)
rc->flags |= RCF_WALK; rc->flags |= RCF_WALK;
if (!xml_bvalue(node, "canlearn", true)) if (!xml_bvalue(node, "canlearn", true))
rc->flags |= RCF_NOLEARN; rc->flags |= RCF_NOLEARN;
if (!xml_bvalue(node, "canteach", true)) if (!xml_bvalue(node, "teach", true))
rc->flags |= RCF_NOTEACH; rc->flags |= RCF_NOTEACH;
if (xml_bvalue(node, "horse", false)) if (xml_bvalue(node, "horse", false))
rc->flags |= RCF_HORSE; rc->flags |= RCF_HORSE;