summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-09-01 00:45:56 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-09-01 00:45:56 +0000
commita1ee9fdfc9e4be285a2c21fa2bcd309da89ffe43 (patch)
tree266a5e008ae6a16ca9d4d644a9cee86e7271c7d8 /src/map/clif.c
parentbb1a4e56b358c36a7996be8d34b84e7f118f63f5 (diff)
downloadhercules-a1ee9fdfc9e4be285a2c21fa2bcd309da89ffe43.tar.gz
hercules-a1ee9fdfc9e4be285a2c21fa2bcd309da89ffe43.tar.bz2
hercules-a1ee9fdfc9e4be285a2c21fa2bcd309da89ffe43.tar.xz
hercules-a1ee9fdfc9e4be285a2c21fa2bcd309da89ffe43.zip
- Something i forget to commit mmo.h.
- Preparatives for Faith/Calls/Kills for mercenaries. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13167 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 67ab85b39..b5c749531 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -12398,6 +12398,12 @@ void clif_mercenary_updatestatus(struct map_session_data *sd, int type)
case SP_MAXSP:
WFIFOL(fd,4) = md->battle_status.max_sp;
break;
+ case SP_MERCKILLS:
+ WFIFOL(fd,4) = md->mercenary.kill_count;
+ break;
+ case SP_MERCFAITH:
+ WFIFOL(fd,4) = mercenary_get_faith(md);
+ break;
}
WFIFOSET(fd,8);
}
@@ -12435,8 +12441,8 @@ void clif_mercenary_info(struct map_session_data *sd)
WFIFOL(fd,56) = status->sp;
WFIFOL(fd,60) = status->max_sp;
WFIFOL(fd,64) = (int)time(NULL) + (mercenary_get_lifetime(md) / 1000);
- WFIFOW(fd,68) = 0; // Loyalty
- WFIFOL(fd,70) = 0; // Summon Count
+ WFIFOW(fd,68) = mercenary_get_faith(md);
+ WFIFOL(fd,70) = mercenary_get_calls(md);
WFIFOL(fd,74) = md->mercenary.kill_count;
WFIFOW(fd,78) = md->battle_status.rhw.range;
WFIFOSET(fd,80);