адаптировано под обновление студии 15.5.

abramcumner · Dec 9, 2017 · 2bfd2ed · 2bfd2ed
1 parent 0ae0500
commit 2bfd2ed
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/xray/Layers/xrRenderPC_R2/r2_rendertarget.cpp b/xray/Layers/xrRenderPC_R2/r2_rendertarget.cpp
@@ -177,14 +177,14 @@ void	generate_jitter	(DWORD*	dest, u32 elem_count)
 		*dest	= color_rgba(samples[2*it].x,samples[2*it].y,samples[2*it+1].y,samples[2*it+1].x);
 }
 
-#if _MSC_FULL_VER >= 191100000 && _MSC_FULL_VER <= 191125547
+#if _MSC_FULL_VER >= 191100000 && _MSC_FULL_VER <= 191225830
 // èç-çà ñòðîêè: fs = powf(ls*1.01f, 128.f); âîçíèêàåò ICE
 // fatal error C1001 : An internal error has occurred in the compiler.
 // (compiler file 'f:\dd\vctools\compiler\utc\src\p2\main.c', line 256)
-// 15.4.3 - îøèáêà òàê è íå èñïðàâëåíà
+// 15.5.1 - îøèáêà òàê è íå èñïðàâëåíà
 // äëÿ èñïðàâëåíèÿ îòêëþ÷àþ îïòèìèçàöèþ
 #define POW_128_BUG
-#elif _MSC_VER == 1911
+#elif _MSC_VER == 1911 || _MSC_VER == 1912
 #define stringize(s) _stringize(s)
 #define _stringize(s) #s
 #pragma message("_MSC_FULL_VER=" stringize(_MSC_FULL_VER))

diff --git a/xray/Layers/xrRenderPC_R3/r3_rendertarget.cpp b/xray/Layers/xrRenderPC_R3/r3_rendertarget.cpp
@@ -261,14 +261,14 @@ void	generate_jitter	(DWORD*	dest, u32 elem_count)
 		*dest	= color_rgba(samples[2*it].x,samples[2*it].y,samples[2*it+1].y,samples[2*it+1].x);
 }
 
-#if _MSC_FULL_VER >= 191100000 && _MSC_FULL_VER <= 191125547
+#if _MSC_FULL_VER >= 191100000 && _MSC_FULL_VER <= 191225830
 // èç-çà ñòðîêè: fs = powf(ls*1.01f, 128.f); âîçíèêàåò ICE
 // fatal error C1001 : An internal error has occurred in the compiler.
 // (compiler file 'f:\dd\vctools\compiler\utc\src\p2\main.c', line 256)
-// 15.4.3 - îøèáêà òàê è íå èñïðàâëåíà
+// 15.5.1 - îøèáêà òàê è íå èñïðàâëåíà
 // äëÿ èñïðàâëåíèÿ îòêëþ÷àþ îïòèìèçàöèþ
 #define POW_128_BUG
-#elif _MSC_VER == 1911
+#elif _MSC_VER == 1911 || _MSC_VER == 1912
 #define stringize(s) _stringize(s)
 #define _stringize(s) #s
 #pragma message("_MSC_FULL_VER=" stringize(_MSC_FULL_VER))

diff --git a/xray/Layers/xrRenderPC_R4/r4_rendertarget.cpp b/xray/Layers/xrRenderPC_R4/r4_rendertarget.cpp
@@ -262,14 +262,14 @@ void	generate_jitter	(DWORD*	dest, u32 elem_count)
 		*dest	= color_rgba(samples[2*it].x,samples[2*it].y,samples[2*it+1].y,samples[2*it+1].x);
 }
 
-#if _MSC_FULL_VER >= 191100000 && _MSC_FULL_VER <= 191125547
+#if _MSC_FULL_VER >= 191100000 && _MSC_FULL_VER <= 191225830
 // èç-çà ñòðîêè: fs = powf(ls*1.01f, 128.f); âîçíèêàåò ICE
 // fatal error C1001 : An internal error has occurred in the compiler.
 // (compiler file 'f:\dd\vctools\compiler\utc\src\p2\main.c', line 256)
-// 15.4.3 - îøèáêà òàê è íå èñïðàâëåíà
+// 15.5.1 - îøèáêà òàê è íå èñïðàâëåíà
 // äëÿ èñïðàâëåíèÿ îòêëþ÷àþ îïòèìèçàöèþ
 #define POW_128_BUG
-#elif _MSC_VER == 1911
+#elif _MSC_VER == 1911 || _MSC_VER == 1912
 #define stringize(s) _stringize(s)
 #define _stringize(s) #s
 #pragma message("_MSC_FULL_VER=" stringize(_MSC_FULL_VER))

diff --git a/xray/xrGame/alife_monster_movement_manager_script.cpp b/xray/xrGame/alife_monster_movement_manager_script.cpp
@@ -10,6 +10,7 @@
 #include "alife_monster_movement_manager.h"
 #include "alife_monster_detail_path_manager.h"
 #include "alife_monster_patrol_path_manager.h"
+#include "movement_manager_space.h"
 
 using namespace luabind;
 

diff --git a/xray/xrGame/alife_monster_patrol_path_manager_script.cpp b/xray/xrGame/alife_monster_patrol_path_manager_script.cpp
@@ -8,6 +8,7 @@
 
 #include "pch_script.h"
 #include "alife_monster_patrol_path_manager.h"
+#include "patrol_path_manager_space.h"
 
 using namespace luabind;
 

diff --git a/xray/xrGame/script_game_object_script2.cpp b/xray/xrGame/script_game_object_script2.cpp
@@ -27,6 +27,8 @@
 #include "relation_registry.h"
 #include "danger_object.h"
 #include "smart_cover_object.h"
+#include "detail_path_manager_space.h"
+#include "patrol_path_manager_space.h"
 
 using namespace luabind;
 

diff --git a/xray/xrGame/script_game_object_script3.cpp b/xray/xrGame/script_game_object_script3.cpp
@@ -32,6 +32,7 @@
 #include "ZoneCampfire.h"
 #include "physicobject.h"
 #include "artefact.h"
+#include "sight_manager_space.h"
 
 using namespace luabind;