summaryrefslogtreecommitdiff
path: root/src/map/npc.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/npc.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/npc.c')
-rw-r--r--src/map/npc.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index fc93207a8..1954b5d7f 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2384,7 +2384,8 @@ static int npc_parse_mapflag (char *w1, char *w2, char *w3, char *w4)
map[m].flag.nobranch=state;
}
else if (strcmpi(w3,"nopenalty")==0) {
- map[m].flag.nopenalty=state;
+ map[m].flag.noexppenalty=state;
+ map[m].flag.nozenypenalty=state;
}
else if (strcmpi(w3,"pvp")==0) {
map[m].flag.pvp=state;
@@ -2449,6 +2450,9 @@ static int npc_parse_mapflag (char *w1, char *w2, char *w3, char *w4)
map[m].flag.gvg_castle=state;
if (state) map[m].flag.pvp=0;
}
+ else if (strcmpi(w3,"noexppenalty")==0) {
+ map[m].flag.noexppenalty=state;
+ }
else if (strcmpi(w3,"nozenypenalty")==0) {
map[m].flag.nozenypenalty=state;
}