Synchronize changes from 1.6 master branch [ci skip]

cce4967 Add onPlayerResourceStart trigger check
63b91ff Improve internal buffer management for voice packets
bd7f4c3 Clamp values in CWaterLevel::TestLineAgainstWater
6fd0825 Update installer en_US pot

Author: github-actions[bot]

Client/mods/deathmatch/CVoiceRecorder.cpp

@@ -101,7 +101,7 @@ void CVoiceRecorder::Init(bool bEnabled, unsigned int uiServerSampleRate, unsign
     if (iBitRate)
         speex_encoder_ctl(m_pSpeexEncoderState, SPEEX_SET_BITRATE, &iBitRate);
 
-    m_pOutgoingBuffer = (char*)malloc(m_uiBufferSizeBytes * FRAME_OUTGOING_BUFFER_COUNT);
+    m_pOutgoingBuffer = (unsigned char*)malloc(m_uiBufferSizeBytes * FRAME_OUTGOING_BUFFER_COUNT);
     m_uiOutgoingReadIndex = 0;
     m_uiOutgoingWriteIndex = 0;
 
@@ -247,9 +247,9 @@ void CVoiceRecorder::DoPulse()
 {
     std::lock_guard<std::mutex> lock(m_Mutex);
 
-    char*        pInputBuffer;
-    char         bufTempOutput[2048];
-    unsigned int uiTotalBufferSize = m_uiBufferSizeBytes * FRAME_OUTGOING_BUFFER_COUNT;
+    unsigned char* pInputBuffer;
+    unsigned char  audioBuffer[2048]{};
+    unsigned int   uiTotalBufferSize = m_uiBufferSizeBytes * FRAME_OUTGOING_BUFFER_COUNT;
 
     // Only send every 100 ms
     if (CClientTime::GetTime() - m_ulTimeOfLastSend > 100 && m_VoiceState != VOICESTATE_AWAITING_INPUT)
@@ -280,8 +280,8 @@ void CVoiceRecorder::DoPulse()
                 {
                     unsigned t;
                     for (t = 0; t < uiSpeexBlockSize; t++)
-                        bufTempOutput[t] = m_pOutgoingBuffer[t % uiTotalBufferSize];
-                    pInputBuffer = bufTempOutput;
+                        audioBuffer[t] = m_pOutgoingBuffer[t % uiTotalBufferSize];
+                    pInputBuffer = audioBuffer;
                 }
                 else
                     pInputBuffer = m_pOutgoingBuffer + m_uiOutgoingReadIndex;
@@ -296,9 +296,9 @@ void CVoiceRecorder::DoPulse()
 
                 m_bIsSendingVoiceData = true;
 
-                unsigned int uiBytesWritten = speex_bits_write(&speexBits, bufTempOutput, 2048);
+                unsigned int audioBufferLength = speex_bits_write(&speexBits, reinterpret_cast<char*>(audioBuffer), 2048);
 
-                g_pClientGame->GetLocalPlayer()->GetVoice()->DecodeAndBuffer(bufTempOutput, uiBytesWritten);
+                g_pClientGame->GetLocalPlayer()->GetVoice()->DecodeAndBuffer(audioBuffer, audioBufferLength);
 
                 NetBitStreamInterface* pBitStream = g_pNet->AllocateNetBitStream();
                 if (pBitStream)
@@ -307,8 +307,8 @@ void CVoiceRecorder::DoPulse()
 
                     if (pLocalPlayer)
                     {
-                        pBitStream->Write((unsigned short)uiBytesWritten);                  // size of buffer / voice data
-                        pBitStream->Write((char*)bufTempOutput, uiBytesWritten);            // voice data
+                        pBitStream->Write((unsigned short)audioBufferLength);
+                        pBitStream->Write(reinterpret_cast<char*>(audioBuffer), audioBufferLength);
 
                         g_pNet->SendPacket(PACKET_ID_VOICE_DATA, pBitStream, PACKET_PRIORITY_LOW, PACKET_RELIABILITY_UNRELIABLE_SEQUENCED,
                                            PACKET_ORDERING_VOICE);

Client/mods/deathmatch/CVoiceRecorder.h

@@ -79,11 +79,11 @@ class CVoiceRecorder
     void*                 m_pSpeexEncoderState;
     SpeexPreprocessState* m_pSpeexPreprocState;
 
-    char*        m_pOutgoingBuffer;
-    int          m_iSpeexOutgoingFrameSampleCount;
-    unsigned int m_uiOutgoingReadIndex;
-    unsigned int m_uiOutgoingWriteIndex;
-    bool         m_bIsSendingVoiceData;
+    unsigned char* m_pOutgoingBuffer;
+    int            m_iSpeexOutgoingFrameSampleCount;
+    unsigned int   m_uiOutgoingReadIndex;
+    unsigned int   m_uiOutgoingWriteIndex;
+    bool           m_bIsSendingVoiceData;
 
     unsigned long m_ulTimeOfLastSend;
 

Client/mods/deathmatch/logic/CClientPlayerVoice.cpp

@@ -118,8 +118,11 @@ void CClientPlayerVoice::DoPulse()
     }
 }
 
-void CClientPlayerVoice::DecodeAndBuffer(char* pBuffer, unsigned int bytesWritten)
+void CClientPlayerVoice::DecodeAndBuffer(const unsigned char* voiceBuffer, unsigned int voiceBufferLength)
 {
+    if (!voiceBuffer || !voiceBufferLength || voiceBufferLength > 2048)
+        return;
+
     m_Mutex.lock();
 
     if (!m_bVoiceActive)
@@ -143,7 +146,7 @@ void CClientPlayerVoice::DecodeAndBuffer(char* pBuffer, unsigned int bytesWritte
     SpeexBits speexBits;
     speex_bits_init(&speexBits);
 
-    speex_bits_read_from(&speexBits, (char*)(pBuffer), bytesWritten);
+    speex_bits_read_from(&speexBits, reinterpret_cast<const char*>(voiceBuffer), voiceBufferLength);
     speex_decode_int(m_pSpeexDecoderState, &speexBits, (spx_int16_t*)pTempBuffer);
 
     speex_bits_destroy(&speexBits);

Client/mods/deathmatch/logic/CClientPlayerVoice.h

@@ -28,7 +28,7 @@ class CClientPlayerVoice
     ZERO_ON_NEW
     CClientPlayerVoice(CClientPlayer* pPlayer, CVoiceRecorder* pVoiceRecorder);
     ~CClientPlayerVoice();
-    void DecodeAndBuffer(char* pBuffer, unsigned int bytesWritten);
+    void DecodeAndBuffer(const unsigned char* voiceBuffer, unsigned int voiceBufferLength);
     void DoPulse();
 
     bool m_bVoiceActive;

Client/mods/deathmatch/logic/CPacketHandler.cpp

@@ -5023,8 +5023,9 @@ void CPacketHandler::Packet_ResourceStart(NetBitStreamInterface& bitStream)
         uiTotalSizeProcessed = 0;
 
     /*
-     * unsigned char (1)   - resource name size
+     * unsigned char (1)    - resource name size
      * unsigned char (x)    - resource name
+     * unsigned int  (4)    - start counter
      * unsigned short (2)   - resource id
      * unsigned short (2)   - resource entity id
      * unsigned short (2)   - resource dynamic entity id
@@ -5079,6 +5080,10 @@ void CPacketHandler::Packet_ResourceStart(NetBitStreamInterface& bitStream)
         return;
     }
 
+    // Start counter
+    unsigned int startCounter{};
+    bitStream.Read(startCounter);
+
     // Resource ID
     unsigned short usResourceID;
     bitStream.Read(usResourceID);
@@ -5122,6 +5127,7 @@ void CPacketHandler::Packet_ResourceStart(NetBitStreamInterface& bitStream)
     {
         pResource->SetRemainingNoClientCacheScripts(usNoClientCacheScriptCount);
         pResource->SetDownloadPriorityGroup(iDownloadPriorityGroup);
+        pResource->SetStartCounter(startCounter);
 
         // Resource Chunk Type (F = Resource File, E = Exported Function)
         unsigned char ucChunkType;
@@ -5403,24 +5409,26 @@ void CPacketHandler::Packet_DestroySatchels(NetBitStreamInterface& bitStream)
 
 void CPacketHandler::Packet_VoiceData(NetBitStreamInterface& bitStream)
 {
-    unsigned short usPacketSize;
+    unsigned short voiceBufferLength;
     ElementID      PlayerID;
+
     if (bitStream.Read(PlayerID))
     {
         CClientPlayer* pPlayer = g_pClientGame->m_pPlayerManager->Get(PlayerID);
-        if (pPlayer && bitStream.Read(usPacketSize))
+
+        if (pPlayer && bitStream.Read(voiceBufferLength) && voiceBufferLength <= 2048)
         {
-            char* pBuf = new char[usPacketSize];
+            const auto voiceBuffer = new unsigned char[voiceBufferLength];
 
-            if (bitStream.Read(pBuf, usPacketSize))
+            if (bitStream.Read(reinterpret_cast<char*>(voiceBuffer), voiceBufferLength))
             {
                 if (pPlayer->GetVoice())
                 {
-                    pPlayer->GetVoice()->DecodeAndBuffer(pBuf, usPacketSize);
+                    pPlayer->GetVoice()->DecodeAndBuffer(voiceBuffer, voiceBufferLength);
                 }
             }
 
-            delete[] pBuf;
+            delete[] voiceBuffer;
         }
     }
 }

Client/mods/deathmatch/logic/CResource.cpp

@@ -341,6 +341,7 @@ void CResource::Load()
         {
             // Write resource net ID
             pBitStream->Write(GetNetID());
+            pBitStream->Write(GetStartCounter());
             g_pNet->SendPacket(PACKET_ID_PLAYER_RESOURCE_START, pBitStream, PACKET_PRIORITY_HIGH, PACKET_RELIABILITY_RELIABLE_ORDERED);
             g_pNet->DeallocateNetBitStream(pBitStream);
         }

Client/mods/deathmatch/logic/CResource.h

@@ -110,9 +110,13 @@ class CResource
     int                GetDownloadPriorityGroup() { return m_iDownloadPriorityGroup; }
     void               SetDownloadPriorityGroup(int iDownloadPriorityGroup) { m_iDownloadPriorityGroup = iDownloadPriorityGroup; }
 
+    void         SetStartCounter(unsigned int startCounter) { m_startCounter = startCounter; }
+    unsigned int GetStartCounter() const noexcept { return m_startCounter; }
+
 private:
     unsigned short       m_usNetID;
     uint                 m_uiScriptID;
+    unsigned int         m_startCounter{};
     SString              m_strResourceName;
     CLuaMain*            m_pLuaVM;
     CLuaManager*         m_pLuaManager;

Client/multiplayer_sa/CMultiplayerSA_Weapons.cpp

@@ -235,6 +235,47 @@ static void __declspec(naked) HOOK_CVisibilityPlugins_RenderWeaponPedsForPC()
     }
 }
 
+//////////////////////////////////////////////////////////////////////////////////////////
+//
+// CWaterLevel::TestLineAgainstWater
+//
+// Limit the values to world bounds, because the water level does not exceed it.
+//
+//////////////////////////////////////////////////////////////////////////////////////////
+static void CLAMP_CWaterLevel_TestLineAgainstWater(float values[6])
+{
+    for (int i = 0; i < 6; ++i)
+        values[i] = Clamp(-3000.0f, values[i], 3000.0f);
+}
+
+#define HOOKPOS_CWaterLevel_TestLineAgainstWater  0x6E61B0
+#define HOOKSIZE_CWaterLevel_TestLineAgainstWater 10
+static constexpr DWORD       CONTINUE_CWaterLevel_TestLineAgainstWater = 0x6E61BA;
+static void _declspec(naked) HOOK_CWaterLevel_TestLineAgainstWater()
+{
+    MTA_VERIFY_HOOK_LOCAL_SIZE;
+
+    __asm
+    {
+        // [esp+4]  from.x
+        // [esp+8]  from.y
+        // [esp+12] from.z
+        // [esp+16] to.x
+        // [esp+20] to.y
+        // [esp+24] to.z
+        pushad
+        lea     eax, [esp+32+4]
+        push    eax
+        call    CLAMP_CWaterLevel_TestLineAgainstWater
+        add     esp, 4
+        popad
+
+        fld     [esp+0Ch]
+        sub     esp, 88h
+        jmp CONTINUE_CWaterLevel_TestLineAgainstWater
+    }
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////
 //
 // CMultiplayerSA::InitHooks_Weapons
@@ -248,4 +289,5 @@ void CMultiplayerSA::InitHooks_Weapons()
     EZHookInstall(CShotInfo_Update);
     EZHookInstall(Fx_AddBulletImpact);
     EZHookInstall(CVisibilityPlugins_RenderWeaponPedsForPC);
+    EZHookInstall(CWaterLevel_TestLineAgainstWater);
 }

Server/mods/deathmatch/logic/CGame.cpp

@@ -1555,6 +1555,9 @@ void CGame::QuitPlayer(CPlayer& Player, CClient::eQuitReasons Reason, bool bSayI
 
         Player.CallEvent("onPlayerQuit", Arguments);
 
+        // Tell the resource manager
+        m_pResourceManager->OnPlayerQuit(Player);
+
         // Tell the map manager
         m_pMapManager->OnPlayerQuit(Player);
 
@@ -3859,9 +3862,7 @@ void CGame::Packet_Voice_Data(CVoiceDataPacket& Packet)
 
     if (m_pMainConfig->IsVoiceEnabled())            // Shouldn't really be receiving voice packets at all if voice is disabled
     {
-        usDataLength = Packet.GetDataLength();
-
-        if (usDataLength > 0)
+        if (!Packet.IsEmpty())
         {
             CPlayer* pPlayer = Packet.GetSourcePlayer();
 
@@ -3890,9 +3891,6 @@ void CGame::Packet_Voice_Data(CVoiceDataPacket& Packet)
                 if (pPlayer->GetVoiceState() ==
                     VOICESTATE_TRANSMITTING)            // If we reach here, and we're still in idle state, then the event was cancelled
                 {
-                    const unsigned char* pBuffer = Packet.GetData();
-                    CVoiceDataPacket     VoicePacket(pPlayer, pBuffer, usDataLength);
-
                     // Make list of players to send the voice packet to
                     std::set<CPlayer*> playerSendMap;
 
@@ -3935,7 +3933,7 @@ void CGame::Packet_Voice_Data(CVoiceDataPacket& Packet)
                     }
 
                     // Send to all players in the send list
-                    CPlayerManager::Broadcast(VoicePacket, playerSendMap);
+                    CPlayerManager::Broadcast(Packet, playerSendMap);
                 }
             }
         }
@@ -4177,17 +4175,16 @@ void CGame::Packet_PlayerNetworkStatus(CPlayerNetworkStatusPacket& Packet)
 
 void CGame::Packet_PlayerResourceStart(CPlayerResourceStartPacket& Packet)
 {
-    CPlayer* pPlayer = Packet.GetSourcePlayer();
-    if (pPlayer)
-    {
-        CResource* pResource = Packet.GetResource();
-        if (pResource)
-        {
-            CLuaArguments Arguments;
-            Arguments.PushResource(pResource);
-            pPlayer->CallEvent("onPlayerResourceStart", Arguments, NULL);
-        }
-    }
+    CPlayer*     sourcePlayer = Packet.GetSourcePlayer();
+    CResource*   resource = Packet.GetResource();
+    unsigned int playerStartCounter = Packet.GetStartCounter();
+
+    if (!sourcePlayer || !resource || !resource->CanPlayerTriggerResourceStart(sourcePlayer, playerStartCounter))
+        return;
+
+    CLuaArguments Arguments;
+    Arguments.PushResource(resource);
+    sourcePlayer->CallEvent("onPlayerResourceStart", Arguments, nullptr);
 }
 
 void CGame::Packet_PlayerWorldSpecialProperty(CPlayerWorldSpecialPropertyPacket& packet) noexcept

Server/mods/deathmatch/logic/CResource.cpp

@@ -362,6 +362,23 @@ void CResource::Reload()
     Load();
 }
 
+bool CResource::CanPlayerTriggerResourceStart(CPlayer* player, unsigned int playerStartCounter)
+{
+    if (playerStartCounter != m_startCounter || m_eState != EResourceState::Running)
+        return false;
+
+    if (m_isRunningForPlayer.contains(player))
+        return false;
+
+    m_isRunningForPlayer.insert(player);
+    return true;
+}
+
+void CResource::OnPlayerQuit(CPlayer& Player)
+{
+    m_isRunningForPlayer.erase(&Player);
+}
+
 CResource::~CResource()
 {
     CIdArray::PushUniqueId(this, EIdClass::RESOURCE, m_uiScriptID);
@@ -1017,6 +1034,7 @@ bool CResource::Start(std::list<CResource*>* pDependents, bool bManualStart, con
         return false;
     }
 
+    m_startCounter = std::max<unsigned int>(m_startCounter + 1, 1); // We consider zero to be an invalid start counter.
     m_bStartedManually = bManualStart;
 
     // Remember the client files state
@@ -1028,7 +1046,7 @@ bool CResource::Start(std::list<CResource*>* pDependents, bool bManualStart, con
 
     // Broadcast new resourceelement that is loaded and tell the players that a new resource was started
     g_pGame->GetMapManager()->BroadcastResourceElements(m_pResourceElement, m_pDefaultElementGroup);
-    g_pGame->GetPlayerManager()->BroadcastOnlyJoined(CResourceStartPacket(m_strResourceName.c_str(), this));
+    g_pGame->GetPlayerManager()->BroadcastOnlyJoined(CResourceStartPacket(m_strResourceName, this, m_startCounter));
     SendNoClientCacheScripts();
     m_bClientSync = true;
 
@@ -1174,6 +1192,9 @@ bool CResource::Stop(bool bManualStop)
     // Broadcast the packet to joined players
     g_pGame->GetPlayerManager()->BroadcastOnlyJoined(removePacket);
 
+    // Clear the list of players where this resource is running
+    std::exchange(m_isRunningForPlayer, {});
+
     OnResourceStateChange("loaded");
     m_eState = EResourceState::Loaded;
     return true;
@@ -3312,8 +3333,7 @@ bool CResource::CheckState()
 
 void CResource::OnPlayerJoin(CPlayer& Player)
 {
-    // do the player join crap
-    Player.Send(CResourceStartPacket(m_strResourceName.c_str(), this));
+    Player.Send(CResourceStartPacket(m_strResourceName.c_str(), this, m_startCounter));
     SendNoClientCacheScripts(&Player);
 }