Merge pull request #324 from samr46/goggles-noise-effect

Add "noiseEnabled" parameter to setCameraGoggleEffect

Author: qaisjp

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -123,8 +123,8 @@ CClientGame::CClientGame(bool bLocalPlay)
     g_pMultiplayer->DisableBadDrivebyHitboxes(true);
 
     // Remove Night & Thermal vision view (if enabled).
-    g_pMultiplayer->SetNightVisionEnabled(false);
-    g_pMultiplayer->SetThermalVisionEnabled(false);
+    g_pMultiplayer->SetNightVisionEnabled(false, true);
+    g_pMultiplayer->SetThermalVisionEnabled(false, true);
 
     m_bCloudsEnabled = true;
 

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -2226,8 +2226,8 @@ void CClientPed::RemoveAllWeapons(void)
     if (m_bIsLocalPlayer)
     {
         g_pClientGame->ResetAmmoInClip();
-        g_pMultiplayer->SetNightVisionEnabled(false);
-        g_pMultiplayer->SetThermalVisionEnabled(false);
+        g_pMultiplayer->SetNightVisionEnabled(false, true);
+        g_pMultiplayer->SetThermalVisionEnabled(false, true);
     }
     if (m_pPlayerPed)
     {

Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp

@@ -455,32 +455,34 @@ int CLuaCameraDefs::SetCameraViewMode(lua_State* luaVM)
 
 int CLuaCameraDefs::SetCameraGoggleEffect(lua_State* luaVM)
 {
-    SString          strMode = "";
+    SString          strMode;
+    bool             bNoiseEnabled;
     CScriptArgReader argStream(luaVM);
     argStream.ReadString(strMode);
+    argStream.ReadBool(bNoiseEnabled, true);
 
     if (!argStream.HasErrors())
     {
         bool bSuccess = false;
 
         if (strMode.compare("nightvision") == 0)
         {
-            g_pMultiplayer->SetNightVisionEnabled(true);
-            g_pMultiplayer->SetThermalVisionEnabled(false);
+            g_pMultiplayer->SetNightVisionEnabled(true, bNoiseEnabled);
+            g_pMultiplayer->SetThermalVisionEnabled(false, true);
 
             bSuccess = true;
         }
         else if (strMode.compare("thermalvision") == 0)
         {
-            g_pMultiplayer->SetNightVisionEnabled(false);
-            g_pMultiplayer->SetThermalVisionEnabled(true);
+            g_pMultiplayer->SetNightVisionEnabled(false, true);
+            g_pMultiplayer->SetThermalVisionEnabled(true, bNoiseEnabled);
 
             bSuccess = true;
         }
         else if (strMode.compare("normal") == 0)
         {
-            g_pMultiplayer->SetNightVisionEnabled(false);
-            g_pMultiplayer->SetThermalVisionEnabled(false);
+            g_pMultiplayer->SetNightVisionEnabled(false, true);
+            g_pMultiplayer->SetThermalVisionEnabled(false, true);
 
             bSuccess = true;
         }

Client/multiplayer_sa/CMultiplayerSA.cpp

@@ -3842,7 +3842,7 @@ void CMultiplayerSA::RebuildMultiplayerPlayer(CPed* player)
     TIMING_CHECKPOINT("-RebuldMulplrPlr");
 }
 
-void CMultiplayerSA::SetNightVisionEnabled(bool bEnabled)
+void CMultiplayerSA::SetNightVisionEnabled(bool bEnabled, bool bNoiseEnabled)
 {
     if (bEnabled)
     {
@@ -3852,9 +3852,18 @@ void CMultiplayerSA::SetNightVisionEnabled(bool bEnabled)
     {
         MemPutFast<BYTE>(0xC402B8, 0);
     }
+    if (bNoiseEnabled)
+    {
+        BYTE originalCodes[5] = { 0xE8, 0xD3, 0xE8, 0xFF, 0xFF };
+        MemCpy((void*)0x704EE8, &originalCodes, 5);
+    }
+    else
+    {
+        MemSet((void*)0x704EE8, 0x90, 5);
+    }
 }
 
-void CMultiplayerSA::SetThermalVisionEnabled(bool bEnabled)
+void CMultiplayerSA::SetThermalVisionEnabled(bool bEnabled, bool bNoiseEnabled)
 {
     if (bEnabled)
     {
@@ -3864,6 +3873,15 @@ void CMultiplayerSA::SetThermalVisionEnabled(bool bEnabled)
     {
         MemPutFast<BYTE>(0xC402B9, 0);
     }
+    if (bNoiseEnabled)
+    {
+        BYTE originalCodes[5] = { 0xE8, 0x62, 0xE8, 0xFF, 0xFF };
+        MemCpy((void*)0x704F59, &originalCodes, 5);
+    }
+    else
+    {
+        MemSet((void*)0x704F59, 0x90, 5);
+    }
 }
 
 bool CMultiplayerSA::IsNightVisionEnabled()

Client/multiplayer_sa/CMultiplayerSA.h

@@ -178,8 +178,8 @@ class CMultiplayerSA : public CMultiplayer
     int   GetMoonSize();
     void  ResetMoonSize();
 
-    void SetNightVisionEnabled(bool bEnabled);
-    void SetThermalVisionEnabled(bool bEnabled);
+    void SetNightVisionEnabled(bool bEnabled, bool bNoiseEnabled);
+    void SetThermalVisionEnabled(bool bEnabled, bool bNoiseEnabled);
     bool IsNightVisionEnabled();
     bool IsThermalVisionEnabled();
 

Client/sdk/multiplayer/CMultiplayer.h

@@ -262,8 +262,8 @@ class CMultiplayer
 
     virtual void DisableEnterExitVehicleKey(bool bDisabled) = 0;
 
-    virtual void SetNightVisionEnabled(bool bEnabled) = 0;
-    virtual void SetThermalVisionEnabled(bool bEnabled) = 0;
+    virtual void SetNightVisionEnabled(bool bEnabled, bool bNoiseEnabled) = 0;
+    virtual void SetThermalVisionEnabled(bool bEnabled, bool bNoiseEnabled) = 0;
     virtual bool IsNightVisionEnabled() = 0;
     virtual bool IsThermalVisionEnabled() = 0;