diff options
author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-09-20 23:46:48 +0000 |
---|---|---|
committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-09-20 23:46:48 +0000 |
commit | dbc3e0878510f5d8ae7d3aca21607bfa2648b421 (patch) | |
tree | 87867007c2154b99b44924c907ecfbf553c6ebf1 /src/map/script.c | |
parent | b793bb7e9eb87a9dddfb1f78c3ae0d795bdb14f8 (diff) | |
download | hercules-dbc3e0878510f5d8ae7d3aca21607bfa2648b421.tar.gz hercules-dbc3e0878510f5d8ae7d3aca21607bfa2648b421.tar.bz2 hercules-dbc3e0878510f5d8ae7d3aca21607bfa2648b421.tar.xz hercules-dbc3e0878510f5d8ae7d3aca21607bfa2648b421.zip |
* Applied map flag update patch provided by Daegaladh. Will mess with custom restricted items.
- Adds a reset mapflag which is checked when using the Neuralizer.
- Syncronizes the item_noequip_db bitmasks with with skill_nocast_db.
- Updates mapflags, and both skills and items which are restricted.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14961 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r-- | src/map/script.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map/script.c b/src/map/script.c index 0da5e21aa..6a5243f74 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -348,7 +348,8 @@ enum { MF_ALLOWKS, MF_MONSTER_NOTELEPORT, MF_PVP_NOCALCRANK, //50 - MF_BATTLEGROUND + MF_BATTLEGROUND, + MF_RESET }; const char* script_op2name(int op) @@ -9632,6 +9633,7 @@ BUILDIN_FUNC(getmapflag) case MF_MONSTER_NOTELEPORT: script_pushint(st,map[m].flag.monster_noteleport); break; case MF_PVP_NOCALCRANK: script_pushint(st,map[m].flag.pvp_nocalcrank); break; case MF_BATTLEGROUND: script_pushint(st,map[m].flag.battleground); break; + case MF_RESET: script_pushint(st,map[m].flag.reset); break; } } @@ -9701,6 +9703,7 @@ BUILDIN_FUNC(setmapflag) case MF_MONSTER_NOTELEPORT: map[m].flag.monster_noteleport=1; break; case MF_PVP_NOCALCRANK: map[m].flag.pvp_nocalcrank=1; break; case MF_BATTLEGROUND: map[m].flag.battleground = (!val || atoi(val) < 0 || atoi(val) > 2) ? 1 : atoi(val); break; + case MF_RESET: map[m].flag.reset=1; break; } } @@ -9767,6 +9770,7 @@ BUILDIN_FUNC(removemapflag) case MF_MONSTER_NOTELEPORT: map[m].flag.monster_noteleport=0; break; case MF_PVP_NOCALCRANK: map[m].flag.pvp_nocalcrank=0; break; case MF_BATTLEGROUND: map[m].flag.battleground=0; break; + case MF_RESET: map[m].flag.reset=0; break; } } |