- Trick dead now ends on logout

- Added mapflag nocommand which blocks @/# commands unless your gm level is above gm_skill_unconditional's level.
- Fixed weapon scripts not being executed unless the weapon was forged.
- gm_skill_unconditional is now a no/gm-level setting instead of yes/no


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5446 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 9 insertions, 0 deletions

diff --git a/src/map/charcommand.c b/src/map/charcommand.c
index 4e2f3f2c3..51f6a7106 100644
--- a/src/map/charcommand.c
+++ b/src/map/charcommand.c
@@ -147,6 +147,15 @@ is_charcommand(const int fd, struct map_session_data* sd, const char* message, i
 	if (!*str)

 		return CharCommand_None;

 

+	if (map[sd->bl.m].flag.nocommand &&

+		(gmlvl > 0? gmlvl:pc_isGM(sd)) < battle_config.gm_skilluncond)

+	{	//Command not allowed on this map.

+		char output[200];

+		sprintf(output, msg_table[143]); 

+		clif_displaymessage(fd, output);

+		return AtCommand_None;

+	}	

+

 	type = charcommand(sd, gmlvl > 0 ? gmlvl : pc_isGM(sd), str, &info);

 	if (type != CharCommand_None) {

 		char command[100];