Merge branch 'master' into bugfix/isPedOnGround

Author: FileEX

Client/core/DXHook/CProxyDirect3DDevice9.cpp

@@ -117,6 +117,7 @@ ULONG CProxyDirect3DDevice9::Release()
         // Call event handler
         CDirect3DEvents9::OnDirect3DDeviceDestroy(m_pDevice);
         delete this;
+        return ulRefCount - 1;
     }
 
     return m_pDevice->Release();

Client/core/Graphics/CRenderItemManager.cpp

@@ -167,7 +167,7 @@ CVectorGraphicItem* CRenderItemManager::CreateVectorGraphic(uint width, uint hei
     }
 
     UpdateMemoryUsage();
-
+    
     return pVectorItem;
 }
 
@@ -723,7 +723,7 @@ void CRenderItemManager::UpdateMemoryUsage()
             continue;
         int iMemoryKBUsed = pRenderItem->GetVideoMemoryKBUsed();
 
-        if (pRenderItem->IsA(CFileTextureItem::GetClassId()))
+        if (pRenderItem->IsA(CFileTextureItem::GetClassId()) || pRenderItem->IsA(CVectorGraphicItem::GetClassId()))
             m_iTextureMemoryKBUsed += iMemoryKBUsed;
         else if (pRenderItem->IsA(CRenderTargetItem::GetClassId()) || pRenderItem->IsA(CScreenSourceItem::GetClassId()))
             m_iRenderTargetMemoryKBUsed += iMemoryKBUsed;

Client/core/Graphics/CVideoModeManager.cpp

@@ -791,7 +791,8 @@ void CClientEntity::CallEventNoParent(const char* szName, const CLuaArguments& A
     // Call it on all our children
     if (!m_Children.empty())
     {
-        for (CClientEntity* pEntity : *GetChildrenListSnapshot())
+        CElementListSnapshotRef pChildrenSnapshot = GetChildrenListSnapshot();
+		for (CClientEntity* pEntity : *pChildrenSnapshot)
         {
             if (!pEntity->IsBeingDeleted())
             {

Client/mods/deathmatch/logic/CClientEntity.cpp

@@ -2648,6 +2648,7 @@ void CClientGame::AddBuiltInEvents()
     m_Events.AddEvent("onClientPlayerRadioSwitch", "", NULL, false);
     m_Events.AddEvent("onClientPlayerDamage", "attacker, weapon, bodypart", NULL, false);
     m_Events.AddEvent("onClientPlayerWeaponFire", "weapon, ammo, ammoInClip, hitX, hitY, hitZ, hitElement", NULL, false);
+    m_Events.AddEvent("onClientPlayerWeaponReload", "weapon, clip, ammo", nullptr, false);
     m_Events.AddEvent("onClientPlayerWasted", "ammo, killer, weapon, bodypart, isStealth, animGroup, animID", nullptr, false);
     m_Events.AddEvent("onClientPlayerChoke", "", NULL, false);
     m_Events.AddEvent("onClientPlayerVoiceStart", "", NULL, false);
@@ -2666,6 +2667,7 @@ void CClientGame::AddBuiltInEvents()
     m_Events.AddEvent("onClientPedVehicleEnter", "vehicle, seat", NULL, false);
     m_Events.AddEvent("onClientPedVehicleExit", "vehicle, seat", NULL, false);
     m_Events.AddEvent("onClientPedWeaponFire", "weapon, ammo, ammoInClip, hitX, hitY, hitZ, hitElement", NULL, false);
+    m_Events.AddEvent("onClientPedWeaponReload", "weapon, clip, ammo", nullptr, false);
     m_Events.AddEvent("onClientPedWasted", "", NULL, false);
     m_Events.AddEvent("onClientPedChoke", "", NULL, false);
     m_Events.AddEvent("onClientPedHeliKilled", "heli", NULL, false);

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -6119,6 +6119,21 @@ bool CClientPed::ReloadWeapon() noexcept
     if (!CanReloadWeapon() || (task && task->GetTaskType() == TASK_SIMPLE_USE_GUN))
         return false;
 
+    CLuaArguments args;
+    args.PushNumber(weapon->GetType());
+    args.PushNumber(weapon->GetAmmoInClip());
+    args.PushNumber(weapon->GetAmmoTotal());
+
+    bool result = false;
+
+    if (IS_PLAYER(this))
+        result = CallEvent("onClientPlayerWeaponReload", args, true);
+    else
+        result = CallEvent("onClientPedWeaponReload", args, true);
+
+    if (!result)
+        return false;
+
     weapon->SetState(WEAPONSTATE_RELOADING);
     return true;
 }

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -222,7 +222,7 @@ bool CMapEventManager::Call(const char* szName, const CLuaArguments& Arguments,
                         lua_pushresource(pState, pSourceResource);
                         lua_setglobal(pState, "sourceResource");
 
-                        lua_pushelement(pState, pSourceResource->GetResourceDynamicEntity());
+                        lua_pushelement(pState, pSourceResource->GetResourceEntity());
                         lua_setglobal(pState, "sourceResourceRoot");
                     }
                     else
@@ -400,4 +400,4 @@ void CMapEventManager::GetHandles(CLuaMain* pLuaMain, const char* szName, lua_St
             }
         }
     }
-}
+}

Client/mods/deathmatch/logic/CMapEventManager.cpp

@@ -1412,7 +1412,8 @@ void CPacketHandler::Packet_ChatEcho(NetBitStreamInterface& bitStream)
             bitStream.Read(szMessage, iNumberOfBytesUsed);
             szMessage[iNumberOfBytesUsed] = 0;
             // actual limits enforced on the remote client, this is the maximum a string can be to be printed.
-            if (MbUTF8ToUTF16(szMessage).size() <=
+            SString textToProcess = bColorCoded ? RemoveColorCodes(szMessage) : szMessage;
+            if (MbUTF8ToUTF16(textToProcess).size() <=
                 MAX_CHATECHO_LENGTH + 6)            // Extra 6 characters to fix #7125 (Teamsay + long name + long message = too long message)
             {
                 // Strip it for bad characters

Client/mods/deathmatch/logic/CPacketHandler.cpp

@@ -16,9 +16,9 @@ CScriptDebugging::CScriptDebugging(CLuaManager* pLuaManager)
 {
     m_pLuaManager = pLuaManager;
     m_uiLogFileLevel = 0;
-    m_pLogFile = NULL;
+    m_pLogFile = nullptr;
     m_bTriggeringMessageEvent = false;
-    m_flushTimerHandle = NULL;
+    m_flushTimerHandle = nullptr;
 }
 
 CScriptDebugging::~CScriptDebugging()
@@ -33,13 +33,13 @@ CScriptDebugging::~CScriptDebugging()
         fprintf(m_pLogFile, "INFO: Logging to this file ended\n");
 
         // if we have a flush timer
-        if (m_flushTimerHandle != NULL)
+        if (m_flushTimerHandle)
         {
             // delete our flush timer
-            DeleteTimerQueueTimer(NULL, m_flushTimerHandle, INVALID_HANDLE_VALUE);            // INVALID_HANDLE_VALUE = wait for running callbacks to finish
+            DeleteTimerQueueTimer(nullptr, m_flushTimerHandle, INVALID_HANDLE_VALUE);            // INVALID_HANDLE_VALUE = wait for running callbacks to finish
         }
         fclose(m_pLogFile);
-        m_pLogFile = NULL;
+        m_pLogFile = nullptr;
     }
 }
 
@@ -52,7 +52,7 @@ void CScriptDebugging::LogBadLevel(lua_State* luaVM, unsigned int uiRequiredLeve
 void CALLBACK TimerProc(void* lpParametar, BOOLEAN TimerOrWaitFired)
 {
     // Got a logfile?
-    if (CScriptDebugging::m_pLogFile != NULL)
+    if (CScriptDebugging::m_pLogFile)
     {
         // flush our log file
         fflush((FILE*)CScriptDebugging::m_pLogFile);
@@ -68,13 +68,13 @@ bool CScriptDebugging::SetLogfile(const char* szFilename, unsigned int uiLevel)
     {
         fprintf(m_pLogFile, "INFO: Logging to this file ended\n");
         // if we have a flush timer
-        if (m_flushTimerHandle != NULL)
+        if (m_flushTimerHandle)
         {
             // delete our flush timer
-            DeleteTimerQueueTimer(NULL, m_flushTimerHandle, INVALID_HANDLE_VALUE);            // INVALID_HANDLE_VALUE = wait for running callbacks to finish
+            DeleteTimerQueueTimer(nullptr, m_flushTimerHandle, INVALID_HANDLE_VALUE);            // INVALID_HANDLE_VALUE = wait for running callbacks to finish
         }
         fclose(m_pLogFile);
-        m_pLogFile = NULL;
+        m_pLogFile = nullptr;
     }
 
     // Apply log size limit
@@ -102,38 +102,46 @@ bool CScriptDebugging::SetLogfile(const char* szFilename, unsigned int uiLevel)
         // round 37.5 to 38 because we can't have half a message
         // 8 * 256 bytes = 6004B
         // round 6004 up to the nearest divisible by 1024 = 6144
-        // we have our buffer size.
-        setvbuf(pFile, NULL, _IOFBF, 6144);
+        setvbuf(pFile, nullptr, _IOFBF, 6144);
 
         // Set the new pointer and level and return true
         m_uiLogFileLevel = uiLevel;
         m_pLogFile = pFile;
 
         // Create a timer
-        ::CreateTimerQueueTimer(&m_flushTimerHandle, NULL, TimerProc, NULL, 50, 50, WT_EXECUTEINTIMERTHREAD);
+        ::CreateTimerQueueTimer(&m_flushTimerHandle, nullptr, TimerProc, nullptr, 50, 50, WT_EXECUTEINTIMERTHREAD);
         return true;
     }
 
     return false;
 }
 
+
 void CScriptDebugging::UpdateLogOutput()
 {
     SLogLine line;
     while (m_DuplicateLineFilter.PopOutputLine(line))
     {
-        // Log it to the file if enough level
         bool sufficientDebugLevel = CheckForSufficientDebugLevel(m_uiLogFileLevel, line.uiMinimumDebugLevel);
 
         if (sufficientDebugLevel)
         {
             PrintLog(line.strText);
         }
+        
     #ifdef MTA_DEBUG
         if (!g_pCore->IsDebugVisible())
             return;
     #endif
-        g_pCore->DebugEchoColor(line.strText, line.ucRed, line.ucGreen, line.ucBlue);
+        
+        std::uint8_t clientDebugLevel = 0;
+        auto* localPlayer = g_pClientGame->GetPlayerManager()->GetLocalPlayer();
+        if (localPlayer)
+            clientDebugLevel = localPlayer->GetPlayerScriptDebugLevel();
+        
+        bool shouldDisplayInConsole = CheckForSufficientDebugLevel(clientDebugLevel, line.uiMinimumDebugLevel);
+        if (shouldDisplayInConsole)
+            g_pCore->DebugEchoColor(line.strText, line.ucRed, line.ucGreen, line.ucBlue);
     }
 }
 

Client/mods/deathmatch/logic/CScriptDebugging.cpp

@@ -68,8 +68,8 @@ class CScriptDebugging
     SString ComposeErrorMessage(const char* szPrePend, const SLuaDebugInfo& luaDebugInfo, const char* szMessage);
     void LogString(const char* szPrePend, const SLuaDebugInfo& luaDebugInfo, const char* szMessage, unsigned int uiMinimumDebugLevel, unsigned char ucRed = 255,
                    unsigned char ucGreen = 255, unsigned char ucBlue = 255);
-    bool CheckForSufficientDebugLevel(std::uint8_t playerDebugLevel, std::uint8_t messageDebugLevel) const noexcept;
     void PrintLog(const char* szText);
+    bool CheckForSufficientDebugLevel(std::uint8_t playerDebugLevel, std::uint8_t messageDebugLevel) const noexcept;
 
 public:
     static FILE* m_pLogFile;