summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-07 06:18:16 +0000
committersketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-07 06:18:16 +0000
commit15b04fb5907300b92a079533675c67b4ffdcae17 (patch)
treee9ac8f4ca130c4ae3a3261885fb2d8a182e96262
parentd140376ac92b1d4346a4f24a682185e63ecfb718 (diff)
downloadhercules-15b04fb5907300b92a079533675c67b4ffdcae17.tar.gz
hercules-15b04fb5907300b92a079533675c67b4ffdcae17.tar.bz2
hercules-15b04fb5907300b92a079533675c67b4ffdcae17.tar.xz
hercules-15b04fb5907300b92a079533675c67b4ffdcae17.zip
* Players autotrading will not be able to recieve whispers (bugreport:1804)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12920 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/clif.c11
2 files changed, 11 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 840db4932..56c4e8e41 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/07/07
* Removed stop/slowdown effect from Grimtooth (bugreport:1806)
+ * Players autotrading will not be able to recieve whispers (bugreport:1804) [SketchyPhoenix]
2008/07/06
* Slight cleanup of item-based walk speed bonuses [ultramage]
- removed bSpeed bonus code (was just disabled until now)
diff --git a/src/map/clif.c b/src/map/clif.c
index bc04c6efb..198a60dca 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8616,7 +8616,16 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd)
clif_wis_end(fd, 2); // 2: ignored by target
return;
}
-
+
+ // if player is autotrading
+ if( dstsd->state.autotrade == 1 )
+ {
+ char output[256];
+ sprintf(output, "%s is in autotrade mode and cannot recieve whispered messages.", dstsd->status.name);
+ clif_wis_message(fd, sd->status.name, output, strlen(output) + 1);
+ return;
+ }
+
// notify sender of success
clif_wis_end(fd, 0); // 0: success to send wisper