Merge branch 'master' into vendor/curl-7.84.0

Author: patrikjuvonen

Client/core/CCore.cpp

@@ -573,8 +573,8 @@ void CCore::ApplyGameSettings()
     CVARS_GET("tyre_smoke_enabled", bVal);
     m_pMultiplayer->SetTyreSmokeEnabled(bVal);
     pGameSettings->UpdateFieldOfViewFromSettings();
-    pGameSettings->ResetVehiclesLODDistance(false);
-    pGameSettings->ResetPedsLODDistance(false);
+    pGameSettings->ResetVehiclesLODDistance();
+    pGameSettings->ResetPedsLODDistance();
     pGameSettings->ResetCoronaReflectionsEnabled();
     pController->SetVerticalAimSensitivityRawValue(CVARS_GET_VALUE<float>("vertical_aim_sensitivity"));
     CVARS_GET("mastervolume", fVal);

Client/core/Graphics/CVideoModeManager.cpp

@@ -57,7 +57,6 @@ class CVideoModeManager : public CVideoModeManagerInterface
     unsigned long  m_ulForceBackBufferWidth;
     unsigned long  m_ulForceBackBufferHeight;
     unsigned long  m_ulForceBackBufferColorDepth;
-    unsigned long  m_ulFullScreenRefreshRate;
     HWND           m_hDeviceWindow;
     CGameSettings* m_pGameSettings;
     unsigned long  m_ulMonitorCount;
@@ -134,8 +133,8 @@ void CVideoModeManager::PreCreateDevice(D3DPRESENT_PARAMETERS* pp)
     m_bNextWindowed = m_bCurrentWindowed;
     m_iNextFullscreenStyle = m_iCurrentFullscreenStyle;
 
-    // Remember this for later
-    m_ulFullScreenRefreshRate = pp->FullScreen_RefreshRateInHz;
+    // Set refresh rate to default (automatic)
+    pp->FullScreen_RefreshRateInHz = D3DPRESENT_RATE_DEFAULT;
 
     if (IsDisplayModeWindowed())
     {
@@ -146,7 +145,6 @@ void CVideoModeManager::PreCreateDevice(D3DPRESENT_PARAMETERS* pp)
         SetWindowLong(m_hDeviceWindow, GWL_STYLE, WS_POPUP);
         MoveWindow(m_hDeviceWindow, iPosX, iPosY, pp->BackBufferWidth, pp->BackBufferHeight, TRUE);
         pp->Windowed = true;
-        pp->FullScreen_RefreshRateInHz = D3DPRESENT_RATE_DEFAULT;
     }
     else if (IsDisplayModeFullScreenWindow())
     {
@@ -155,7 +153,6 @@ void CVideoModeManager::PreCreateDevice(D3DPRESENT_PARAMETERS* pp)
         SetWindowLong(m_hDeviceWindow, GWL_STYLE, WS_POPUP);
         MoveWindow(m_hDeviceWindow, rc.left, rc.top, pp->BackBufferWidth, pp->BackBufferHeight, TRUE);
         pp->Windowed = true;
-        pp->FullScreen_RefreshRateInHz = D3DPRESENT_RATE_DEFAULT;
     }
 
     if (pp->SwapEffect == D3DSWAPEFFECT_FLIP && IsDisplayModeWindowed())
@@ -200,7 +197,7 @@ void CVideoModeManager::PreReset(D3DPRESENT_PARAMETERS* pp)
 
     pp->BackBufferWidth = m_ulForceBackBufferWidth;
     pp->BackBufferHeight = m_ulForceBackBufferHeight;
-    pp->FullScreen_RefreshRateInHz = pp->Windowed ? D3DPRESENT_RATE_DEFAULT : m_ulFullScreenRefreshRate;
+    pp->FullScreen_RefreshRateInHz = D3DPRESENT_RATE_DEFAULT;
 }
 
 ///////////////////////////////////////////////////////////////
@@ -270,7 +267,7 @@ void CVideoModeManager::OnGainFocus()
             dmScreenSettings.dmPelsHeight = m_ulForceBackBufferHeight;
             dmScreenSettings.dmBitsPerPel = m_ulForceBackBufferColorDepth;
             dmScreenSettings.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY;
-            dmScreenSettings.dmDisplayFrequency = m_ulFullScreenRefreshRate;
+            dmScreenSettings.dmDisplayFrequency = D3DPRESENT_RATE_DEFAULT;
 
             if (ChangeDisplaySettingsEx(GetCurrentAdapterDeviceName(), &dmScreenSettings, NULL, CDS_FULLSCREEN, NULL) != DISP_CHANGE_SUCCESSFUL)
                 return;

Client/game_sa/CSettingsSA.cpp

@@ -563,74 +563,35 @@ void CSettingsSA::SetFieldOfViewVehicleMax(float fAngle, bool bFromScript)
 // Vehicles LOD draw distance
 //
 ////////////////////////////////////////////////
-float ms_fClientMaxVehicleLODDistance = DEFAULT_VEHICLE_LOD_DISTANCE;
-float ms_fClientMaxTrainPlaneLODDistance = DEFAULT_VEHICLE_LOD_DISTANCE * TRAIN_LOD_DISTANCE_MULTIPLIER;
-float ms_fScriptMaxVehicleLODDistance = ms_fClientMaxVehicleLODDistance;
-float ms_fScriptMaxTrainPlaneLODDistance = ms_fClientMaxTrainPlaneLODDistance;
 bool  ms_bMaxVehicleLODDistanceFromScript = false;
 
 void CSettingsSA::SetVehiclesLODDistance(float fVehiclesLODDistance, float fTrainsPlanesLODDistance, bool bFromScript)
 {
-    if (bFromScript)
-    {
-        ms_fScriptMaxVehicleLODDistance = fVehiclesLODDistance;
-        ms_fScriptMaxTrainPlaneLODDistance = fTrainsPlanesLODDistance;
-        ms_bMaxVehicleLODDistanceFromScript = bFromScript;
-    }
-    else
-    {
-        ms_fClientMaxVehicleLODDistance = fVehiclesLODDistance;
-        ms_fClientMaxTrainPlaneLODDistance = fTrainsPlanesLODDistance;
-    }
-
-    if (ms_bMaxVehicleLODDistanceFromScript)
-    {
-        ms_fVehicleLODDistance = Min(ms_fClientMaxVehicleLODDistance, ms_fScriptMaxVehicleLODDistance);
-        ms_fTrainPlaneLODDistance = Min(ms_fClientMaxTrainPlaneLODDistance, ms_fScriptMaxTrainPlaneLODDistance);
-    }
-    else
-    {
-        ms_fVehicleLODDistance = Min(fVehiclesLODDistance, ms_fClientMaxVehicleLODDistance);
-        ms_fTrainPlaneLODDistance = Min(fTrainsPlanesLODDistance, ms_fClientMaxTrainPlaneLODDistance);
-    }
+    ms_fVehicleLODDistance = fVehiclesLODDistance;
+    ms_fTrainPlaneLODDistance = fTrainsPlanesLODDistance;
+    ms_bMaxVehicleLODDistanceFromScript = bFromScript;
 }
 
-void CSettingsSA::ResetVehiclesLODDistance(bool bFromScript)
+void CSettingsSA::ResetVehiclesLODDistance(bool bForceDefault)
 {
-    if (!bFromScript)
-    {
-        bool bHighDetailVehicles;
-        g_pCore->GetCVars()->Get("high_detail_vehicles", bHighDetailVehicles);
+    if (ms_bMaxVehicleLODDistanceFromScript && !bForceDefault)
+        return;
 
-        if (bHighDetailVehicles)
-        {
-            ms_fClientMaxVehicleLODDistance = MAX_VEHICLE_LOD_DISTANCE;
-            ms_fClientMaxTrainPlaneLODDistance = MAX_VEHICLE_LOD_DISTANCE;
-        }
-        else
-        {
-            ms_fClientMaxVehicleLODDistance = DEFAULT_VEHICLE_LOD_DISTANCE;
-            ms_fClientMaxTrainPlaneLODDistance = DEFAULT_VEHICLE_LOD_DISTANCE * TRAIN_LOD_DISTANCE_MULTIPLIER;
-        }
+    bool bHighDetailVehicles;
+    g_pCore->GetCVars()->Get("high_detail_vehicles", bHighDetailVehicles);
 
-        // Script still wants to override client setting, let's make sure we use latest max
-        if (ms_bMaxVehicleLODDistanceFromScript)
-        {
-            ms_fVehicleLODDistance = Min(ms_fClientMaxVehicleLODDistance, ms_fScriptMaxVehicleLODDistance);
-            ms_fTrainPlaneLODDistance = Min(ms_fClientMaxTrainPlaneLODDistance, ms_fScriptMaxTrainPlaneLODDistance);
-            return;
-        }
+    if (bHighDetailVehicles)
+    {
+        ms_fVehicleLODDistance = MAX_VEHICLE_LOD_DISTANCE;
+        ms_fTrainPlaneLODDistance = MAX_VEHICLE_LOD_DISTANCE;
+    }
+    else
+    {
+        ms_fVehicleLODDistance = DEFAULT_VEHICLE_LOD_DISTANCE;
+        ms_fTrainPlaneLODDistance = DEFAULT_VEHICLE_LOD_DISTANCE * TRAIN_LOD_DISTANCE_MULTIPLIER;
     }
 
     ms_bMaxVehicleLODDistanceFromScript = false;
-    ms_fVehicleLODDistance = ms_fClientMaxVehicleLODDistance;
-    ms_fTrainPlaneLODDistance = ms_fClientMaxTrainPlaneLODDistance;
-}
-
-void CSettingsSA::ResetVehiclesLODDistanceFromScript()
-{
-    ms_bMaxVehicleLODDistanceFromScript = false;
-    ResetVehiclesLODDistance(false);
 }
 
 void CSettingsSA::GetVehiclesLODDistance(float& fVehiclesLODDistance, float& fTrainsPlanesLODDistance)
@@ -644,54 +605,28 @@ void CSettingsSA::GetVehiclesLODDistance(float& fVehiclesLODDistance, float& fTr
 // Peds LOD draw distance
 //
 ////////////////////////////////////////////////
-float ms_fClientMaxPedsLODDistance = DEFAULT_PEDS_LOD_DISTANCE;
-float ms_fScriptMaxPedsLODDistance = ms_fClientMaxPedsLODDistance;
 bool  ms_bMaxPedsLODDistanceFromScript = false;
 
 void CSettingsSA::SetPedsLODDistance(float fPedsLODDistance, bool bFromScript)
 {
-    if (bFromScript)
-    {
-        ms_fScriptMaxPedsLODDistance = fPedsLODDistance;
-        ms_bMaxPedsLODDistanceFromScript = bFromScript;
-    }
-    else
-        ms_fClientMaxPedsLODDistance = fPedsLODDistance;
-
-    if (ms_bMaxPedsLODDistanceFromScript)
-        ms_fPedsLODDistance = Min(ms_fClientMaxPedsLODDistance, ms_fScriptMaxPedsLODDistance);
-    else
-        ms_fPedsLODDistance = Min(fPedsLODDistance, ms_fClientMaxPedsLODDistance);
+    ms_fPedsLODDistance = fPedsLODDistance;
+    ms_bMaxPedsLODDistanceFromScript = bFromScript;
 }
 
-void CSettingsSA::ResetPedsLODDistance(bool bFromScript)
+void CSettingsSA::ResetPedsLODDistance(bool bForceDefault)
 {
-    if (!bFromScript)
-    {
-        bool bHighDetailPeds;
-        g_pCore->GetCVars()->Get("high_detail_peds", bHighDetailPeds);
-
-        if (bHighDetailPeds)
-            ms_fClientMaxPedsLODDistance = MAX_PEDS_LOD_DISTANCE;
-        else
-            ms_fClientMaxPedsLODDistance = DEFAULT_PEDS_LOD_DISTANCE;
+    if (ms_bMaxPedsLODDistanceFromScript && !bForceDefault)
+        return;
 
-        // Script still wants to override client setting, let's make sure we use latest max
-        if (ms_bMaxPedsLODDistanceFromScript)
-        {
-            ms_fPedsLODDistance = Min(ms_fClientMaxPedsLODDistance, ms_fScriptMaxPedsLODDistance);
-            return;
-        }
-    }
+    bool bHighDetailPeds;
+    g_pCore->GetCVars()->Get("high_detail_peds", bHighDetailPeds);
 
-    ms_bMaxPedsLODDistanceFromScript = false;
-    ms_fPedsLODDistance = ms_fClientMaxPedsLODDistance;
-}
+    if (bHighDetailPeds)
+        ms_fPedsLODDistance = MAX_PEDS_LOD_DISTANCE;
+    else
+        ms_fPedsLODDistance = DEFAULT_PEDS_LOD_DISTANCE;
 
-void CSettingsSA::ResetPedsLODDistanceFromScript()
-{
     ms_bMaxPedsLODDistanceFromScript = false;
-    ResetPedsLODDistance(false);
 }
 
 float CSettingsSA::GetPedsLODDistance()

Client/game_sa/CSettingsSA.h

@@ -160,8 +160,7 @@ class CSettingsSA : public CGameSettings
     float GetFieldOfViewVehicleMax();
 
     void SetVehiclesLODDistance(float fVehiclesLODDistance, float fTrainsPlanesLODDistance, bool bFromScript);
-    void ResetVehiclesLODDistance(bool bFromScript);
-    void ResetVehiclesLODDistanceFromScript();
+    void ResetVehiclesLODDistance(bool bForceDefault = false);
     void GetVehiclesLODDistance(float& fVehiclesLODDistance, float& fTrainsPlanesLODDistance);
 
     void ResetCoronaReflectionsEnabled();
@@ -170,8 +169,7 @@ class CSettingsSA : public CGameSettings
     void Save();
 
     void  SetPedsLODDistance(float fPedsLODDistance, bool bFromScript);
-    void  ResetPedsLODDistance(bool bFromScript);
-    void  ResetPedsLODDistanceFromScript();
+    void  ResetPedsLODDistance(bool bForceDefault = false);
     float GetPedsLODDistance();
 
     static void StaticSetHooks();

Client/game_sa/CWaterManagerSA.cpp

@@ -785,6 +785,8 @@ void CWaterManagerSA::SetOutsideWorldWaterLevel(float fLevel)
     MemPut<float>(0x6EFFA6, fLevel);
     // Collision
     MemPut<float>(0x6E873F, fLevel);
+    // Sound
+    MemPut<float>(0x6EA238, fLevel);
 }
 
 float CWaterManagerSA::GetWaveLevel()

Client/loader/MainFunctions.cpp

@@ -833,7 +833,7 @@ void CheckDataFiles()
     {
         const char* szMd5;
         const char* szFilename;
-    } integrityCheckList[] = {{"7B58CB80363513232E827CC2000D9E68", "bass.dll"},     {"E48EA82D7A87853FA4F09F19C4E7A2C1", "bass_aac.dll"},
+    } integrityCheckList[] = {{"D337EC1DB2680AA092359CF8F39F3350", "bass.dll"},     {"E48EA82D7A87853FA4F09F19C4E7A2C1", "bass_aac.dll"},
                               {"BD43C88917D6234FF962B6E88B648B8C", "bass_ac3.dll"}, {"D8CCB4B8235F31A3C73485FDE18B0187", "bass_fx.dll"},
                               {"9FF783BB73F8868FA6599CDE65ED21D7", "bassflac.dll"}, {"9D1DE3E37AFA3D52E400DA572BB55B9C", "bassmidi.dll"},
                               {"DADDA272FB2BE2DD8F04BCDB7946558E", "bassmix.dll"},  {"26C74F5E9DF6C59DED3B09335E5D82AD", "bassopus.dll"},

Client/mods/deathmatch/CClient.cpp

@@ -128,6 +128,7 @@ int CClient::ClientInitialize(const char* szArguments, CCoreInterface* pCore)
     pCore->GetCommands()->Add("debug2", "debug function 2", COMMAND_Debug2);
     pCore->GetCommands()->Add("debug3", "debug function 3", COMMAND_Debug3);
     pCore->GetCommands()->Add("debug4", "debug function 4", COMMAND_Debug4);
+    pCore->GetCommands()->Add("timestep", "timestep", COMMAND_TimeStep);
 #endif
 
     // Got any arguments?

Client/mods/deathmatch/ClientCommands.cpp

@@ -1035,6 +1035,12 @@ void COMMAND_Debug4(const char* szCmdLine)
     g_pClientGame->StartPlayback();
     return;
 }
+
+void COMMAND_TimeStep(const char* szCmdLine)
+{
+    g_pCore->GetConsole()->Printf("TimeStep: %f", *(float*)0xB7CB5C); // CTimer::ms_fTimeStep
+}
+
 #endif
 
 void COMMAND_ShowCollision(const char* szCmdLine)

Client/mods/deathmatch/ClientCommands.h

@@ -80,6 +80,7 @@ void COMMAND_Debug(const char* szCmdLine);
 void COMMAND_Debug2(const char* szCmdLine);
 void COMMAND_Debug3(const char* szCmdLine);
 void COMMAND_Debug4(const char* szCmdLine);
+void COMMAND_TimeStep(const char* szCmdLine);
 #endif
 
 // Commands enabled when development mode in on

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -5293,10 +5293,10 @@ void CClientGame::ResetMapInfo()
     g_pMultiplayer->RestoreFogDistance();
 
     // Vehicles LOD distance
-    g_pGame->GetSettings()->ResetVehiclesLODDistanceFromScript();
+    g_pGame->GetSettings()->ResetVehiclesLODDistance(true);
 
     // Peds LOD distance
-    g_pGame->GetSettings()->ResetPedsLODDistanceFromScript();
+    g_pGame->GetSettings()->ResetPedsLODDistance(true);
 
     // Corona rain reflections
     g_pGame->GetSettings()->SetCoronaReflectionsControlledByScript(false);
@@ -5404,6 +5404,12 @@ void CClientGame::ResetMapInfo()
         }
     }
 
+    // Reset camera drunk/shake level
+    CPlayerInfo* pPlayerInfo = g_pGame->GetPlayerInfo();
+
+    if (pPlayerInfo)
+        pPlayerInfo->SetCamDrunkLevel(static_cast<byte>(0));
+
     RestreamWorld();
 }