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

fixing spy messages (wrong arguments cause crash).

This commit is contained in:
Enno Rehling 2011-03-19 11:06:03 -07:00
parent 36b58cca6e
commit 813d75f820
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/messages.xml
View File

@ -3561,7 +3561,6 @@
</message> </message>
<message name="spyreport_mage" section="events"> <message name="spyreport_mage" section="events">
<type> <type>
<arg name="spy" type="unit"/>
<arg name="target" type="unit"/> <arg name="target" type="unit"/>
<arg name="type" type="string"/> <arg name="type" type="string"/>
</type> </type>
@ -3570,7 +3569,6 @@
</message> </message>
<message name="spyreport_skills" section="events"> <message name="spyreport_skills" section="events">
<type> <type>
<arg name="spy" type="unit"/>
<arg name="target" type="unit"/> <arg name="target" type="unit"/>
<arg name="skills" type="string"/> <arg name="skills" type="string"/>
</type> </type>
@ -3579,7 +3577,6 @@
</message> </message>
<message name="spyreport_items" section="events"> <message name="spyreport_items" section="events">
<type> <type>
<arg name="spy" type="unit"/>
<arg name="target" type="unit"/> <arg name="target" type="unit"/>
<arg name="items" type="items"/> <arg name="items" type="items"/>
</type> </type>

6
src/gamecode/spy.c
View File

@ -66,7 +66,7 @@ void spy_message(int spy, const unit * u, const unit * target)
sc_mage *mage = get_mage(target); sc_mage *mage = get_mage(target);
/* bei Magiern Zaubersprüche und Magiegebiet */ /* bei Magiern Zaubersprüche und Magiegebiet */
if (mage) { if (mage) {
ADDMSG(&u->faction->msgs, msg_message("spyreport_mage", "target type", u, ADDMSG(&u->faction->msgs, msg_message("spyreport_mage", "target type",
target, magic_school[mage->magietyp])); target, magic_school[mage->magietyp]));
} }
} }
@ -102,12 +102,12 @@ void spy_message(int spy, const unit * u, const unit * target)
} }
} }
if (found) { if (found) {
ADDMSG(&u->faction->msgs, msg_message("spyreport_skills", "target skills", u, ADDMSG(&u->faction->msgs, msg_message("spyreport_skills", "target skills",
target, buf)); target, buf));
} }
if (target->items) { if (target->items) {
ADDMSG(&u->faction->msgs, msg_message("spyreport_items", "target items", u, ADDMSG(&u->faction->msgs, msg_message("spyreport_items", "target items",
target, target->items)); target, target->items));
} }
} }