From 2449d2a6e7ddd1648d2e1fe446c97fe94378af28 Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 18 Apr 2006 16:01:26 +0000 Subject: - Removed message 592 from trade.c - Removed mapflag nopvp - Added support for disabling mapflags on a mapflag line: comodo.gat mapflag nomemo <- turns on nomemo mapflag comodo.gat mapflag nomemo off <- turns off nomemo mapflag - Cleaned up and optimized the restricted/zones mapflag. Restricted cards will just not work in disallowed maps rather than blocking the compounded equipement from being used. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6159 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/script.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/map/script.c') diff --git a/src/map/script.c b/src/map/script.c index cc0483c5c..d0af3b8c0 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -6617,7 +6617,7 @@ int buildin_isloggedin(struct script_state *st) */ enum { MF_NOMEMO,MF_NOTELEPORT,MF_NOSAVE,MF_NOBRANCH,MF_NOPENALTY,MF_NOZENYPENALTY, MF_PVP,MF_PVP_NOPARTY,MF_PVP_NOGUILD,MF_GVG,MF_GVG_NOPARTY,MF_NOTRADE,MF_NOSKILL, - MF_NOWARP,MF_NOPVP,MF_NOICEWALL,MF_SNOW,MF_FOG,MF_SAKURA,MF_LEAVES,MF_RAIN, + MF_NOWARP,MF_FREE,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_NOCOMMAND, MF_NODROP }; @@ -6703,9 +6703,6 @@ int buildin_setmapflag(struct script_state *st) case MF_NOWARP: map[m].flag.nowarp=1; break; - case MF_NOPVP: - map[m].flag.nopvp=1; - break; case MF_NOICEWALL: // [Valaris] map[m].flag.noicewall=1; break; @@ -6836,9 +6833,6 @@ int buildin_removemapflag(struct script_state *st) case MF_NOWARP: map[m].flag.nowarp=0; break; - case MF_NOPVP: - map[m].flag.nopvp=0; - break; case MF_NOICEWALL: // [Valaris] map[m].flag.noicewall=0; break; @@ -6916,7 +6910,7 @@ int buildin_pvpon(struct script_state *st) str=conv_str(st,& (st->stack->stack_data[st->start+2])); m = map_mapname2mapid(str); - if(m >= 0 && !map[m].flag.pvp && !map[m].flag.nopvp) { + if(m >= 0 && !map[m].flag.pvp) { map[m].flag.pvp = 1; clif_send0199(m,1); @@ -6949,7 +6943,7 @@ int buildin_pvpoff(struct script_state *st) str=conv_str(st,& (st->stack->stack_data[st->start+2])); m = map_mapname2mapid(str); - if(m >= 0 && map[m].flag.pvp && !map[m].flag.nopvp) { //fixed Lupus + if(m >= 0 && map[m].flag.pvp) { //fixed Lupus map[m].flag.pvp = 0; clif_send0199(m,0); -- cgit v1.2.3-70-g09d2