summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/char/char.cpp4
-rw-r--r--src/io/cxxstdio_enums.hpp4
-rw-r--r--src/map/atcommand.cpp22
-rw-r--r--src/map/battle.cpp2
-rw-r--r--src/map/battle.hpp2
-rw-r--r--src/map/chrif.cpp2
-rw-r--r--src/map/clif.cpp18
-rw-r--r--src/map/clif.t.hpp6
-rw-r--r--src/map/magic-expr.cpp2
-rw-r--r--src/map/magic.cpp2
-rw-r--r--src/map/map.hpp4
-rw-r--r--src/map/mob.cpp4
-rw-r--r--src/map/npc.cpp6
-rw-r--r--src/map/pc.cpp22
-rw-r--r--src/map/pc.hpp4
-rw-r--r--src/map/script.cpp4
-rw-r--r--src/map/skill.cpp8
-rw-r--r--src/mmo/enums.hpp10
-rw-r--r--src/mmo/extract_enums.hpp4
19 files changed, 65 insertions, 65 deletions
diff --git a/src/char/char.cpp b/src/char/char.cpp
index d5e887b..4f52663 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -807,7 +807,7 @@ CharPair *make_new_char(Session *s, CharName name, const Stats6& stats, uint8_t
cd.sp = cd.max_sp;
cd.status_point = 0;
cd.skill_point = 0;
- cd.option = static_cast<Option>(0x0000); // Option is only declared
+ cd.option = static_cast<Opt0>(0x0000); // Opt0 is only declared
cd.karma = 0;
cd.manner = 0;
cd.party_id = PartyId();
@@ -2608,7 +2608,7 @@ void parse_char(Session *s)
fixed_6d.char_select.gloves = ItemNameId();
fixed_6d.char_select.cape = ItemNameId();
fixed_6d.char_select.misc1 = ItemNameId();
- fixed_6d.char_select.option = Option();
+ fixed_6d.char_select.option = Opt0();
fixed_6d.char_select.unused = 0;
// this was buggy until the protocol became generated
diff --git a/src/io/cxxstdio_enums.hpp b/src/io/cxxstdio_enums.hpp
index 05cdcae..6f428e8 100644
--- a/src/io/cxxstdio_enums.hpp
+++ b/src/io/cxxstdio_enums.hpp
@@ -32,7 +32,7 @@ namespace e
enum class BF : uint16_t;
enum class EPOS : uint16_t;
enum class MapCell : uint8_t;
-enum class Option : uint16_t;
+enum class Opt0 : uint16_t;
inline
auto decay_for_printf(BF v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); }
@@ -41,7 +41,7 @@ auto decay_for_printf(EPOS v) -> typename remove_enum<decltype(v)>::type { retur
inline
auto decay_for_printf(MapCell v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); }
inline
-auto decay_for_printf(Option v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); }
+auto decay_for_printf(Opt0 v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); }
}
namespace magic
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index 0d70b36..8f103e1 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -645,7 +645,7 @@ ATCE atcommand_where(Session *s, dumb_ptr<map_session_data> sd,
dumb_ptr<map_session_data> pl_sd = character.to__actual() ? map_nick2sd(character) : sd;
if (pl_sd != nullptr &&
!((battle_config.hide_GM_session
- || bool(pl_sd->status.option & Option::HIDE))
+ || bool(pl_sd->status.option & Opt0::HIDE))
&& !(pc_isGM(sd).detects(pc_isGM(pl_sd)))))
{
// you can look only lower or same level
@@ -768,7 +768,7 @@ ATCE atcommand_who(Session *s, dumb_ptr<map_session_data> sd,
GmLevel pl_gm_level = pc_isGM(pl_sd);
if (!
((battle_config.hide_GM_session
- || bool(pl_sd->status.option & Option::HIDE))
+ || bool(pl_sd->status.option & Opt0::HIDE))
&& !(gm_level.detects(pl_gm_level))))
{
// you can look only lower or same level
@@ -830,7 +830,7 @@ ATCE atcommand_whogroup(Session *s, dumb_ptr<map_session_data> sd,
GmLevel pl_gm_level = pc_isGM(pl_sd);
if (!
((battle_config.hide_GM_session
- || bool(pl_sd->status.option & Option::HIDE))
+ || bool(pl_sd->status.option & Opt0::HIDE))
&& (!(gm_level.detects(pl_gm_level)))))
{
// you can look only lower or same level
@@ -893,7 +893,7 @@ ATCE atcommand_whomap(Session *s, dumb_ptr<map_session_data> sd,
GmLevel pl_gm_level = pc_isGM(pl_sd);
if (!
((battle_config.hide_GM_session
- || bool(pl_sd->status.option & Option::HIDE))
+ || bool(pl_sd->status.option & Opt0::HIDE))
&& (!(gm_level.detects(pl_gm_level)))))
{
// you can look only lower or same level
@@ -953,7 +953,7 @@ ATCE atcommand_whomapgroup(Session *s, dumb_ptr<map_session_data> sd,
GmLevel pl_gm_level = pc_isGM(pl_sd);
if (!
((battle_config.hide_GM_session
- || bool(pl_sd->status.option & Option::HIDE))
+ || bool(pl_sd->status.option & Opt0::HIDE))
&& (!(gm_level.detects(pl_gm_level)))))
{
// you can look only lower or same level
@@ -1014,7 +1014,7 @@ ATCE atcommand_whogm(Session *s, dumb_ptr<map_session_data> sd,
{
if (!
((battle_config.hide_GM_session
- || bool(pl_sd->status.option & Option::HIDE))
+ || bool(pl_sd->status.option & Opt0::HIDE))
&& (!(gm_level.detects(pl_gm_level)))))
{
// you can look only lower or same level
@@ -1174,7 +1174,7 @@ ATCE atcommand_option(Session *s, dumb_ptr<map_session_data> sd,
{
Opt1 param1 = Opt1::ZERO;
Opt2 param2 = Opt2::ZERO;
- Option param3 = Option::ZERO;
+ Opt0 param3 = Opt0::ZERO;
if (!extract(message, record<',', 1>(&param1, &param2, &param3)))
return ATCE::USAGE;
@@ -1194,14 +1194,14 @@ static
ATCE atcommand_hide(Session *s, dumb_ptr<map_session_data> sd,
ZString)
{
- if (bool(sd->status.option & Option::HIDE))
+ if (bool(sd->status.option & Opt0::HIDE))
{
- sd->status.option &= ~Option::HIDE;
+ sd->status.option &= ~Opt0::HIDE;
clif_displaymessage(s, "Invisible: Off."_s);
}
else
{
- sd->status.option |= Option::HIDE;
+ sd->status.option |= Opt0::HIDE;
clif_displaymessage(s, "Invisible: On."_s);
}
clif_changeoption(sd);
@@ -2257,7 +2257,7 @@ ATCE atcommand_character_option(Session *s, dumb_ptr<map_session_data> sd,
{
Opt1 opt1;
Opt2 opt2;
- Option opt3;
+ Opt0 opt3;
CharName character;
if (!asplit(message, &opt1, &opt2, &opt3, &character))
return ATCE::USAGE;
diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index 856408c..5e81184 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -930,7 +930,7 @@ Opt3 *battle_get_opt3(dumb_ptr<block_list> bl)
return nullptr;
}
-Option *battle_get_option(dumb_ptr<block_list> bl)
+Opt0 *battle_get_option(dumb_ptr<block_list> bl)
{
nullpo_retn(bl);
if (bl->bl_type == BL::MOB)
diff --git a/src/map/battle.hpp b/src/map/battle.hpp
index 97a4a86..b6aeff5 100644
--- a/src/map/battle.hpp
+++ b/src/map/battle.hpp
@@ -105,7 +105,7 @@ short *battle_get_sc_count(dumb_ptr<block_list> bl);
Opt1 *battle_get_opt1(dumb_ptr<block_list> bl);
Opt2 *battle_get_opt2(dumb_ptr<block_list> bl);
Opt3 *battle_get_opt3(dumb_ptr<block_list> bl);
-Option *battle_get_option(dumb_ptr<block_list> bl);
+Opt0 *battle_get_option(dumb_ptr<block_list> bl);
bool battle_check_undead(Race race, Element element);
int battle_check_target(dumb_ptr<block_list> src, dumb_ptr<block_list> target,
diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp
index 0748f43..0ebdf1c 100644
--- a/src/map/chrif.cpp
+++ b/src/map/chrif.cpp
@@ -1283,7 +1283,7 @@ void send_users_tochar(TimerData *, tick_t)
if (sd && sd->state.auth &&
!((battle_config.hide_GM_session
|| sd->state.shroud_active
- || bool(sd->status.option & Option::HIDE)) && pc_isGM(sd)))
+ || bool(sd->status.option & Opt0::HIDE)) && pc_isGM(sd)))
{
Packet_Repeat<0x2aff> info;
info.char_id = sd->status_key.char_id;
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index 3b6c772..025b8e8 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -305,7 +305,7 @@ int clif_send(const Buffer& buf, dumb_ptr<block_list> bl, SendWho type)
if (bl->bl_type == BL::PC)
{
dumb_ptr<map_session_data> sd2 = bl->is_player();
- if (bool(sd2->status.option & Option::INVISIBILITY))
+ if (bool(sd2->status.option & Opt0::INVISIBILITY))
{
// Obscure hidden GMs
@@ -1000,7 +1000,7 @@ int clif_spawn_fake_npc_for_player(dumb_ptr<map_session_data> sd, BlockId fake_n
fixed_7c.speed = interval_t();
fixed_7c.opt1 = Opt1::ZERO;
fixed_7c.opt2 = Opt2::ZERO;
- fixed_7c.option = Option::ZERO;
+ fixed_7c.option = Opt0::ZERO;
fixed_7c.species = FAKE_NPC_CLASS;
fixed_7c.pos.x = sd->bl_x;
fixed_7c.pos.y = sd->bl_y;
@@ -1011,7 +1011,7 @@ int clif_spawn_fake_npc_for_player(dumb_ptr<map_session_data> sd, BlockId fake_n
fixed_78.speed = interval_t();
fixed_78.opt1 = Opt1::ZERO;
fixed_78.opt2 = Opt2::ZERO;
- fixed_78.option = Option::ZERO;
+ fixed_78.option = Opt0::ZERO;
fixed_78.species = FAKE_NPC_CLASS;
fixed_78.unused_head_bottom_or_species_again = unwrap<Species>(FAKE_NPC_CLASS);
fixed_78.pos.x = sd->bl_x;
@@ -1829,7 +1829,7 @@ int clif_changelook_towards(dumb_ptr<block_list> bl, LOOK type, int val,
if (bl->bl_type == BL::PC)
sd = bl->is_player();
- if (sd && bool(sd->status.option & Option::INVISIBILITY))
+ if (sd && bool(sd->status.option & Opt0::INVISIBILITY))
return 0;
if (sd
@@ -2072,7 +2072,7 @@ int clif_changeoption(dumb_ptr<block_list> bl)
nullpo_retz(bl);
- Option option = *battle_get_option(bl);
+ Opt0 option = *battle_get_option(bl);
sc_data = battle_get_sc_data(bl);
Packet_Fixed<0x0119> fixed_119;
@@ -2355,7 +2355,7 @@ static
void clif_getareachar_pc(dumb_ptr<map_session_data> sd,
dumb_ptr<map_session_data> dstsd)
{
- if (bool(dstsd->status.option & Option::INVISIBILITY))
+ if (bool(dstsd->status.option & Opt0::INVISIBILITY))
return;
nullpo_retv(sd);
@@ -3902,7 +3902,7 @@ RecvResult clif_parse_ActionRequest(Session *s, dumb_ptr<map_session_data> sd)
{
case DamageType::NORMAL:
case DamageType::CONTINUOUS:
- if (bool(sd->status.option & Option::HIDE))
+ if (bool(sd->status.option & Opt0::HIDE))
return rv;
if (!battle_config.skill_delay_attack_enable)
{
@@ -4764,7 +4764,7 @@ RecvResult clif_parse_RemovePartyMember(Session *s, dumb_ptr<map_session_data> s
*------------------------------------------
*/
static
-RecvResult clif_parse_PartyChangeOption(Session *s, dumb_ptr<map_session_data> sd)
+RecvResult clif_parse_PartyChangeOpt0(Session *s, dumb_ptr<map_session_data> sd)
{
Packet_Fixed<0x0102> fixed;
RecvResult rv = recv_fpacket<0x0102, 6>(s, fixed);
@@ -5074,7 +5074,7 @@ func_table clif_parse_func_table[0x0220] =
{0, 10, clif_parse_ReplyPartyInvite, }, // 0x00ff
{0, 2, clif_parse_LeaveParty, }, // 0x0100
{0, 6, nullptr, }, // 0x0101
- {0, 6, clif_parse_PartyChangeOption, }, // 0x0102
+ {0, 6, clif_parse_PartyChangeOpt0, }, // 0x0102
{0, 30, clif_parse_RemovePartyMember, }, // 0x0103
{0, 79, nullptr, }, // 0x0104
{0, 31, nullptr, }, // 0x0105
diff --git a/src/map/clif.t.hpp b/src/map/clif.t.hpp
index 1789ee8..0f8cdbf 100644
--- a/src/map/clif.t.hpp
+++ b/src/map/clif.t.hpp
@@ -40,7 +40,7 @@ namespace e
{
// [Fate] status.option properties. These are persistent status changes.
// IDs that are not listed are not used in the code (to the best of my knowledge)
-enum class Option : uint16_t
+enum class Opt0 : uint16_t
{
ZERO = 0x0000,
@@ -88,11 +88,11 @@ enum class Opt3 : uint16_t
_assumptio = 0x0800,
};
-ENUM_BITWISE_OPERATORS(Option)
+ENUM_BITWISE_OPERATORS(Opt0)
ENUM_BITWISE_OPERATORS(Opt2)
ENUM_BITWISE_OPERATORS(Opt3)
}
-using e::Option;
+using e::Opt0;
using e::Opt1;
using e::Opt2;
using e::Opt3;
diff --git a/src/map/magic-expr.cpp b/src/map/magic-expr.cpp
index 674c850..4ea83b6 100644
--- a/src/map/magic-expr.cpp
+++ b/src/map/magic-expr.cpp
@@ -1228,7 +1228,7 @@ int fun_running_status_update(dumb_ptr<env_t>, val_t *result, Slice<val_t> args)
static
int fun_status_option(dumb_ptr<env_t>, val_t *result, Slice<val_t> args)
{
- *result = ValInt{(bool((ARGPC(0))->status.option & static_cast<Option>(ARGINT(1))))};
+ *result = ValInt{(bool((ARGPC(0))->status.option & static_cast<Opt0>(ARGINT(1))))};
return 0;
}
diff --git a/src/map/magic.cpp b/src/map/magic.cpp
index a0238b5..a6439a5 100644
--- a/src/map/magic.cpp
+++ b/src/map/magic.cpp
@@ -71,7 +71,7 @@ int magic_message(dumb_ptr<map_session_data> caster, XString source_invocation)
{
if (pc_isdead(caster))
return 0;
- if (bool(caster->status.option & Option::HIDE))
+ if (bool(caster->status.option & Opt0::HIDE))
return 0; // No spellcasting while hidden
int power = caster->matk1;
diff --git a/src/map/map.hpp b/src/map/map.hpp
index d88ff54..8c2181c 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -355,7 +355,7 @@ struct npc_data : block_list
Opt1 opt1;
Opt2 opt2;
Opt3 opt3;
- Option option;
+ Opt0 option;
short flag;
std::list<RString> eventqueuel;
@@ -482,7 +482,7 @@ struct mob_data : block_list
Opt1 opt1;
Opt2 opt2;
Opt3 opt3;
- Option option;
+ Opt0 option;
short min_chase;
Timer deletetimer;
diff --git a/src/map/mob.cpp b/src/map/mob.cpp
index dd061d0..a525ed4 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -1182,7 +1182,7 @@ int mob_spawn(BlockId id)
md->opt1 = Opt1::ZERO;
md->opt2 = Opt2::ZERO;
md->opt3 = Opt3::ZERO;
- md->option = Option::ZERO;
+ md->option = Opt0::ZERO;
md->hp = battle_get_max_hp(md);
if (md->hp <= 0)
@@ -1342,7 +1342,7 @@ int mob_target(dumb_ptr<mob_data> md, dumb_ptr<block_list> bl, int dist)
nullpo_retz(bl);
sc_data = battle_get_sc_data(bl);
- Option *option = battle_get_option(bl);
+ Opt0 *option = battle_get_option(bl);
Race race = get_mob_db(md->mob_class).race;
if (md->mode == MobMode::ZERO)
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index a6427d6..95a157b 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -1043,7 +1043,7 @@ int npc_parse_warp(XString w1, XString, NpcName w3, XString w4)
else
nd->npc_class = WARP_DEBUG_CLASS;
nd->speed = 200_ms;
- nd->option = Option::ZERO;
+ nd->option = Opt0::ZERO;
nd->opt1 = Opt1::ZERO;
nd->opt2 = Opt2::ZERO;
nd->opt3 = Opt3::ZERO;
@@ -1158,7 +1158,7 @@ int npc_parse_shop(XString w1, XString, NpcName w3, ZString w4a)
nd->name = w3;
nd->npc_class = npc_class;
nd->speed = 200_ms;
- nd->option = Option::ZERO;
+ nd->option = Opt0::ZERO;
nd->opt1 = Opt1::ZERO;
nd->opt2 = Opt2::ZERO;
nd->opt3 = Opt3::ZERO;
@@ -1340,7 +1340,7 @@ int npc_parse_script(XString w1, XString w2, NpcName w3, ZString w4,
nd->npc_class = npc_class;
nd->speed = 200_ms;
nd->scr.script = std::move(script);
- nd->option = Option::ZERO;
+ nd->option = Opt0::ZERO;
nd->opt1 = Opt1::ZERO;
nd->opt2 = Opt2::ZERO;
nd->opt3 = Opt3::ZERO;
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index ada5b9f..17f0cf1 100644
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -729,15 +729,15 @@ int pc_authok(AccountId id, int login_id2, TimeT connect_until_time,
}
sd->sc_count = 0;
{
- Option old_option = sd->status.option;
- sd->status.option = Option::ZERO;
+ Opt0 old_option = sd->status.option;
+ sd->status.option = Opt0::ZERO;
// This would leak information.
// It's better to make it obvious that players can see you.
- if (false && bool(old_option & Option::INVISIBILITY))
+ if (false && bool(old_option & Opt0::INVISIBILITY))
is_atcommand(sd->sess, sd, "@invisible"_s, GmLevel());
- if (bool(old_option & Option::HIDE))
+ if (bool(old_option & Opt0::HIDE))
is_atcommand(sd->sess, sd, "@hide"_s, GmLevel());
// atcommand_hide might already send it, but also might not
clif_changeoption(sd);
@@ -2764,8 +2764,8 @@ void pc_attack_timer(TimerData *, tick_t tick, BlockId id)
if (sd->opt1 != Opt1::ZERO)
return;
- Option *opt = battle_get_option(bl);
- if (opt != nullptr && bool(*opt & Option::REAL_ANY_HIDE))
+ Opt0 *opt = battle_get_option(bl);
+ if (opt != nullptr && bool(*opt & Opt0::REAL_ANY_HIDE))
return;
if (!battle_config.skill_delay_attack_enable)
@@ -3266,7 +3266,7 @@ int pc_resetlvl(dumb_ptr<map_session_data> sd, int type)
sd->status.job_level = 1;
sd->status.base_exp = 0;
sd->status.job_exp = 0;
- sd->status.option = Option::ZERO;
+ sd->status.option = Opt0::ZERO;
for (ATTR attr : ATTRs)
sd->status.attrs[attr] = 1;
@@ -4047,7 +4047,7 @@ int pc_changelook(dumb_ptr<map_session_data> sd, LOOK type, int val)
* 付属品(鷹,ペコ,カート)設定
*------------------------------------------
*/
-int pc_setoption(dumb_ptr<map_session_data> sd, Option type)
+int pc_setoption(dumb_ptr<map_session_data> sd, Opt0 type)
{
nullpo_retz(sd);
@@ -5240,15 +5240,15 @@ void pc_cleanup(dumb_ptr<map_session_data> sd)
void pc_invisibility(dumb_ptr<map_session_data> sd, int enabled)
{
- if (enabled && !bool(sd->status.option & Option::INVISIBILITY))
+ if (enabled && !bool(sd->status.option & Opt0::INVISIBILITY))
{
clif_clearchar(sd, BeingRemoveWhy::WARPED);
- sd->status.option |= Option::INVISIBILITY;
+ sd->status.option |= Opt0::INVISIBILITY;
clif_status_change(sd, StatusChange::CLIF_OPTION_SC_INVISIBILITY, 1);
}
else if (!enabled)
{
- sd->status.option &= ~Option::INVISIBILITY;
+ sd->status.option &= ~Opt0::INVISIBILITY;
clif_status_change(sd, StatusChange::CLIF_OPTION_SC_INVISIBILITY, 0);
pc_setpos(sd, sd->bl_m->name_, sd->bl_x, sd->bl_y, BeingRemoveWhy::WARPED);
}
diff --git a/src/map/pc.hpp b/src/map/pc.hpp
index 3187cd9..8a06076 100644
--- a/src/map/pc.hpp
+++ b/src/map/pc.hpp
@@ -62,7 +62,7 @@ void pc_setdir(dumb_ptr<map_session_data> sd, DIR b)
inline
bool pc_isinvisible(dumb_ptr<map_session_data> sd)
{
- return bool(sd->status.option & Option::HIDE);
+ return bool(sd->status.option & Opt0::HIDE);
}
inline
bool pc_is90overweight(dumb_ptr<map_session_data> sd)
@@ -145,7 +145,7 @@ int pc_damage(dumb_ptr<block_list>, dumb_ptr<map_session_data>, int);
int pc_heal(dumb_ptr<map_session_data>, int, int);
int pc_itemheal(dumb_ptr<map_session_data> sd, int hp, int sp);
int pc_percentheal(dumb_ptr<map_session_data> sd, int, int);
-int pc_setoption(dumb_ptr<map_session_data>, Option);
+int pc_setoption(dumb_ptr<map_session_data>, Opt0);
int pc_changelook(dumb_ptr<map_session_data>, LOOK, int);
int pc_readparam(dumb_ptr<map_session_data>, SP);
diff --git a/src/map/script.cpp b/src/map/script.cpp
index 40dfc0e..952df5b 100644
--- a/src/map/script.cpp
+++ b/src/map/script.cpp
@@ -2966,7 +2966,7 @@ void builtin_getmapusers(ScriptState *st)
static
void builtin_getareausers_sub(dumb_ptr<block_list> bl, int *users)
{
- if (bool(bl->is_player()->status.option & Option::HIDE))
+ if (bool(bl->is_player()->status.option & Opt0::HIDE))
return;
(*users)++;
}
@@ -2974,7 +2974,7 @@ void builtin_getareausers_sub(dumb_ptr<block_list> bl, int *users)
static
void builtin_getareausers_living_sub(dumb_ptr<block_list> bl, int *users)
{
- if (bool(bl->is_player()->status.option & Option::HIDE))
+ if (bool(bl->is_player()->status.option & Opt0::HIDE))
return;
if (!pc_isdead(bl->is_player()))
(*users)++;
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index add6a42..d1c8685 100644
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -713,7 +713,7 @@ void skill_status_change_end(dumb_ptr<block_list> bl, StatusChange type, TimerDa
eptr<struct status_change, StatusChange, StatusChange::MAX_STATUSCHANGE> sc_data;
int opt_flag = 0, calc_flag = 0;
short *sc_count;
- Option *option;
+ Opt0 *option;
Opt1 *opt1;
Opt2 *opt2;
Opt3 *opt3;
@@ -937,7 +937,7 @@ int skill_status_effect(dumb_ptr<block_list> bl, StatusChange type,
dumb_ptr<map_session_data> sd = nullptr;
eptr<struct status_change, StatusChange, StatusChange::MAX_STATUSCHANGE> sc_data;
short *sc_count;
- Option *option;
+ Opt0 *option;
Opt1 *opt1;
Opt2 *opt2;
Opt3 *opt3;
@@ -1111,7 +1111,7 @@ int skill_status_change_clear(dumb_ptr<block_list> bl, int type)
{
eptr<struct status_change, StatusChange, StatusChange::MAX_STATUSCHANGE> sc_data;
short *sc_count;
- Option *option;
+ Opt0 *option;
Opt1 *opt1;
Opt2 *opt2;
Opt3 *opt3;
@@ -1142,7 +1142,7 @@ int skill_status_change_clear(dumb_ptr<block_list> bl, int type)
*opt1 = Opt1::ZERO;
*opt2 = Opt2::ZERO;
*opt3 = Opt3::ZERO;
- *option = Option::ZERO;
+ *option = Opt0::ZERO;
if (type == 0 || type & 2)
clif_changeoption(bl);
diff --git a/src/mmo/enums.hpp b/src/mmo/enums.hpp
index bf8a75c..1cfa245 100644
--- a/src/mmo/enums.hpp
+++ b/src/mmo/enums.hpp
@@ -66,14 +66,14 @@ enum class SkillFlags : uint16_t;
}
using e::SkillFlags;
-// Option and Opt1..3 in map.hpp
+// Opt0 and Opt1..3 in map.hpp
namespace e
{
-enum class Option : uint16_t;
-constexpr Option get_enum_min_value(Option) { return Option(0x0000); }
-constexpr Option get_enum_max_value(Option) { return Option(0xffff); }
+enum class Opt0 : uint16_t;
+constexpr Opt0 get_enum_min_value(Opt0) { return Opt0(0x0000); }
+constexpr Opt0 get_enum_max_value(Opt0) { return Opt0(0xffff); }
}
-using e::Option;
+using e::Opt0;
enum class ATTR
{
diff --git a/src/mmo/extract_enums.hpp b/src/mmo/extract_enums.hpp
index 613fae9..60ad493 100644
--- a/src/mmo/extract_enums.hpp
+++ b/src/mmo/extract_enums.hpp
@@ -33,7 +33,7 @@ enum class EPOS : uint16_t;
enum class MobMode : uint16_t;
enum class Opt1 : uint16_t;
enum class Opt2 : uint16_t;
-enum class Option : uint16_t;
+enum class Opt0 : uint16_t;
inline
bool extract(XString str, EPOS *iv) { return extract_as_int(str, iv); }
@@ -44,7 +44,7 @@ bool extract(XString str, Opt1 *iv) { return extract_as_int(str, iv); }
inline
bool extract(XString str, Opt2 *iv) { return extract_as_int(str, iv); }
inline
-bool extract(XString str, Option *iv) { return extract_as_int(str, iv); }
+bool extract(XString str, Opt0 *iv) { return extract_as_int(str, iv); }
}
enum class ItemLook : uint16_t;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-17 18:15:53 +0000