Skip to content

Commit

Permalink
Rename _flags functions
Browse files Browse the repository at this point in the history 
and, or -> _and, _or
They can conflict with standard (iso646.h)
  • Loading branch information
@Xottab-DUTY
Xottab-DUTY committed Jan 5, 2018
1 parent 846fa30 commit 847b492
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion src/editors/LevelEditor/Edit/UI_LevelMain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1501,7 +1501,7 @@ void CLevelMain::restore_rt_flags(CCustomObject* CO)
u32 fl = m_rt_object_props->r_u32(LTools->m_LastFileName.c_str(), CO->Name);
CO->m_RT_Flags.set(
CCustomObject::flRT_Visible | CCustomObject::flRT_Selected | CCustomObject::flRT_SelectedLast, FALSE);
CO->m_RT_Flags.or (fl);
CO->m_RT_Flags._or (fl);
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/xrCore/_flags.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,25 +70,25 @@ struct _flags
bool is_any(const T mask) const throw() { return !!(flags & mask); }
bool test(const T mask) const throw() { return !!(flags & mask); }

SelfRef or (const T mask) throw()
SelfRef _or(const T mask) throw()
{
flags |= mask;
return *this;
}

SelfRef or (const Self& f, const T mask) throw()
SelfRef _or(const Self& f, const T mask) throw()
{
flags = f.flags | mask;
return *this;
}

SelfRef and (const T mask) throw()
SelfRef _and(const T mask) throw()
{
flags &= mask;
return *this;
}

SelfRef and (const Self& f, const T mask) throw()
SelfRef _and(const Self& f, const T mask) throw()
{
flags = f.flags & mask;
return *this;
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/PHSkeleton.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ void CPHSkeleton::UnsplitSingle(CPHSkeleton* SO)
mask0.assign(pKinematics->LL_GetBonesVisible()); // first part mask
VERIFY2(mask0.flags, "mask0 -Zero");
mask0.invert();
mask1.and (mask0.flags); // second part mask
mask1._and (mask0.flags); // second part mask

newKinematics->LL_SetBoneRoot(split_bone);
VERIFY2(mask1.flags, "mask1 -Zero");
Expand Down
12 changes: 6 additions & 6 deletions src/xrGame/ai/monsters/control_manager_custom.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ void CControlManagerCustom::load_jump_data(
{
m_jump->setup_data().state_prepare_in_move.motion = skel_animated->ID_Cycle_Safe(s2);
VERIFY(m_jump->setup_data().state_prepare_in_move.motion);
m_jump->setup_data().flags.or (SControlJumpData::ePrepareInMove);
m_jump->setup_data().flags._or (SControlJumpData::ePrepareInMove);
}
else
m_jump->setup_data().state_prepare_in_move.motion.invalidate();
Expand All @@ -317,16 +317,16 @@ void CControlManagerCustom::load_jump_data(
else
{
m_jump->setup_data().state_ground.motion.invalidate();
m_jump->setup_data().flags.or (SControlJumpData::eGroundSkip);
m_jump->setup_data().flags._or (SControlJumpData::eGroundSkip);
}

if (!s1 && !s2)
{
m_jump->setup_data().flags.or (SControlJumpData::ePrepareSkip);
m_jump->setup_data().flags._or (SControlJumpData::ePrepareSkip);
}

m_jump->setup_data().flags.or (SControlJumpData::eGlidePlayAnimOnce);
m_jump->setup_data().flags.or (SControlJumpData::eGlideOnPrepareFailed);
m_jump->setup_data().flags._or (SControlJumpData::eGlidePlayAnimOnce);
m_jump->setup_data().flags._or (SControlJumpData::eGlideOnPrepareFailed);

m_jump->setup_data().state_prepare_in_move.velocity_mask = vel_mask_prepare;
m_jump->setup_data().state_ground.velocity_mask = vel_mask_ground;
Expand Down Expand Up @@ -375,7 +375,7 @@ void CControlManagerCustom::jump(const Fvector& position)

ctrl_data->target_object = 0;
ctrl_data->target_position = position;
ctrl_data->flags.or (SControlJumpData::ePrepareSkip);
ctrl_data->flags._or (SControlJumpData::ePrepareSkip);
ctrl_data->force_factor = -1.f;

m_man->activate(ControlCom::eControlJump);
Expand Down
20 changes: 10 additions & 10 deletions src/xrGame/ai/monsters/monster_enemy_manager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@ void CMonsterEnemyManager::update()
flags.zero();

if ((prev_enemy == enemy) && (time_last_seen != Device.dwTimeGlobal))
flags.or (FLAG_ENEMY_LOST_SIGHT);
flags._or (FLAG_ENEMY_LOST_SIGHT);
if (prev_enemy && !prev_enemy->g_Alive())
flags.or (FLAG_ENEMY_DIE);
flags._or (FLAG_ENEMY_DIE);
if (!enemy_see_me)
flags.or (FLAG_ENEMY_DOESNT_SEE_ME);
flags._or (FLAG_ENEMY_DOESNT_SEE_ME);

float dist_now, dist_prev;
if (prev_enemy == enemy)
Expand All @@ -112,28 +112,28 @@ void CMonsterEnemyManager::update()
dist_prev = prev_enemy_position.distance_to(monster->Position());

if (_abs(dist_now - dist_prev) < 0.2f)
flags.or (FLAG_ENEMY_STANDING);
flags._or (FLAG_ENEMY_STANDING);
else
{
if (dist_now < dist_prev)
flags.or (FLAG_ENEMY_GO_CLOSER);
flags._or (FLAG_ENEMY_GO_CLOSER);
else
flags.or (FLAG_ENEMY_GO_FARTHER);
flags._or (FLAG_ENEMY_GO_FARTHER);

if (_abs(dist_now - dist_prev) < 1.2f)
{
if (dist_now < dist_prev)
flags.or (FLAG_ENEMY_GO_CLOSER_FAST);
flags._or (FLAG_ENEMY_GO_CLOSER_FAST);
else
flags.or (FLAG_ENEMY_GO_FARTHER_FAST);
flags._or (FLAG_ENEMY_GO_FARTHER_FAST);
}
}

if (flags.is(FLAG_ENEMY_STANDING) && flags.is(FLAG_ENEMY_DOESNT_SEE_ME))
flags.or (FLAG_ENEMY_DOESNT_KNOW_ABOUT_ME);
flags._or (FLAG_ENEMY_DOESNT_KNOW_ABOUT_ME);
}
else
flags.or (FLAG_ENEMY_STATS_NOT_READY);
flags._or (FLAG_ENEMY_STATS_NOT_READY);

// сохранить текущего врага
prev_enemy = enemy;
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/alife_dynamic_object.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ void CSE_ALifeInventoryBox::add_online(const bool& update_registries)
CSE_ALifeDynamicObject* l_tpALifeDynamicObject = ai().alife().objects().object(*I);
CSE_ALifeInventoryItem* l_tpALifeInventoryItem = smart_cast<CSE_ALifeInventoryItem*>(l_tpALifeDynamicObject);
R_ASSERT2(l_tpALifeInventoryItem, "Non inventory item object has parent?!");
l_tpALifeInventoryItem->base()->s_flags.or (M_SPAWN_UPDATE);
l_tpALifeInventoryItem->base()->s_flags._or (M_SPAWN_UPDATE);
CSE_Abstract* l_tpAbstract = smart_cast<CSE_Abstract*>(l_tpALifeInventoryItem);
object->alife().server().entity_Destroy(l_tpAbstract);

Expand All @@ -202,7 +202,7 @@ void CSE_ALifeInventoryBox::add_online(const bool& update_registries)
l_tpALifeDynamicObject->o_Position = object->o_Position;
l_tpALifeDynamicObject->m_tNodeID = object->m_tNodeID;
object->alife().server().Process_spawn(tNetPacket, clientID, FALSE, l_tpALifeInventoryItem->base());
l_tpALifeDynamicObject->s_flags.and (u16(-1) ^ M_SPAWN_UPDATE);
l_tpALifeDynamicObject->s_flags._and (u16(-1) ^ M_SPAWN_UPDATE);
l_tpALifeDynamicObject->m_bOnline = true;
}

Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/alife_switch_manager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ void CALifeSwitchManager::add_online(CSE_ALifeDynamicObject* object, bool update
NET_Packet tNetPacket;
CSE_Abstract* l_tpAbstract = smart_cast<CSE_Abstract*>(object);
server().entity_Destroy(l_tpAbstract);
object->s_flags.or (M_SPAWN_UPDATE);
object->s_flags._or (M_SPAWN_UPDATE);
ClientID clientID;
clientID.set(server().GetServerClient() ? server().GetServerClient()->ID.value() : 0);
server().Process_spawn(tNetPacket, clientID, FALSE, l_tpAbstract);
object->s_flags.and (u16(-1) ^ M_SPAWN_UPDATE);
object->s_flags._and (u16(-1) ^ M_SPAWN_UPDATE);

// Xottab_DUTY: Workaround for crash with corpses that end up outside AI map
//R_ASSERT3(!object->used_ai_locations() || ai().level_graph().valid_vertex_id(object->m_tNodeID),
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/alife_trader_abstract.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ void add_online_impl(CSE_ALifeDynamicObject* object, const bool& update_registri
continue;

//R_ASSERT2(l_tpALifeInventoryItem, "Non inventory item object has parent?!");
l_tpALifeInventoryItem->base()->s_flags.or (M_SPAWN_UPDATE);
l_tpALifeInventoryItem->base()->s_flags._or (M_SPAWN_UPDATE);
CSE_Abstract* l_tpAbstract = smart_cast<CSE_Abstract*>(l_tpALifeInventoryItem);
object->alife().server().entity_Destroy(l_tpAbstract);

Expand All @@ -195,7 +195,7 @@ void add_online_impl(CSE_ALifeDynamicObject* object, const bool& update_registri
l_tpALifeDynamicObject->o_Position = object->o_Position;
l_tpALifeDynamicObject->m_tNodeID = object->m_tNodeID;
object->alife().server().Process_spawn(tNetPacket, clientID, FALSE, l_tpALifeInventoryItem->base());
l_tpALifeDynamicObject->s_flags.and (u16(-1) ^ M_SPAWN_UPDATE);
l_tpALifeDynamicObject->s_flags._and (u16(-1) ^ M_SPAWN_UPDATE);
l_tpALifeDynamicObject->m_bOnline = true;
}

Expand Down
24 changes: 12 additions & 12 deletions src/xrServerEntities/script_flags_script.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ SCRIPT_EXPORT(Flags8, (), {
.def("invert", (Flags8 & (Flags8::*)(const Flags8::TYPE))(&Flags8::invert))
.def("assign", (Flags8 & (Flags8::*)(const Flags8&))(&Flags8::assign))
.def("assign", (Flags8 & (Flags8::*)(const Flags8::TYPE))(&Flags8::assign))
.def("or", (Flags8 & (Flags8::*)(const Flags8::TYPE))(&Flags8:: or))
.def("or", (Flags8 & (Flags8::*)(const Flags8&, const Flags8::TYPE))(&Flags8:: or))
.def("and", (Flags8 & (Flags8::*)(const Flags8::TYPE))(&Flags8::and))
.def("and", (Flags8 & (Flags8::*)(const Flags8&, const Flags8::TYPE))(&Flags8::and))
.def("or", (Flags8 & (Flags8::*)(const Flags8::TYPE))(&Flags8:: _or))
.def("or", (Flags8 & (Flags8::*)(const Flags8&, const Flags8::TYPE))(&Flags8:: _or))
.def("and", (Flags8 & (Flags8::*)(const Flags8::TYPE))(&Flags8::_and))
.def("and", (Flags8 & (Flags8::*)(const Flags8&, const Flags8::TYPE))(&Flags8::_and))
.def("set", &::set<Flags8>)
.def("is", &is<Flags8>)
.def("is_any", &is_any<Flags8>)
Expand All @@ -87,10 +87,10 @@ SCRIPT_EXPORT(Flags16, (), {
.def("invert", (Flags16 & (Flags16::*)(const Flags16::TYPE))(&Flags16::invert))
.def("assign", (Flags16 & (Flags16::*)(const Flags16&))(&Flags16::assign))
.def("assign", (Flags16 & (Flags16::*)(const Flags16::TYPE))(&Flags16::assign))
.def("or", (Flags16 & (Flags16::*)(const Flags16::TYPE))(&Flags16:: or))
.def("or", (Flags16 & (Flags16::*)(const Flags16&, const Flags16::TYPE))(&Flags16:: or))
.def("and", (Flags16 & (Flags16::*)(const Flags16::TYPE))(&Flags16::and))
.def("and", (Flags16 & (Flags16::*)(const Flags16&, const Flags16::TYPE))(&Flags16::and))
.def("or", (Flags16 & (Flags16::*)(const Flags16::TYPE))(&Flags16:: _or))
.def("or", (Flags16 & (Flags16::*)(const Flags16&, const Flags16::TYPE))(&Flags16:: _or))
.def("and", (Flags16 & (Flags16::*)(const Flags16::TYPE))(&Flags16::_and))
.def("and", (Flags16 & (Flags16::*)(const Flags16&, const Flags16::TYPE))(&Flags16::_and))
.def("set", &::set<Flags16>)
.def("is", &is<Flags16>)
.def("is_any", &is_any<Flags16>)
Expand All @@ -110,10 +110,10 @@ SCRIPT_EXPORT(Flags32, (), {
.def("invert", (Flags32 & (Flags32::*)(const Flags32::TYPE))(&Flags32::invert))
.def("assign", (Flags32 & (Flags32::*)(const Flags32&))(&Flags32::assign))
.def("assign", (Flags32 & (Flags32::*)(const Flags32::TYPE))(&Flags32::assign))
.def("or", (Flags32 & (Flags32::*)(const Flags32::TYPE))(&Flags32:: or))
.def("or", (Flags32 & (Flags32::*)(const Flags32&, const Flags32::TYPE))(&Flags32:: or))
.def("and", (Flags32 & (Flags32::*)(const Flags32::TYPE))(&Flags32::and))
.def("and", (Flags32 & (Flags32::*)(const Flags32&, const Flags32::TYPE))(&Flags32::and))
.def("or", (Flags32 & (Flags32::*)(const Flags32::TYPE))(&Flags32:: _or))
.def("or", (Flags32 & (Flags32::*)(const Flags32&, const Flags32::TYPE))(&Flags32:: _or))
.def("and", (Flags32 & (Flags32::*)(const Flags32::TYPE))(&Flags32::_and))
.def("and", (Flags32 & (Flags32::*)(const Flags32&, const Flags32::TYPE))(&Flags32::_and))
.def("set", &::set<Flags32>)
.def("is", &is<Flags32>)
.def("is_any", &is_any<Flags32>)
Expand Down

0 comments on commit 847b492

Please sign in to comment.