summaryrefslogtreecommitdiff
path: root/src/map/clif.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-02-19 23:22:10 -0800
committerBen Longbons <b.r.longbons@gmail.com>2014-02-22 18:12:08 -0800
commitf4063c0d58d1a1812e24269efa1ebb8f9a7a2f2e (patch)
tree6abe09a93f96e475c2714c10dfaef4df412bcf0c /src/map/clif.cpp
parent8508f94daeeb49b6ccf3ee1a346f1dc9f9c56802 (diff)
downloadtmwa-f4063c0d58d1a1812e24269efa1ebb8f9a7a2f2e.tar.gz
tmwa-f4063c0d58d1a1812e24269efa1ebb8f9a7a2f2e.tar.bz2
tmwa-f4063c0d58d1a1812e24269efa1ebb8f9a7a2f2e.tar.xz
tmwa-f4063c0d58d1a1812e24269efa1ebb8f9a7a2f2e.zip
Make mapflags bitmask instead of bitfield
Diffstat (limited to 'src/map/clif.cpp')
-rw-r--r--src/map/clif.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index 3fc716d..5355192 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -887,15 +887,15 @@ int clif_spawnpc(dumb_ptr<map_session_data> sd)
WBUFW(buf, 51) = 0;
clif_send(buf, clif_parse_func_table[0x1d9].len, sd, SendWho::AREA_WOS);
- if (sd->bl_m->flag.snow)
+ if (sd->bl_m->flag.get(MapFlag::SNOW))
clif_specialeffect(sd, 162, 1);
- if (sd->bl_m->flag.fog)
+ if (sd->bl_m->flag.get(MapFlag::FOG))
clif_specialeffect(sd, 233, 1);
- if (sd->bl_m->flag.sakura)
+ if (sd->bl_m->flag.get(MapFlag::SAKURA))
clif_specialeffect(sd, 163, 1);
- if (sd->bl_m->flag.leaves)
+ if (sd->bl_m->flag.get(MapFlag::LEAVES))
clif_specialeffect(sd, 333, 1);
- if (sd->bl_m->flag.rain)
+ if (sd->bl_m->flag.get(MapFlag::RAIN))
clif_specialeffect(sd, 161, 1);
// clif_changelook_accessories(sd, NULL);
@@ -3512,7 +3512,7 @@ void clif_parse_LoadEndAck(Session *, dumb_ptr<map_session_data> sd)
if (!battle_config.pk_mode)
sd->pvp_timer.cancel();
- if (sd->bl_m->flag.pvp)
+ if (sd->bl_m->flag.get(MapFlag::PVP))
{
if (!battle_config.pk_mode)
{
@@ -4122,7 +4122,7 @@ void clif_parse_DropItem(Session *s, dumb_ptr<map_session_data> sd)
clif_clearchar(sd, BeingRemoveWhy::DEAD);
return;
}
- if (sd->bl_m->flag.no_player_drops)
+ if (sd->bl_m->flag.get(MapFlag::NO_PLAYER_DROPS))
{
clif_displaymessage(sd->sess, "Can't drop items here.");
return;