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

added spy to spy messages (see #1604)

This commit is contained in:
Enno Rehling 2011-03-09 17:14:23 +01:00
parent cf4e081179
commit f0039bc58f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/messages.xml
View File

@ -3561,6 +3561,7 @@
</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>
@ -3569,6 +3570,7 @@
</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>
@ -3577,6 +3579,7 @@
</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>
@ -3585,6 +3588,7 @@
</message> </message>
<message name="spyreport_faction" section="events"> <message name="spyreport_faction" section="events">
<type> <type>
<arg name="spy" type="unit"/>
<arg name="target" type="unit"/> <arg name="target" type="unit"/>
<arg name="faction" type="faction"/> <arg name="faction" type="faction"/>
</type> </type>

8
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", ADDMSG(&u->faction->msgs, msg_message("spyreport_mage", "target type", u,
target, magic_school[mage->magietyp])); target, magic_school[mage->magietyp]));
} }
} }
@ -75,7 +75,7 @@ void spy_message(int spy, const unit * u, const unit * target)
if (fv && fv != target->faction) { if (fv && fv != target->faction) {
/* wahre Partei */ /* wahre Partei */
ADDMSG(&u->faction->msgs, msg_message("spyreport_faction", ADDMSG(&u->faction->msgs, msg_message("spyreport_faction",
"target faction", target, target->faction)); "target faction", u, target, target->faction));
ql_set_insert(&u->faction->seen_factions, target->faction); ql_set_insert(&u->faction->seen_factions, target->faction);
} }
} }
@ -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", ADDMSG(&u->faction->msgs, msg_message("spyreport_skills", "target skills", u,
target, buf)); target, buf));
} }
if (target->items) { if (target->items) {
ADDMSG(&u->faction->msgs, msg_message("spyreport_items", "target items", ADDMSG(&u->faction->msgs, msg_message("spyreport_items", "target items", u,
target, target->items)); target, target->items));
} }
} }