diff options
| author | valaris <valaris@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-22 19:15:33 +0000 |
|---|---|---|
| committer | valaris <valaris@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-22 19:15:33 +0000 |
| commit | 55f4b745d21be4ac8e15c677a64e47168cb5a171 (patch) | |
| tree | 420dd8787b769bcf6d84aec66b424a8bc4cdd590 /src | |
| parent | 29ccfba0519427b39defc9cda20c39b6708fc621 (diff) | |
| download | hercules-55f4b745d21be4ac8e15c677a64e47168cb5a171.tar.gz hercules-55f4b745d21be4ac8e15c677a64e47168cb5a171.tar.bz2 hercules-55f4b745d21be4ac8e15c677a64e47168cb5a171.tar.xz hercules-55f4b745d21be4ac8e15c677a64e47168cb5a171.zip | |
* Fixed mapflag #s and constants for setmapflag and remove mapflag. [Valaris]
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@322 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/script.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/src/map/script.c b/src/map/script.c index 4089159e9..0f76d4ec7 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -4584,8 +4584,9 @@ 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_INDOORS, MF_NOGO }; +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_INDOORS,MF_NOGO }; int buildin_setmapflagnosave(struct script_state *st) { @@ -4629,18 +4630,24 @@ int buildin_setmapflag(struct script_state *st) case MF_NOPENALTY: map[m].flag.nopenalty=1; break; + case MF_NOZENYPENALTY: + map[m].flag.nozenypenalty=1; + break; + case MF_PVP: + map[m].flag.pvp=1; + break; case MF_PVP_NOPARTY: map[m].flag.pvp_noparty=1; break; case MF_PVP_NOGUILD: map[m].flag.pvp_noguild=1; break; + case MF_GVG: + map[m].flag.gvg=1; + break; case MF_GVG_NOPARTY: map[m].flag.gvg_noparty=1; break; - case MF_NOZENYPENALTY: - map[m].flag.nozenypenalty=1; - break; case MF_NOTRADE: map[m].flag.notrade=1; break; @@ -4677,6 +4684,7 @@ int buildin_setmapflag(struct script_state *st) case MF_NOGO: // celest map[m].flag.nogo=1; break; + } } @@ -4708,12 +4716,18 @@ int buildin_removemapflag(struct script_state *st) case MF_NOPENALTY: map[m].flag.nopenalty=0; break; + case MF_PVP: + map[m].flag.pvp=0; + break; case MF_PVP_NOPARTY: map[m].flag.pvp_noparty=0; break; case MF_PVP_NOGUILD: map[m].flag.pvp_noguild=0; break; + case MF_GVG: + map[m].flag.gvg=0; + break; case MF_GVG_NOPARTY: map[m].flag.gvg_noparty=0; break; |