diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-26 14:47:30 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-26 14:47:30 +0000 |
| commit | 74aba440337dec8ba2dee9d4a5a124cd00e344ea (patch) | |
| tree | f17be1bcc1ba930ae180b442473f813a36d276ca | |
| parent | 44cad82e776e7455eaaee4bdf00d03cfe2d8efc0 (diff) | |
| download | hercules-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
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/atcommand.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 8d8c61eb6..e25c3ce1e 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/26
+ * @pettalk will now fail when muted. [Skotlex]
* Enabled changing of equipment while stunned/asleep/petrified/etc [Skotlex]
2006/07/25
* Cleaned up run_script_main to properly free previous stack-data when
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;
|