Merge remote-tracking branch 'upstream/main' into DisableAtomShim

Code/CryEngine/CrySystem/CmdLine.cpp

@@ -185,6 +185,7 @@ string CCmdLine::Next(char*& src)
             return string(org, src - 1);
 
         case ' ':
+            ch = *src++;
             continue;
         default:
             org = src - 1;

Code/CryEngine/CrySystem/Huffman.cpp

@@ -464,4 +464,4 @@ static void printModel(const HuffmanTreeNode* const pNodes, const HuffmanSymbolC
             printf("\n");
         }
     }
-}*/
+}*/

Code/CryEngine/CrySystem/IOSConsole.mm

@@ -91,4 +91,4 @@ void CIOSConsole::PutText( int x, int y, const char * msg )
 void CIOSConsole::EndDraw() {
     // Do Nothing
 }
-#endif // IOS
+#endif // IOS

Code/CryEngine/CrySystem/LZ4Decompressor.cpp

@@ -26,4 +26,4 @@ bool CLZ4Decompressor::DecompressData(const char* pIn, char* pOut, const uint ou
 void CLZ4Decompressor::Release()
 {
     delete this;
-}
+}

Code/CryEngine/CrySystem/MiniGUI/MiniButton.cpp

@@ -313,4 +313,4 @@ bool CMiniButton::SetConnectedCtrl(IMiniCtrl* pConnectedCtrl)
     return true;
 }
 
-MINIGUI_END
+MINIGUI_END

Code/CryEngine/CrySystem/MiniGUI/MiniInfoBox.cpp

@@ -171,4 +171,4 @@ void CMiniInfoBox::AutoResize()
     m_requiresResize = false;
 }
 
-MINIGUI_END
+MINIGUI_END

Code/CryEngine/CrySystem/MiniGUI/MiniMenu.cpp

@@ -361,4 +361,4 @@ void CMiniMenu::AddSubCtrl(IMiniCtrl* pCtrl)
     // Call parent
     CMiniButton::AddSubCtrl(pCtrl);
 }
-MINIGUI_END
+MINIGUI_END

Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole_impl.inl

@@ -182,4 +182,4 @@ void CRemoteConsole::RegisterListener(IRemoteConsoleListener* pListener, const c
 void CRemoteConsole::UnregisterListener(IRemoteConsoleListener* pListener)
 {
     m_listener.Remove(pListener);
-}
+}

Code/CryEngine/CrySystem/Sampler.cpp

@@ -284,4 +284,4 @@ void CSampler::LogSampledData()
 }
 
 
-#endif // defined(WIN32)
+#endif // defined(WIN32)

Code/CryEngine/CrySystem/SystemInit.cpp

@@ -4094,6 +4094,7 @@ void CSystem::CreateSystemVars()
         "0 = Suppress Asserts\n"
         "1 = Log Asserts\n"
         "2 = Show Assert Dialog\n"
+        "3 = Crashes the Application on Assert\n"
         "Note: when set to '0 = Suppress Asserts', assert expressions are still evaluated. To turn asserts into a no-op, undefine AZ_ENABLE_TRACING and recompile.",
         OnAssertLevelCvarChanged);
     CSystem::SetAssertLevel(defaultAssertValue);

Code/CryEngine/CrySystem/ViewSystem/DebugCamera.cpp

@@ -356,4 +356,4 @@ void DebugCamera::MovePosition(const Vec3& offset)
     m_position += m_view.GetColumn2() * offset.z;
 }
 
-} // namespace LegacyViewSystem
+} // namespace LegacyViewSystem

Code/CryEngine/CrySystem/ViewSystem/DebugCamera.h

@@ -80,4 +80,4 @@ inline bool DebugCamera::IsFree()
     return m_cameraMode == DebugCamera::ModeFree;
 }
 
-} // namespace LegacyViewSystem
+} // namespace LegacyViewSystem