Skip to content

Commit

Permalink
Fix compilation issues on VS 15.5 Preview
Browse files Browse the repository at this point in the history
Several previous commits have been dropped
  • Loading branch information
Xottab-DUTY committed Oct 21, 2017
1 parent 674bacf commit bcb242b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/xrGame/alife_monster_movement_manager_script.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
////////////////////////////////////////////////////////////////////////////

#include "pch_script.h"
#include "movement_manager_space.h"
#include "alife_monster_movement_manager.h"
#include "alife_monster_detail_path_manager.h"
#include "alife_monster_patrol_path_manager.h"
Expand Down
1 change: 1 addition & 0 deletions src/xrGame/script_game_object_script3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "alife_space.h"
#include "script_entity_space.h"
#include "movement_manager_space.h"
#include "sight_manager_space.h"
#include "pda_space.h"
#include "memory_space.h"
#include "cover_point.h"
Expand Down
7 changes: 6 additions & 1 deletion src/xrGame/space_restriction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "xrAICore/Navigation/level_graph.h"
#include "space_restriction_base.h"
#include "xrEngine/profiler.h"
#include "xrCore/xrDebug_macros.h"

const float dependent_distance = 100.f;

Expand Down Expand Up @@ -281,7 +282,11 @@ void CSpaceRestriction::remove_border()
u32 CSpaceRestriction::accessible_nearest(const Fvector& position, Fvector& result)
{
if (m_out_space_restriction)
return (m_out_space_restriction->accessible_nearest(this, position, result, true));
{
#pragma TODO("Xottab_DUTY: investigate temporary fix!")
CSpaceRestriction* mutable_this = const_cast<CSpaceRestriction*> (this); // Xottab_DUTY: temporary fix to allow compilation. Thanks to Giperion
return (m_out_space_restriction->accessible_nearest(mutable_this, position, result, true));
}

VERIFY(m_in_space_restriction);
return (m_in_space_restriction->accessible_nearest(m_in_space_restriction, position, result, false));
Expand Down

0 comments on commit bcb242b

Please sign in to comment.