Minor fixes

GermanAizek · Nov 30, 2022 · 7bd98b3 · 7bd98b3
1 parent 625d794
commit 7bd98b3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/src/Layers/xrRenderPC_GL/r2_R_sun.cpp b/src/Layers/xrRenderPC_GL/r2_R_sun.cpp
@@ -69,9 +69,7 @@ void XRMatrixOrthoOffCenterLH(Fmatrix* pout, float l, float r, float b, float t,
 void XRMatrixInverse(Fmatrix* pout, float* pdeterminant, const Fmatrix& pm)
 {
     glm::mat4 out = glm::inverse(glm::make_mat4x4(&pm.m[0][0]));
-
     *pout = *(Fmatrix*)glm::value_ptr(out);
-    return;
 }
 
 //////////////////////////////////////////////////////////////////////////

diff --git a/src/xrGame/movement_manager_level.cpp b/src/xrGame/movement_manager_level.cpp
@@ -42,12 +42,13 @@ void CMovementManager::process_level_path()
 
         if (!m_build_at_once)
             break;
+
+        [[fallthrough]]; // xxx: or break?
     }
     case ePathStateContinueLevelPath:
     {
         level_path().select_intermediate_vertex();
-
-        m_path_state = ePathStateBuildDetailPath;
+        [[fallthrough]];
     }
     case ePathStateBuildDetailPath:
     {
@@ -69,9 +70,7 @@ void CMovementManager::process_level_path()
     }
     case ePathStatePathVerification:
     {
-        if (!level_path().actual())
-            m_path_state = ePathStateBuildLevelPath;
-        else if (!detail().actual())
+        if (!level_path().actual() || !detail().actual())
             m_path_state = ePathStateBuildLevelPath;
         else
         {
@@ -86,9 +85,7 @@ void CMovementManager::process_level_path()
     }
     case ePathStatePathCompleted:
     {
-        if (!level_path().actual())
-            m_path_state = ePathStateBuildLevelPath;
-        else if (!detail().actual())
+        if (!level_path().actual() || !detail().actual())
             m_path_state = ePathStateBuildLevelPath;
         break;
     }

diff --git a/src/xrGame/movement_manager_patrol.cpp b/src/xrGame/movement_manager_patrol.cpp
@@ -42,7 +42,7 @@ void CMovementManager::process_patrol_path()
             break;
         }
 
-        m_path_state = ePathStateBuildLevelPath;
+        [[fallthrough]];
     }
     case ePathStateBuildLevelPath:
     {
@@ -62,8 +62,7 @@ void CMovementManager::process_patrol_path()
     case ePathStateContinueLevelPath:
     {
         level_path().select_intermediate_vertex();
-
-        m_path_state = ePathStateBuildDetailPath;
+        [[fallthrough]];
     }
     case ePathStateBuildDetailPath:
     {
@@ -91,9 +90,7 @@ void CMovementManager::process_patrol_path()
             //				Msg				("[%6d][%s] actuality is false 3",Device.dwFrame,*object().cName());
             m_path_state = ePathStateSelectPatrolPoint;
         }
-        else if (!level_path().actual())
-            m_path_state = ePathStateBuildLevelPath;
-        else if (!detail().actual())
+        else if (!level_path().actual() || !detail().actual())
             m_path_state = ePathStateBuildLevelPath;
         else if (detail().completed(object().Position(), !detail().state_patrol_path()))
         {