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

qaisjp · web-flow · commit dcd1218d6170 · 2018-08-16T01:24:33.000+01:00
Add "noiseEnabled" parameter to setCameraGoggleEffect
diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/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;
 
diff --git a/Client/mods/deathmatch/logic/CClientPed.cpp b/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)
     {
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp b/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;
         }
diff --git a/Client/multiplayer_sa/CMultiplayerSA.cpp b/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()
diff --git a/Client/multiplayer_sa/CMultiplayerSA.h b/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();
 
diff --git a/Client/sdk/multiplayer/CMultiplayer.h b/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;
 

Original file line number	Diff line number	Diff line change
`@@ -2226,8 +2226,8 @@ void CClientPed::RemoveAllWeapons(void)`
`2226`	`2226`	`if (m_bIsLocalPlayer)`
`2227`	`2227`	`{`
`2228`	`2228`	`g_pClientGame->ResetAmmoInClip();`
`2229`		`- g_pMultiplayer->SetNightVisionEnabled(false);`
`2230`		`- g_pMultiplayer->SetThermalVisionEnabled(false);`
	`2229`	`+ g_pMultiplayer->SetNightVisionEnabled(false, true);`
	`2230`	`+ g_pMultiplayer->SetThermalVisionEnabled(false, true);`
`2231`	`2231`	`}`
`2232`	`2232`	`if (m_pPlayerPed)`
`2233`	`2233`	`{`
Original file line number	Diff line number	Diff line change
`@@ -455,32 +455,34 @@ int CLuaCameraDefs::SetCameraViewMode(lua_State* luaVM)`
`455`	`455`
`456`	`456`	`int CLuaCameraDefs::SetCameraGoggleEffect(lua_State* luaVM)`
`457`	`457`	`{`
`458`		`- SString strMode = "";`
	`458`	`+ SString strMode;`
	`459`	`+ bool bNoiseEnabled;`
`459`	`460`	`CScriptArgReader argStream(luaVM);`
`460`	`461`	`argStream.ReadString(strMode);`
	`462`	`+ argStream.ReadBool(bNoiseEnabled, true);`
`461`	`463`
`462`	`464`	`if (!argStream.HasErrors())`
`463`	`465`	`{`
`464`	`466`	`bool bSuccess = false;`
`465`	`467`
`466`	`468`	`if (strMode.compare("nightvision") == 0)`
`467`	`469`	`{`
`468`		`- g_pMultiplayer->SetNightVisionEnabled(true);`
`469`		`- g_pMultiplayer->SetThermalVisionEnabled(false);`
	`470`	`+ g_pMultiplayer->SetNightVisionEnabled(true, bNoiseEnabled);`
	`471`	`+ g_pMultiplayer->SetThermalVisionEnabled(false, true);`
`470`	`472`
`471`	`473`	`bSuccess = true;`
`472`	`474`	`}`
`473`	`475`	`else if (strMode.compare("thermalvision") == 0)`
`474`	`476`	`{`
`475`		`- g_pMultiplayer->SetNightVisionEnabled(false);`
`476`		`- g_pMultiplayer->SetThermalVisionEnabled(true);`
	`477`	`+ g_pMultiplayer->SetNightVisionEnabled(false, true);`
	`478`	`+ g_pMultiplayer->SetThermalVisionEnabled(true, bNoiseEnabled);`
`477`	`479`
`478`	`480`	`bSuccess = true;`
`479`	`481`	`}`
`480`	`482`	`else if (strMode.compare("normal") == 0)`
`481`	`483`	`{`
`482`		`- g_pMultiplayer->SetNightVisionEnabled(false);`
`483`		`- g_pMultiplayer->SetThermalVisionEnabled(false);`
	`484`	`+ g_pMultiplayer->SetNightVisionEnabled(false, true);`
	`485`	`+ g_pMultiplayer->SetThermalVisionEnabled(false, true);`
`484`	`486`
`485`	`487`	`bSuccess = true;`
`486`	`488`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3842,7 +3842,7 @@ void CMultiplayerSA::RebuildMultiplayerPlayer(CPed* player)`
`3842`	`3842`	`TIMING_CHECKPOINT("-RebuldMulplrPlr");`
`3843`	`3843`	`}`
`3844`	`3844`
`3845`		`-void CMultiplayerSA::SetNightVisionEnabled(bool bEnabled)`
	`3845`	`+void CMultiplayerSA::SetNightVisionEnabled(bool bEnabled, bool bNoiseEnabled)`
`3846`	`3846`	`{`
`3847`	`3847`	`if (bEnabled)`
`3848`	`3848`	`{`
`@@ -3852,9 +3852,18 @@ void CMultiplayerSA::SetNightVisionEnabled(bool bEnabled)`
`3852`	`3852`	`{`
`3853`	`3853`	`MemPutFast<BYTE>(0xC402B8, 0);`
`3854`	`3854`	`}`
	`3855`	`+ if (bNoiseEnabled)`
	`3856`	`+ {`
	`3857`	`+ BYTE originalCodes[5] = { 0xE8, 0xD3, 0xE8, 0xFF, 0xFF };`
	`3858`	`+ MemCpy((void*)0x704EE8, &originalCodes, 5);`
	`3859`	`+ }`
	`3860`	`+ else`
	`3861`	`+ {`
	`3862`	`+ MemSet((void*)0x704EE8, 0x90, 5);`
	`3863`	`+ }`
`3855`	`3864`	`}`
`3856`	`3865`
`3857`		`-void CMultiplayerSA::SetThermalVisionEnabled(bool bEnabled)`
	`3866`	`+void CMultiplayerSA::SetThermalVisionEnabled(bool bEnabled, bool bNoiseEnabled)`
`3858`	`3867`	`{`
`3859`	`3868`	`if (bEnabled)`
`3860`	`3869`	`{`
`@@ -3864,6 +3873,15 @@ void CMultiplayerSA::SetThermalVisionEnabled(bool bEnabled)`
`3864`	`3873`	`{`
`3865`	`3874`	`MemPutFast<BYTE>(0xC402B9, 0);`
`3866`	`3875`	`}`
	`3876`	`+ if (bNoiseEnabled)`
	`3877`	`+ {`
	`3878`	`+ BYTE originalCodes[5] = { 0xE8, 0x62, 0xE8, 0xFF, 0xFF };`
	`3879`	`+ MemCpy((void*)0x704F59, &originalCodes, 5);`
	`3880`	`+ }`
	`3881`	`+ else`
	`3882`	`+ {`
	`3883`	`+ MemSet((void*)0x704F59, 0x90, 5);`
	`3884`	`+ }`
`3867`	`3885`	`}`
`3868`	`3886`
`3869`	`3887`	`bool CMultiplayerSA::IsNightVisionEnabled()`