summaryrefslogtreecommitdiff
path: root/src/map/chat.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-30 16:53:56 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-30 16:53:56 +0000
commit9b4059fbdfc3ad77a1102dfdac0146797182d97a (patch)
tree8775a9776bcfabac4dbff7fc0096382618ab71c6 /src/map/chat.c
parent55fee732fa5e5056268bee29a7b2d1d28ed6022c (diff)
downloadhercules-9b4059fbdfc3ad77a1102dfdac0146797182d97a.tar.gz
hercules-9b4059fbdfc3ad77a1102dfdac0146797182d97a.tar.bz2
hercules-9b4059fbdfc3ad77a1102dfdac0146797182d97a.tar.xz
hercules-9b4059fbdfc3ad77a1102dfdac0146797182d97a.zip
- Added mapflag "nochat" to prevent chatting rooms from being created.
- Corrected some of the sleep checks when the char id does not matches with the char-id expected by the script engine. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7423 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/chat.c')
-rw-r--r--src/map/chat.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/chat.c b/src/map/chat.c
index 311fe1d8e..8ebd54354 100644
--- a/src/map/chat.c
+++ b/src/map/chat.c
@@ -12,6 +12,7 @@
#include "clif.h"
#include "pc.h"
#include "npc.h"
+#include "atcommand.h"
int chat_triggerevent(struct chat_data *cd);
@@ -27,6 +28,11 @@ int chat_createchat(struct map_session_data *sd,int limit,int pub,char* pass,cha
if (sd->chatID)
return 0; //Prevent people abusing the chat system by creating multiple chats, as pointed out by End of Exam. [Skotlex]
+
+ if (map[sd->bl.m].flag.nochat) {
+ clif_displaymessage (sd->fd, msg_txt(281));
+ return 0; //Can't drop items in nodrop mapflag maps.
+ }
pc_stop_walking(sd,1);
cd = (struct chat_data *) aMalloc(sizeof(struct chat_data));