diff options
| author | shennetsind <ind@henn.et> | 2013-06-27 16:31:18 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-06-27 16:31:18 -0300 |
| commit | 897f598ab7ea2235d551081f54328ee69970f731 (patch) | |
| tree | cba38e4e6f994b2cd871fd0019b342306475ee56 /src/map/script.c | |
| parent | 85ac3b03b9e642bc322109ea8c176c43192eb4bd (diff) | |
| parent | 15398c9b90693707c3e49c349e24e6dd655f12a9 (diff) | |
| download | hercules-897f598ab7ea2235d551081f54328ee69970f731.tar.gz hercules-897f598ab7ea2235d551081f54328ee69970f731.tar.bz2 hercules-897f598ab7ea2235d551081f54328ee69970f731.tar.xz hercules-897f598ab7ea2235d551081f54328ee69970f731.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c index 8b9b87322..f014aab7e 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -238,7 +238,8 @@ enum { MF_MONSTER_NOTELEPORT, MF_PVP_NOCALCRANK, //50 MF_BATTLEGROUND, - MF_RESET + MF_RESET, + MF_NOTOMB }; const char* script_op2name(int op) @@ -9964,7 +9965,7 @@ BUILDIN(changesex) // to avoid any problem with equipment and invalid sex, equipment is unequiped. for( i=0; i<EQI_MAX; i++ ) if( sd->equip_index[i] >= 0 ) pc->unequipitem(sd, sd->equip_index[i], 3); - chrif_changesex(sd); + chrif->changesex(sd); return true; } @@ -10343,6 +10344,7 @@ BUILDIN(getmapflag) 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; + case MF_NOTOMB: script_pushint(st,map[m].flag.notomb); break; } } @@ -10459,6 +10461,7 @@ BUILDIN(setmapflag) case MF_PVP_NOCALCRANK: map[m].flag.pvp_nocalcrank = 1; break; case MF_BATTLEGROUND: map[m].flag.battleground = (val <= 0 || val > 2) ? 1 : val; break; case MF_RESET: map[m].flag.reset = 1; break; + case MF_NOTOMB: map[m].flag.notomb = 1; break; } } @@ -10547,6 +10550,7 @@ BUILDIN(removemapflag) 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; + case MF_NOTOMB: map[m].flag.notomb = 0; break; } } |