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

Merge branch 'master' of /home/eressea/repo/eressea

Browse source
This commit is contained in:
Enno Rehling 2012-03-05 04:25:26 +01:00
commit 3c51bc1138
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/config-e3a.xml
View file

@ -130,7 +130,7 @@
<param name="world.era" value="3"/> <param name="world.era" value="3"/>
<param name="rules.migrants" value="0"/> <param name="rules.migrants" value="0"/>
<param name="rules.transfermen" value="0"/> <param name="rules.transfermen" value="0"/>
<param name="rules.stealth.faction" value="1"/> <param name="rules.stealth.faction" value="2"/>
<param name="rules.stealth.anon_battle" value="0"/> <param name="rules.stealth.anon_battle" value="0"/>
<param name="rules.check_overload" value="0"/> <param name="rules.check_overload" value="0"/>
<param name="rules.combat.goblinbonus" value="3"/> <param name="rules.combat.goblinbonus" value="3"/>

13
src/spells/spells.c
View file

@ -4171,12 +4171,13 @@ static int sp_seduce(castorder * co)
itmp = &itm->next; itmp = &itm->next;
} }
ADDMSG(&mage->faction->msgs, msg_message("seduce_effect_0", "mage unit items", if (items) {
mage, target, items)); ADDMSG(&mage->faction->msgs, msg_message("seduce_effect_0", "mage unit items",
i_freeall(&items); mage, target, items));
ADDMSG(&target->faction->msgs, msg_message("seduce_effect_1", "unit", i_freeall(&items);
target)); ADDMSG(&target->faction->msgs, msg_message("seduce_effect_1", "unit",
target));
}
return cast_level; return cast_level;
} }