Skip to content

Commit 71c3a08

Browse files
committed
xrGame: fix some warnings for cotire build
1 parent d5da513 commit 71c3a08

27 files changed

+48
-46
lines changed

src/xrAICore/Navigation/ai_object_location.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace LevelGraph
1414
{
1515
class CVertex;
16-
};
16+
}
1717

1818
class CAI_ObjectLocation
1919
{

src/xrEngine/Rain.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "stdafx.h"
2-
#pragma once
32

43
#include "Rain.h"
54
#include "IGame_Persistent.h"

src/xrGame/CharacterPhysicsSupport.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1362,10 +1362,10 @@ void CCharacterPhysicsSupport::on_destroy_anim_mov_ctrl()
13621362
anim_mov_state.active = false;
13631363
}
13641364

1365-
bool CCharacterPhysicsSupport::interactive_motion() { return is_imotion(m_interactive_motion); }
1365+
bool CCharacterPhysicsSupport::is_interactive_motion() { return is_imotion(m_interactive_motion); }
13661366
bool CCharacterPhysicsSupport::can_drop_active_weapon()
13671367
{
1368-
return !interactive_motion() && m_flags.test(fl_death_anim_on);
1368+
return !is_interactive_motion() && m_flags.test(fl_death_anim_on);
13691369
};
13701370

13711371
void CCharacterPhysicsSupport::in_Die()

src/xrGame/CharacterPhysicsSupport.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class CCharacterPhysicsSupport : public CPHSkeleton, public CPHDestroyable
104104
IC const CPHMovementControl* movement() const { return m_PhysicMovementControl; }
105105
IC CPHSoundPlayer* ph_sound_player() { return &m_ph_sound_player; }
106106
IC CIKLimbsController* ik_controller() { return m_ik_controller; }
107-
bool interactive_motion();
107+
bool is_interactive_motion();
108108
bool can_drop_active_weapon();
109109
void SetRemoved();
110110
bool IsRemoved() { return m_eState == esRemoved; }

src/xrGame/ai/stalker/ai_stalker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,7 @@ void CAI_Stalker::aim_target(Fvector& result, const CGameObject* object)
13751375
BOOL CAI_Stalker::AlwaysTheCrow()
13761376
{
13771377
VERIFY(character_physics_support());
1378-
return (character_physics_support()->interactive_motion());
1378+
return (character_physics_support()->is_interactive_motion());
13791379
}
13801380

13811381
smart_cover::cover const* CAI_Stalker::get_current_smart_cover()

src/xrGame/ai_space.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class CAI_Space : public AISpaceBase
5959
IC const CALifeSimulator& alife() const;
6060
IC const CALifeSimulator* get_alife() const;
6161
IC const CCoverManager& cover_manager() const;
62-
IC moving_objects& moving_objects() const;
62+
IC moving_objects& get_moving_objects() const;
6363
IC doors::manager& doors() const;
6464
};
6565

src/xrGame/ai_space_inline.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ IC const CCoverManager& CAI_Space::cover_manager() const
2727
return (*m_cover_manager);
2828
}
2929

30-
IC moving_objects& CAI_Space::moving_objects() const
30+
IC moving_objects& CAI_Space::get_moving_objects() const
3131
{
3232
VERIFY(m_moving_objects);
3333
return (*m_moving_objects);

src/xrGame/cover_manager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,12 @@ class id_predicate_less
201201
{
202202
VERIFY(lhs);
203203
VERIFY(rhs);
204-
return (lhs->object().cName()._get() < rhs->object().cName()._get());
204+
return (lhs->get_object().cName()._get() < rhs->get_object().cName()._get());
205205
}
206206
IC bool operator()(Cover* cover, shared_str const& id)
207207
{
208208
VERIFY(cover);
209-
return (cover->object().cName()._get() < id._get());
209+
return (cover->get_object().cName()._get() < id._get());
210210
}
211211
};
212212

src/xrGame/dynamic_obstacles_avoider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
void dynamic_obstacles_avoider::query()
1818
{
19-
ai().moving_objects().query_action_dynamic(object().get_moving_object());
19+
ai().get_moving_objects().query_action_dynamic(object().get_moving_object());
2020

2121
m_current_iteration.swap(object().get_moving_object()->dynamic_query());
2222
}

src/xrGame/game_location_selector.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class CBaseLocationSelector<CGameGraph, _VertexEvaluator, _vertex_id_type>
4141
IC void init();
4242
IC virtual void reinit(const _Graph* graph = 0);
4343
IC void set_selection_type(const ESelectionType selection_type);
44-
IC void selection_type() const;
44+
IC ESelectionType selection_type() const;
4545
IC bool actual(const _vertex_id_type start_vertex_id, bool path_completed);
4646
IC void select_location(const _vertex_id_type start_vertex_id, _vertex_id_type& dest_vertex_id);
4747
};

0 commit comments

Comments
 (0)