- 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, 7 insertions, 1 deletions

diff --git a/src/map/script.c b/src/map/script.c
index 49b289186..1d725335f 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -6575,7 +6575,7 @@ enum {  MF_NOMEMO,MF_NOTELEPORT,MF_NOSAVE,MF_NOBRANCH,MF_NOPENALTY,MF_NOZENYPENA
 	MF_NOWARP,MF_NOPVP,MF_NOICEWALL,MF_SNOW,MF_FOG,MF_SAKURA,MF_LEAVES,MF_RAIN,

 	MF_INDOORS,MF_NOGO,MF_CLOUDS,MF_CLOUDS2,MF_FIREWORKS,MF_GVG_CASTLE,MF_GVG_DUNGEON,MF_NIGHTENABLED,

 	MF_NOBASEEXP, MF_NOJOBEXP, MF_NOMOBLOOT, MF_NOMVPLOOT, MF_NORETURN, MF_NOWARPTO, MF_NIGHTMAREDROP,

-	MF_RESTRICTED };

+	MF_RESTRICTED, MF_NOCOMMAND };

 

 int buildin_setmapflagnosave(struct script_state *st)

 {

@@ -6718,6 +6718,9 @@ int buildin_setmapflag(struct script_state *st)
 			case MF_RESTRICTED:

 				map[m].flag.restricted=1;

 				break;

+			case MF_NOCOMMAND:

+				map[m].flag.nocommand=1;

+				break;

 		}

 	}

 

@@ -6842,6 +6845,9 @@ int buildin_removemapflag(struct script_state *st)
 			case MF_RESTRICTED:

 				map[m].flag.restricted=0;

 				break;

+			case MF_NOCOMMAND:

+				map[m].flag.nocommand=0;

+				break;

 		}

 	}