Rename _flags functions

Xottab-DUTY · Xottab-DUTY · commit 847b4928c68c · 2018-01-05T21:47:58.000+05:00
and, or -&gt; _and, _or
They can conflict with standard (iso646.h)
diff --git a/src/editors/LevelEditor/Edit/UI_LevelMain.cpp b/src/editors/LevelEditor/Edit/UI_LevelMain.cpp
@@ -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);
     }
 }
 
diff --git a/src/xrCore/_flags.h b/src/xrCore/_flags.h
@@ -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;
diff --git a/src/xrGame/PHSkeleton.cpp b/src/xrGame/PHSkeleton.cpp
@@ -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");
diff --git a/src/xrGame/ai/monsters/control_manager_custom.cpp b/src/xrGame/ai/monsters/control_manager_custom.cpp
@@ -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();
@@ -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;
@@ -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);
diff --git a/src/xrGame/ai/monsters/monster_enemy_manager.cpp b/src/xrGame/ai/monsters/monster_enemy_manager.cpp
@@ -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)
@@ -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;
diff --git a/src/xrGame/alife_dynamic_object.cpp b/src/xrGame/alife_dynamic_object.cpp
@@ -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);
 
@@ -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;
     }
 
diff --git a/src/xrGame/alife_switch_manager.cpp b/src/xrGame/alife_switch_manager.cpp
@@ -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),
diff --git a/src/xrGame/alife_trader_abstract.cpp b/src/xrGame/alife_trader_abstract.cpp
@@ -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);
 
@@ -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;
     }
 
diff --git a/src/xrServerEntities/script_flags_script.cpp b/src/xrServerEntities/script_flags_script.cpp
@@ -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>)
@@ -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>)
@@ -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>)

Original file line number	Diff line number	Diff line change
`@@ -1501,7 +1501,7 @@ void CLevelMain::restore_rt_flags(CCustomObject* CO)`
`1501`	`1501`	`u32 fl = m_rt_object_props->r_u32(LTools->m_LastFileName.c_str(), CO->Name);`
`1502`	`1502`	`CO->m_RT_Flags.set(`
`1503`	`1503`	`CCustomObject::flRT_Visible \| CCustomObject::flRT_Selected \| CCustomObject::flRT_SelectedLast, FALSE);`
`1504`		`- CO->m_RT_Flags.or (fl);`
	`1504`	`+ CO->m_RT_Flags._or (fl);`
`1505`	`1505`	`}`
`1506`	`1506`	`}`
`1507`	`1507`
Original file line number	Diff line number	Diff line change
`@@ -70,25 +70,25 @@ struct _flags`
`70`	`70`	`bool is_any(const T mask) const throw() { return !!(flags & mask); }`
`71`	`71`	`bool test(const T mask) const throw() { return !!(flags & mask); }`
`72`	`72`
`73`		`- SelfRef or (const T mask) throw()`
	`73`	`+ SelfRef _or(const T mask) throw()`
`74`	`74`	`{`
`75`	`75`	`flags \|= mask;`
`76`	`76`	`return *this;`
`77`	`77`	`}`
`78`	`78`
`79`		`- SelfRef or (const Self& f, const T mask) throw()`
	`79`	`+ SelfRef _or(const Self& f, const T mask) throw()`
`80`	`80`	`{`
`81`	`81`	`flags = f.flags \| mask;`
`82`	`82`	`return *this;`
`83`	`83`	`}`
`84`	`84`
`85`		`- SelfRef and (const T mask) throw()`
	`85`	`+ SelfRef _and(const T mask) throw()`
`86`	`86`	`{`
`87`	`87`	`flags &= mask;`
`88`	`88`	`return *this;`
`89`	`89`	`}`
`90`	`90`
`91`		`- SelfRef and (const Self& f, const T mask) throw()`
	`91`	`+ SelfRef _and(const Self& f, const T mask) throw()`
`92`	`92`	`{`
`93`	`93`	`flags = f.flags & mask;`
`94`	`94`	`return *this;`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ void CControlManagerCustom::load_jump_data(`
`301`	`301`	`{`
`302`	`302`	`m_jump->setup_data().state_prepare_in_move.motion = skel_animated->ID_Cycle_Safe(s2);`
`303`	`303`	`VERIFY(m_jump->setup_data().state_prepare_in_move.motion);`
`304`		`- m_jump->setup_data().flags.or (SControlJumpData::ePrepareInMove);`
	`304`	`+ m_jump->setup_data().flags._or (SControlJumpData::ePrepareInMove);`
`305`	`305`	`}`
`306`	`306`	`else`
`307`	`307`	`m_jump->setup_data().state_prepare_in_move.motion.invalidate();`
`@@ -317,16 +317,16 @@ void CControlManagerCustom::load_jump_data(`
`317`	`317`	`else`
`318`	`318`	`{`
`319`	`319`	`m_jump->setup_data().state_ground.motion.invalidate();`
`320`		`- m_jump->setup_data().flags.or (SControlJumpData::eGroundSkip);`
	`320`	`+ m_jump->setup_data().flags._or (SControlJumpData::eGroundSkip);`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`if (!s1 && !s2)`
`324`	`324`	`{`
`325`		`- m_jump->setup_data().flags.or (SControlJumpData::ePrepareSkip);`
	`325`	`+ m_jump->setup_data().flags._or (SControlJumpData::ePrepareSkip);`
`326`	`326`	`}`
`327`	`327`
`328`		`- m_jump->setup_data().flags.or (SControlJumpData::eGlidePlayAnimOnce);`
`329`		`- m_jump->setup_data().flags.or (SControlJumpData::eGlideOnPrepareFailed);`
	`328`	`+ m_jump->setup_data().flags._or (SControlJumpData::eGlidePlayAnimOnce);`
	`329`	`+ m_jump->setup_data().flags._or (SControlJumpData::eGlideOnPrepareFailed);`
`330`	`330`
`331`	`331`	`m_jump->setup_data().state_prepare_in_move.velocity_mask = vel_mask_prepare;`
`332`	`332`	`m_jump->setup_data().state_ground.velocity_mask = vel_mask_ground;`
`@@ -375,7 +375,7 @@ void CControlManagerCustom::jump(const Fvector& position)`
`375`	`375`
`376`	`376`	`ctrl_data->target_object = 0;`
`377`	`377`	`ctrl_data->target_position = position;`
`378`		`- ctrl_data->flags.or (SControlJumpData::ePrepareSkip);`
	`378`	`+ ctrl_data->flags._or (SControlJumpData::ePrepareSkip);`
`379`	`379`	`ctrl_data->force_factor = -1.f;`
`380`	`380`
`381`	`381`	`m_man->activate(ControlCom::eControlJump);`