Fix camera glitch when reloading or strafing

OpenXRay · Aug 14, 2017 · 3ba633f · 3ba633f
1 parent 2a91825
commit 3ba633f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/xrEngine/CameraManager.cpp b/src/xrEngine/CameraManager.cpp
@@ -86,7 +86,7 @@ void CCameraManager::UpdateDeffered()
         RemoveCamEffector((*it)->eType);
 
         if ((*it)->AbsolutePositioning())
-            m_EffectorsCam.push_front(*it);
+            m_EffectorsCam.insert(m_EffectorsCam.begin(), *it);
         else
             m_EffectorsCam.push_back(*it);
     }
@@ -247,9 +247,8 @@ void CCameraManager::UpdateCamEffectors()
 {
     if (m_EffectorsCam.empty())
         return;
-    EffectorCamVec::reverse_iterator rit = m_EffectorsCam.rbegin();
-    for (; rit != m_EffectorsCam.rend(); ++rit)
-        ProcessCameraEffector(*rit);
+    for (int i = m_EffectorsCam.size() - 1; i >= 0; --i)
+		ProcessCameraEffector(m_EffectorsCam[i]);
 
     m_cam_info.d.normalize();
     m_cam_info.n.normalize();

diff --git a/src/xrEngine/CameraManager.h b/src/xrEngine/CameraManager.h
@@ -3,7 +3,7 @@
 #include "CameraDefs.h"
 #include "xrCore/PostProcess/PPInfo.hpp"
 
-using EffectorCamVec = xr_list<CEffectorCam*>;
+using EffectorCamVec = xr_vector<CEffectorCam*>;
 using EffectorPPVec = xr_vector<CEffectorPP*>;
 
 #define effCustomEffectorStartID 10000