Skip to content

Commit 847b492

Browse files
Xottab-DUTYXottab-DUTY
committed
Rename _flags functions
and, or -> _and, _or They can conflict with standard (iso646.h)
1 parent 846fa30 commit 847b492

File tree

9 files changed

+40
-40
lines changed

9 files changed

+40
-40
lines changed

‎src/editors/LevelEditor/Edit/UI_LevelMain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1501,7 +1501,7 @@ void CLevelMain::restore_rt_flags(CCustomObject* CO)
15011501
u32 fl = m_rt_object_props->r_u32(LTools->m_LastFileName.c_str(), CO->Name);
15021502
CO->m_RT_Flags.set(
15031503
CCustomObject::flRT_Visible | CCustomObject::flRT_Selected | CCustomObject::flRT_SelectedLast, FALSE);
1504-
CO->m_RT_Flags.or (fl);
1504+
CO->m_RT_Flags._or (fl);
15051505
}
15061506
}
15071507

‎src/xrCore/_flags.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,25 +70,25 @@ struct _flags
7070
bool is_any(const T mask) const throw() { return !!(flags & mask); }
7171
bool test(const T mask) const throw() { return !!(flags & mask); }
7272

73-
SelfRef or (const T mask) throw()
73+
SelfRef _or(const T mask) throw()
7474
{
7575
flags |= mask;
7676
return *this;
7777
}
7878

79-
SelfRef or (const Self& f, const T mask) throw()
79+
SelfRef _or(const Self& f, const T mask) throw()
8080
{
8181
flags = f.flags | mask;
8282
return *this;
8383
}
8484

85-
SelfRef and (const T mask) throw()
85+
SelfRef _and(const T mask) throw()
8686
{
8787
flags &= mask;
8888
return *this;
8989
}
9090

91-
SelfRef and (const Self& f, const T mask) throw()
91+
SelfRef _and(const Self& f, const T mask) throw()
9292
{
9393
flags = f.flags & mask;
9494
return *this;

‎src/xrGame/PHSkeleton.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ void CPHSkeleton::UnsplitSingle(CPHSkeleton* SO)
331331
mask0.assign(pKinematics->LL_GetBonesVisible()); // first part mask
332332
VERIFY2(mask0.flags, "mask0 -Zero");
333333
mask0.invert();
334-
mask1.and (mask0.flags); // second part mask
334+
mask1._and (mask0.flags); // second part mask
335335

336336
newKinematics->LL_SetBoneRoot(split_bone);
337337
VERIFY2(mask1.flags, "mask1 -Zero");

‎src/xrGame/ai/monsters/control_manager_custom.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ void CControlManagerCustom::load_jump_data(
301301
{
302302
m_jump->setup_data().state_prepare_in_move.motion = skel_animated->ID_Cycle_Safe(s2);
303303
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);
305305
}
306306
else
307307
m_jump->setup_data().state_prepare_in_move.motion.invalidate();
@@ -317,16 +317,16 @@ void CControlManagerCustom::load_jump_data(
317317
else
318318
{
319319
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);
321321
}
322322

323323
if (!s1 && !s2)
324324
{
325-
m_jump->setup_data().flags.or (SControlJumpData::ePrepareSkip);
325+
m_jump->setup_data().flags._or (SControlJumpData::ePrepareSkip);
326326
}
327327

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);
330330

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

376376
ctrl_data->target_object = 0;
377377
ctrl_data->target_position = position;
378-
ctrl_data->flags.or (SControlJumpData::ePrepareSkip);
378+
ctrl_data->flags._or (SControlJumpData::ePrepareSkip);
379379
ctrl_data->force_factor = -1.f;
380380

381381
m_man->activate(ControlCom::eControlJump);

‎src/xrGame/ai/monsters/monster_enemy_manager.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ void CMonsterEnemyManager::update()
9999
flags.zero();
100100

101101
if ((prev_enemy == enemy) && (time_last_seen != Device.dwTimeGlobal))
102-
flags.or (FLAG_ENEMY_LOST_SIGHT);
102+
flags._or (FLAG_ENEMY_LOST_SIGHT);
103103
if (prev_enemy && !prev_enemy->g_Alive())
104-
flags.or (FLAG_ENEMY_DIE);
104+
flags._or (FLAG_ENEMY_DIE);
105105
if (!enemy_see_me)
106-
flags.or (FLAG_ENEMY_DOESNT_SEE_ME);
106+
flags._or (FLAG_ENEMY_DOESNT_SEE_ME);
107107

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

114114
if (_abs(dist_now - dist_prev) < 0.2f)
115-
flags.or (FLAG_ENEMY_STANDING);
115+
flags._or (FLAG_ENEMY_STANDING);
116116
else
117117
{
118118
if (dist_now < dist_prev)
119-
flags.or (FLAG_ENEMY_GO_CLOSER);
119+
flags._or (FLAG_ENEMY_GO_CLOSER);
120120
else
121-
flags.or (FLAG_ENEMY_GO_FARTHER);
121+
flags._or (FLAG_ENEMY_GO_FARTHER);
122122

123123
if (_abs(dist_now - dist_prev) < 1.2f)
124124
{
125125
if (dist_now < dist_prev)
126-
flags.or (FLAG_ENEMY_GO_CLOSER_FAST);
126+
flags._or (FLAG_ENEMY_GO_CLOSER_FAST);
127127
else
128-
flags.or (FLAG_ENEMY_GO_FARTHER_FAST);
128+
flags._or (FLAG_ENEMY_GO_FARTHER_FAST);
129129
}
130130
}
131131

132132
if (flags.is(FLAG_ENEMY_STANDING) && flags.is(FLAG_ENEMY_DOESNT_SEE_ME))
133-
flags.or (FLAG_ENEMY_DOESNT_KNOW_ABOUT_ME);
133+
flags._or (FLAG_ENEMY_DOESNT_KNOW_ABOUT_ME);
134134
}
135135
else
136-
flags.or (FLAG_ENEMY_STATS_NOT_READY);
136+
flags._or (FLAG_ENEMY_STATS_NOT_READY);
137137

138138
// сохранить текущего врага
139139
prev_enemy = enemy;

‎src/xrGame/alife_dynamic_object.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ void CSE_ALifeInventoryBox::add_online(const bool& update_registries)
186186
CSE_ALifeDynamicObject* l_tpALifeDynamicObject = ai().alife().objects().object(*I);
187187
CSE_ALifeInventoryItem* l_tpALifeInventoryItem = smart_cast<CSE_ALifeInventoryItem*>(l_tpALifeDynamicObject);
188188
R_ASSERT2(l_tpALifeInventoryItem, "Non inventory item object has parent?!");
189-
l_tpALifeInventoryItem->base()->s_flags.or (M_SPAWN_UPDATE);
189+
l_tpALifeInventoryItem->base()->s_flags._or (M_SPAWN_UPDATE);
190190
CSE_Abstract* l_tpAbstract = smart_cast<CSE_Abstract*>(l_tpALifeInventoryItem);
191191
object->alife().server().entity_Destroy(l_tpAbstract);
192192

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

‎src/xrGame/alife_switch_manager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ void CALifeSwitchManager::add_online(CSE_ALifeDynamicObject* object, bool update
5555
NET_Packet tNetPacket;
5656
CSE_Abstract* l_tpAbstract = smart_cast<CSE_Abstract*>(object);
5757
server().entity_Destroy(l_tpAbstract);
58-
object->s_flags.or (M_SPAWN_UPDATE);
58+
object->s_flags._or (M_SPAWN_UPDATE);
5959
ClientID clientID;
6060
clientID.set(server().GetServerClient() ? server().GetServerClient()->ID.value() : 0);
6161
server().Process_spawn(tNetPacket, clientID, FALSE, l_tpAbstract);
62-
object->s_flags.and (u16(-1) ^ M_SPAWN_UPDATE);
62+
object->s_flags._and (u16(-1) ^ M_SPAWN_UPDATE);
6363

6464
// Xottab_DUTY: Workaround for crash with corpses that end up outside AI map
6565
//R_ASSERT3(!object->used_ai_locations() || ai().level_graph().valid_vertex_id(object->m_tNodeID),

‎src/xrGame/alife_trader_abstract.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ void add_online_impl(CSE_ALifeDynamicObject* object, const bool& update_registri
176176
continue;
177177

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

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

‎src/xrServerEntities/script_flags_script.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ SCRIPT_EXPORT(Flags8, (), {
6464
.def("invert", (Flags8 & (Flags8::*)(const Flags8::TYPE))(&Flags8::invert))
6565
.def("assign", (Flags8 & (Flags8::*)(const Flags8&))(&Flags8::assign))
6666
.def("assign", (Flags8 & (Flags8::*)(const Flags8::TYPE))(&Flags8::assign))
67-
.def("or", (Flags8 & (Flags8::*)(const Flags8::TYPE))(&Flags8:: or))
68-
.def("or", (Flags8 & (Flags8::*)(const Flags8&, const Flags8::TYPE))(&Flags8:: or))
69-
.def("and", (Flags8 & (Flags8::*)(const Flags8::TYPE))(&Flags8::and))
70-
.def("and", (Flags8 & (Flags8::*)(const Flags8&, const Flags8::TYPE))(&Flags8::and))
67+
.def("or", (Flags8 & (Flags8::*)(const Flags8::TYPE))(&Flags8:: _or))
68+
.def("or", (Flags8 & (Flags8::*)(const Flags8&, const Flags8::TYPE))(&Flags8:: _or))
69+
.def("and", (Flags8 & (Flags8::*)(const Flags8::TYPE))(&Flags8::_and))
70+
.def("and", (Flags8 & (Flags8::*)(const Flags8&, const Flags8::TYPE))(&Flags8::_and))
7171
.def("set", &::set<Flags8>)
7272
.def("is", &is<Flags8>)
7373
.def("is_any", &is_any<Flags8>)
@@ -87,10 +87,10 @@ SCRIPT_EXPORT(Flags16, (), {
8787
.def("invert", (Flags16 & (Flags16::*)(const Flags16::TYPE))(&Flags16::invert))
8888
.def("assign", (Flags16 & (Flags16::*)(const Flags16&))(&Flags16::assign))
8989
.def("assign", (Flags16 & (Flags16::*)(const Flags16::TYPE))(&Flags16::assign))
90-
.def("or", (Flags16 & (Flags16::*)(const Flags16::TYPE))(&Flags16:: or))
91-
.def("or", (Flags16 & (Flags16::*)(const Flags16&, const Flags16::TYPE))(&Flags16:: or))
92-
.def("and", (Flags16 & (Flags16::*)(const Flags16::TYPE))(&Flags16::and))
93-
.def("and", (Flags16 & (Flags16::*)(const Flags16&, const Flags16::TYPE))(&Flags16::and))
90+
.def("or", (Flags16 & (Flags16::*)(const Flags16::TYPE))(&Flags16:: _or))
91+
.def("or", (Flags16 & (Flags16::*)(const Flags16&, const Flags16::TYPE))(&Flags16:: _or))
92+
.def("and", (Flags16 & (Flags16::*)(const Flags16::TYPE))(&Flags16::_and))
93+
.def("and", (Flags16 & (Flags16::*)(const Flags16&, const Flags16::TYPE))(&Flags16::_and))
9494
.def("set", &::set<Flags16>)
9595
.def("is", &is<Flags16>)
9696
.def("is_any", &is_any<Flags16>)
@@ -110,10 +110,10 @@ SCRIPT_EXPORT(Flags32, (), {
110110
.def("invert", (Flags32 & (Flags32::*)(const Flags32::TYPE))(&Flags32::invert))
111111
.def("assign", (Flags32 & (Flags32::*)(const Flags32&))(&Flags32::assign))
112112
.def("assign", (Flags32 & (Flags32::*)(const Flags32::TYPE))(&Flags32::assign))
113-
.def("or", (Flags32 & (Flags32::*)(const Flags32::TYPE))(&Flags32:: or))
114-
.def("or", (Flags32 & (Flags32::*)(const Flags32&, const Flags32::TYPE))(&Flags32:: or))
115-
.def("and", (Flags32 & (Flags32::*)(const Flags32::TYPE))(&Flags32::and))
116-
.def("and", (Flags32 & (Flags32::*)(const Flags32&, const Flags32::TYPE))(&Flags32::and))
113+
.def("or", (Flags32 & (Flags32::*)(const Flags32::TYPE))(&Flags32:: _or))
114+
.def("or", (Flags32 & (Flags32::*)(const Flags32&, const Flags32::TYPE))(&Flags32:: _or))
115+
.def("and", (Flags32 & (Flags32::*)(const Flags32::TYPE))(&Flags32::_and))
116+
.def("and", (Flags32 & (Flags32::*)(const Flags32&, const Flags32::TYPE))(&Flags32::_and))
117117
.def("set", &::set<Flags32>)
118118
.def("is", &is<Flags32>)
119119
.def("is_any", &is_any<Flags32>)

0 commit comments

Comments
 (0)