Added missing light sources for DX11 (campfires, anomalies, etc). Thn…

…x to SkyLoader
OpenXRay · Mar 7, 2017 · 8c9220e · Xottab-DUTY · Mar 9, 2017 · CrossVR
1 parent 707e636
commit 8c9220e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/xrGame/CustomZone.cpp b/src/xrGame/CustomZone.cpp
@@ -311,7 +311,7 @@ BOOL CCustomZone::net_Spawn(CSE_Abstract* DC)
     m_zone_flags.set(eUseOnOffTime, (m_TimeToDisable != 0) && (m_TimeToEnable != 0));
 
     //äîáàâèòü èñòî÷íèêè ñâåòà
-    bool br1 = (0 == psDeviceFlags.test(rsR2 | rsR3));
+    bool br1 = (0 == psDeviceFlags.test(rsR2 | rsR3 | rsR4));
 
     bool render_ver_allowed = !br1 || (br1 && m_zone_flags.test(eIdleLightR1));
 

diff --git a/src/xrGame/Torch.cpp b/src/xrGame/Torch.cpp
@@ -212,6 +212,7 @@ BOOL CTorch::net_Spawn(CSE_Abstract* DC)
 
     bool b_r2 = !!psDeviceFlags.test(rsR2);
     b_r2 |= !!psDeviceFlags.test(rsR3);
+    b_r2 |= !!psDeviceFlags.test(rsR4);
 
     IKinematics* K = smart_cast<IKinematics*>(Visual());
     CInifile* pUserData = K->LL_UserData();

diff --git a/src/xrGame/ZoneCampfire.cpp b/src/xrGame/ZoneCampfire.cpp
@@ -65,7 +65,7 @@ void CZoneCampfire::GoDisabledState()
 #define OVL_TIME 3000
 void CZoneCampfire::turn_on_script()
 {
-    if (psDeviceFlags.test(rsR2 | rsR3))
+    if (psDeviceFlags.test(rsR2 | rsR3 | rsR4))
     {
         m_turn_time = Device.dwTimeGlobal + OVL_TIME;
         m_turned_on = true;
@@ -75,7 +75,7 @@ void CZoneCampfire::turn_on_script()
 
 void CZoneCampfire::turn_off_script()
 {
-    if (psDeviceFlags.test(rsR2 | rsR3))
+    if (psDeviceFlags.test(rsR2 | rsR3 | rsR4))
     {
         m_turn_time = Device.dwTimeGlobal + OVL_TIME;
         m_turned_on = false;