summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-02 14:19:56 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-02 14:19:56 +0000
commitd90b2e20d916b9539060dcdb33d13bb41aa1bb89 (patch)
treef6779bc22680926c01a73fb2e69d74f0d2991452 /src/map/script.c
parentc465de040071d547c25af3856683d3a137832e8e (diff)
downloadhercules-d90b2e20d916b9539060dcdb33d13bb41aa1bb89.tar.gz
hercules-d90b2e20d916b9539060dcdb33d13bb41aa1bb89.tar.bz2
hercules-d90b2e20d916b9539060dcdb33d13bb41aa1bb89.tar.xz
hercules-d90b2e20d916b9539060dcdb33d13bb41aa1bb89.zip
- Renamed nopenalty mapflag to noexppenalty. Using nopenalty will turn on/off both noexppenalty and nozenypenalty now.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8915 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 72d771e88..09fb80b32 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -205,7 +205,8 @@ enum {
MF_BEXP, //40
MF_NOVENDING,
MF_LOADEVENT,
- MF_NOCHAT
+ MF_NOCHAT,
+ MF_NOEXPPENALTY
};
//Reports on the console the src of an script error.
@@ -8234,7 +8235,8 @@ int buildin_setmapflag(struct script_state *st)
map[m].flag.nobranch=1;
break;
case MF_NOPENALTY:
- map[m].flag.nopenalty=1;
+ map[m].flag.noexppenalty=1;
+ map[m].flag.nozenypenalty=1;
break;
case MF_NOZENYPENALTY:
map[m].flag.nozenypenalty=1;
@@ -8378,7 +8380,8 @@ int buildin_removemapflag(struct script_state *st)
map[m].flag.nobranch=0;
break;
case MF_NOPENALTY:
- map[m].flag.nopenalty=0;
+ map[m].flag.noexppenalty=0;
+ map[m].flag.nozenypenalty=0;
break;
case MF_PVP:
map[m].flag.pvp=0;