* 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

3 files changed, 38 insertions, 31 deletions

diff --git a/Changelog.txt b/Changelog.txt
index b03f6603a..de201b458 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,6 @@
 Date	Added
 11/22
+	* Fixed mapflag #s and constants for setmapflag and remove mapflag. [Valaris]
         * Added skill names for kRO 11/23's new skills [celest]
           - Preserve, Full Strip, Weapon Refine, Slim Pitcher, Full Chemical Protection,
             (Throw) Tomahawk
diff --git a/db/const.txt b/db/const.txt
index 4d14917a7..78d79757e 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -67,37 +67,29 @@ Job_Baby_Dancer	66
 Job_Baby_Crusader2	67
 Job_Super_Baby	68
 
-
-
 mf_nomemo	0
 mf_noteleport	1
 mf_nosave	2
 mf_nobranch	3
 mf_nopenalty	4
-mf_pvp	5
-mf_pvp_noparty	6
-mf_pvp_noguild	7
-mf_gvg		8
-mf_gvg_noparty	9
-mf_nozenypenalty	10
-mf_pvp	11
-mf_pvp_noparty	12
-mf_pvp_noguild	13
-mf_gvg	14
-mf_gvg_noparty	15
-mf_notrade	16
-mf_noskill	17
-mf_nowarp	18
-mf_noicewall	19
-mf_snow	20
-mf_fog	21
-mf_sakura	22
-mf_leaves	23
-mf_rain	24
-mf_indoors	25
-mf_nogo	26
-
-
+mf_nozenypenalty	5
+mf_pvp	6
+mf_pvp_noparty	7
+mf_pvp_noguild	8
+mf_gvg		9
+mf_gvg_noparty	10
+mf_notrade	11
+mf_noskill	12
+mf_nowarp	13
+mf_nopvp	14
+mf_noicewall	15
+mf_snow		16
+mf_fog		17
+mf_sakura	18
+mf_leaves	19
+mf_rain	20
+mf_indoors	21
+mf_nogo	22
 
 StatusPoint	9	1
 BaseLevel	11	1
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;