diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/script.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 4b2fb8b33..50a2d0403 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -4378,7 +4378,7 @@ int atcommand_mapinfo(const int fd, struct map_session_data* sd, const char* com strcat(atcmd_output, "NoSkill | "); if (map[m_id].flag.noicewall) strcat(atcmd_output, "NoIcewall | "); - if (map[m_id].allowks) + if (map[m_id].flag.allowks) strcat(atcmd_output, "AllowKS | "); clif_displaymessage(fd, atcmd_output); diff --git a/src/map/script.c b/src/map/script.c index f2c437082..f6b41331f 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -341,7 +341,7 @@ enum { MF_AUTOTRADE, MF_ALLOWKS, MF_MONSTER_NOTELEPORT, - MF_PVPNOCALCRANK, //50 + MF_PVP_NOCALCRANK, //50 MF_BATTLEGROUND }; @@ -9177,7 +9177,7 @@ BUILDIN_FUNC(getmapflag) case MF_AUTOTRADE: script_pushint(st,map[m].flag.autotrade); break; case MF_ALLOWKS: script_pushint(st,map[m].flag.allowks); break; case MF_MONSTER_NOTELEPORT: script_pushint(st,map[m].flag.monster_noteleport); break; - case MF_PVPNOCALCRANK: script_pushint(st,map[m].flag.pvpnocalcrank); 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; } } @@ -9247,8 +9247,8 @@ BUILDIN_FUNC(setmapflag) case MF_AUTOTRADE: map[m].flag.autotrade=1; break; case MF_ALLOWKS: map[m].flag.allowks=1; break; case MF_MONSTER_NOTELEPORT: map[m].flag.monster_noteleport=1; break; - case MF_PVPNOCALCRANK: map[m].flag.pvpnocalcrank=1; break; - case MF_BATTLEGROUND: map[m].flag.battleground = (!val || atoi(val) < - || atoi(val) > 2) ? 1 : atoi(val); 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; } } @@ -9314,7 +9314,7 @@ BUILDIN_FUNC(removemapflag) case MF_AUTOTRADE: map[m].flag.autotrade=0; break; case MF_ALLOWKS: map[m].flag.allowks=0; break; case MF_MONSTER_NOTELEPORT: map[m].flag.monster_noteleport=0; break; - case MF_PVPNOCALCRANK: map[m].flag.pvpnocalcrank=0; break; + case MF_PVP_NOCALCRANK: map[m].flag.pvp_nocalcrank=0; break; case MF_BATTLEGROUND: map[m].flag.battleground=0; break; } } |