Skip to content

Commit bcb242b

Browse files
committed
Fix compilation issues on VS 15.5 Preview
Several previous commits have been dropped
1 parent 674bacf commit bcb242b

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

src/xrGame/alife_monster_movement_manager_script.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
////////////////////////////////////////////////////////////////////////////
88

99
#include "pch_script.h"
10+
#include "movement_manager_space.h"
1011
#include "alife_monster_movement_manager.h"
1112
#include "alife_monster_detail_path_manager.h"
1213
#include "alife_monster_patrol_path_manager.h"

src/xrGame/script_game_object_script3.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "alife_space.h"
1212
#include "script_entity_space.h"
1313
#include "movement_manager_space.h"
14+
#include "sight_manager_space.h"
1415
#include "pda_space.h"
1516
#include "memory_space.h"
1617
#include "cover_point.h"

src/xrGame/space_restriction.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "xrAICore/Navigation/level_graph.h"
1414
#include "space_restriction_base.h"
1515
#include "xrEngine/profiler.h"
16+
#include "xrCore/xrDebug_macros.h"
1617

1718
const float dependent_distance = 100.f;
1819

@@ -281,7 +282,11 @@ void CSpaceRestriction::remove_border()
281282
u32 CSpaceRestriction::accessible_nearest(const Fvector& position, Fvector& result)
282283
{
283284
if (m_out_space_restriction)
284-
return (m_out_space_restriction->accessible_nearest(this, position, result, true));
285+
{
286+
#pragma TODO("Xottab_DUTY: investigate temporary fix!")
287+
CSpaceRestriction* mutable_this = const_cast<CSpaceRestriction*> (this); // Xottab_DUTY: temporary fix to allow compilation. Thanks to Giperion
288+
return (m_out_space_restriction->accessible_nearest(mutable_this, position, result, true));
289+
}
285290

286291
VERIFY(m_in_space_restriction);
287292
return (m_in_space_restriction->accessible_nearest(m_in_space_restriction, position, result, false));

0 commit comments

Comments
 (0)