summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-26 14:47:30 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-26 14:47:30 +0000
commit74aba440337dec8ba2dee9d4a5a124cd00e344ea (patch)
treef17be1bcc1ba930ae180b442473f813a36d276ca /src
parent44cad82e776e7455eaaee4bdf00d03cfe2d8efc0 (diff)
downloadhercules-74aba440337dec8ba2dee9d4a5a124cd00e344ea.tar.gz
hercules-74aba440337dec8ba2dee9d4a5a124cd00e344ea.tar.bz2
hercules-74aba440337dec8ba2dee9d4a5a124cd00e344ea.tar.xz
hercules-74aba440337dec8ba2dee9d4a5a124cd00e344ea.zip
- @pettalk will now fail when muted.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7893 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/atcommand.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 9ff33d152..e0c4b5405 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -8205,6 +8205,10 @@ atcommand_pettalk(
if(!sd->status.pet_id || !(pd=sd->pd))
return -1;
+ if (sd->sc.count && //no "chatting" while muted.
+ (sd->sc.data[SC_BERSERK].timer!=-1 || sd->sc.data[SC_NOCHAT].timer != -1))
+ return -1;
+
if (sscanf(message, "%99[^\n]", mes) < 1)
return -1;