Merge branch 'master' into patch-5

Author: G-Moris

Client/core/CConnectManager.cpp

@@ -10,7 +10,7 @@
  *****************************************************************************/
 
 #include "StdInc.h"
-#include "net/packetenums.h"
+#include "net/Packets.h"
 using namespace std;
 
 static CConnectManager* g_pConnectManager = NULL;

Client/core/CMainMenu.cpp

@@ -40,7 +40,8 @@
 #define CORE_MTA_DISABLED_ALPHA     0.4f
 #define CORE_MTA_ENABLED_ALPHA      1.0f
 
-#define CORE_MTA_ANIMATION_TIME     200
+#define CORE_MTA_ANIMATION_TIME_IN  200
+#define CORE_MTA_ANIMATION_TIME_OUT 100
 #define CORE_MTA_MOVE_ANIM_TIME     600
 
 #define CORE_MTA_STATIC_BG          "cgui\\images\\background.png"
@@ -517,11 +518,9 @@ void CMainMenu::Update()
 
             if (m_pHoveredItem)
             {
-                float fProgress = (m_pHoveredItem->image->GetAlpha() - CORE_MTA_NORMAL_ALPHA) / (CORE_MTA_HOVER_ALPHA - CORE_MTA_NORMAL_ALPHA);
-                // Let's work out what the target progress should be by working out the time passed
-                fProgress = ((float)ulTimePassed / CORE_MTA_ANIMATION_TIME) * (CORE_MTA_HOVER_ALPHA - CORE_MTA_NORMAL_ALPHA) + fProgress;
+                float progress = m_pHoveredItem->animProgress + ((float)ulTimePassed / CORE_MTA_ANIMATION_TIME_IN);
                 MapRemove(m_unhoveredItems, m_pHoveredItem);
-                SetItemHoverProgress(m_pHoveredItem, fProgress, true);
+                SetItemHoverProgress(m_pHoveredItem, progress, true);
             }
         }
         else if (m_pHoveredItem)
@@ -534,11 +533,10 @@ void CMainMenu::Update()
         std::set<sMenuItem*>::iterator it = m_unhoveredItems.begin();
         while (it != m_unhoveredItems.end())
         {
-            float fProgress = ((*it)->image->GetAlpha() - CORE_MTA_NORMAL_ALPHA) / (CORE_MTA_HOVER_ALPHA - CORE_MTA_NORMAL_ALPHA);
             // Let's work out what the target progress should be by working out the time passed
             // Min of 0.5 progress fixes occasional graphical glitchekal
-            fProgress = fProgress - std::min(0.5f, ((float)ulTimePassed / CORE_MTA_ANIMATION_TIME) * (CORE_MTA_HOVER_ALPHA - CORE_MTA_NORMAL_ALPHA));
-            if (SetItemHoverProgress((*it), fProgress, false))
+            float newProgress = (*it)->animProgress - std::min(0.5f, ((float)ulTimePassed / CORE_MTA_ANIMATION_TIME_OUT) * (CORE_MTA_HOVER_ALPHA - CORE_MTA_NORMAL_ALPHA));
+            if (SetItemHoverProgress((*it), newProgress, false))
             {
                 std::set<sMenuItem*>::iterator itToErase = it++;
                 m_unhoveredItems.erase(itToErase);
@@ -1101,8 +1099,10 @@ bool CMainMenu::SetItemHoverProgress(sMenuItem* pItem, float fProgress, bool bHo
 {
     fProgress = Clamp<float>(0, fProgress, 1);
 
-    // Use OutQuad equation for easing, or OutQuad for unhovering
-    fProgress = bHovering ? -fProgress * (fProgress - 2) : fProgress * fProgress;
+    pItem->animProgress = fProgress;
+
+    // Always use OutQuad for both hovering and unhovering, to avoid animation glitches.
+    fProgress = -fProgress * (fProgress - 2);
 
     // Work out the target scale
     float fTargetScale = (CORE_MTA_HOVER_SCALE - CORE_MTA_NORMAL_SCALE) * (fProgress) + CORE_MTA_NORMAL_SCALE;
@@ -1121,7 +1121,7 @@ bool CMainMenu::SetItemHoverProgress(sMenuItem* pItem, float fProgress, bool bHo
     pItem->image->SetSize(CVector2D(iSizeX, iSizeY), false);
 
     // Return whether the hovering has maxed out
-    return bHovering ? (fProgress == 1) : (fProgress == 0);
+    return bHovering ? (pItem->animProgress >= 1.0) : (pItem->animProgress <= 0.0f);
 }
 
 void CMainMenu::SetNewsHeadline(int iIndex, const SString& strHeadline, const SString& strDate, bool bIsNew)

Client/core/CMainMenu.h

@@ -33,6 +33,7 @@ struct sMenuItem
     int              nativeSizeX;
     int              nativeSizeY;
     CGUIStaticImage* image;
+    float            animProgress{};
 };
 
 class CMainMenu

Client/core/CModManager.cpp

@@ -165,13 +165,13 @@ bool CModManager::TryStart()
         DWORD size = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS, nullptr, errorCode,
                                    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), reinterpret_cast<LPSTR>(&buffer), 0, nullptr);
 
-        if (size > 0)
+        if (buffer != nullptr && size > 0)
         {
-            LocalFree(buffer);
-
             std::string message{buffer, size};
             size_t      length = message.find_last_not_of("\t\n\v\f\r ");
 
+            LocalFree(buffer);
+
             if (length == std::string::npos)
                 return false;
 

Client/game_sa/CBuildingsPoolSA.cpp

@@ -19,6 +19,7 @@
 #include "MemSA.h"
 #include "CVehicleSA.h"
 #include "CBuildingRemovalSA.h"
+#include "CPlayerPedSA.h"
 
 extern CGameSA* pGame;
 
@@ -372,7 +373,9 @@ void CBuildingsPoolSA::RemovePedsContactEnityLinks()
             ped->pLastContactedEntity[2] = nullptr;
             ped->pLastContactedEntity[3] = nullptr;
             ped->m_ucCollisionState = 0;
-            ped->pTargetedEntity = nullptr;
+
+            if (auto* playerPed = dynamic_cast<CPlayerPedSA*>(pedLinks->pEntity))
+                playerPed->SetTargetedEntity(nullptr);
         }
     }
 }

Client/game_sa/CPedSA.cpp

@@ -380,20 +380,6 @@ CEntity* CPedSA::GetContactEntity() const
     return pGame->GetPools()->GetEntity(reinterpret_cast<DWORD*>(contactInterface));
 }
 
-CEntity* CPedSA::GetTargetedEntity() const
-{
-    CEntitySAInterface* targetInterface = GetPedInterface()->pTargetedEntity;
-    if (!targetInterface)
-        return nullptr;
-
-    return pGame->GetPools()->GetEntity(reinterpret_cast<DWORD*>(targetInterface));
-}
-
-void CPedSA::SetTargetedEntity(CEntity* targetEntity)
-{
-    GetPedInterface()->pTargetedEntity = targetEntity ? targetEntity->GetInterface() : nullptr;
-}
-
 void CPedSA::RemoveBodyPart(std::uint8_t boneID, std::uint8_t direction)
 {
     // char __thiscall CPed::RemoveBodyPart(CPed *this, int boneID, int localDir)

Client/game_sa/CPedSA.h

@@ -324,7 +324,7 @@ class CPedSAInterface : public CPhysicalSAInterface
     int                              unk_75C;
     std::uint8_t                     lastWeaponDamage;
     std::uint8_t                     unk_761[3];
-    CEntitySAInterface*              pTargetedEntity;
+    CEntitySAInterface*              lastDamagedEntity;
     std::int16_t                     unk_768;
 
     CVector                          vecTurretOffset;
@@ -424,9 +424,6 @@ class CPedSA : public virtual CPed, public virtual CPhysicalSA
 
     int GetRunState() const override { return GetPedInterface()->moveState; }
 
-    CEntity* GetTargetedEntity() const override;
-    void     SetTargetedEntity(CEntity* targetEntity) override;
-
     bool GetCanBeShotInVehicle() const override{ return GetPedInterface()->pedFlags.bCanBeShotInVehicle; }
     bool GetTestForShotInVehicle() const override { return GetPedInterface()->pedFlags.bTestForShotInVehicle; }
 

Client/game_sa/CPlayerPedSA.cpp

@@ -300,6 +300,20 @@ void CPlayerPedSA::SetMoveAnim(eMoveAnim iAnimGroup)
     }
 }
 
+CEntity* CPlayerPedSA::GetTargetedEntity() const
+{
+    CEntitySAInterface* targetInterface = GetPlayerPedInterface()->mouseTargetEntity;
+    if (!targetInterface)
+        return nullptr;
+
+    return pGame->GetPools()->GetEntity(reinterpret_cast<DWORD*>(targetInterface));
+}
+
+void CPlayerPedSA::SetTargetedEntity(CEntity* targetEntity)
+{
+    GetPlayerPedInterface()->mouseTargetEntity = targetEntity ? targetEntity->GetInterface() : nullptr;
+}
+
 ////////////////////////////////////////////////////////////////
 //
 // Hooks for CPlayerPedSA

Client/game_sa/CPlayerPedSA.h

@@ -28,10 +28,13 @@
 
 #define SIZEOF_CPLAYERPED               1956
 
-class CPlayerPedSAInterface : public CPedSAInterface            // CPlayerPed 1956 bytes in SA
+class CPlayerPedSAInterface : public CPedSAInterface
 {
 public:
+    CEntitySAInterface* mouseTargetEntity;
+    std::uint8_t        field_7A0[4];
 };
+static_assert(sizeof(CPlayerPedSAInterface) == 0x7A4, "Invalid size for CPlayerPedSAInterface");
 
 class CPlayerPedSA : public virtual CPlayerPed, public virtual CPedSA
 {
@@ -52,7 +55,10 @@ class CPlayerPedSA : public virtual CPlayerPed, public virtual CPedSA
     eMoveAnim GetMoveAnim();
     void      SetMoveAnim(eMoveAnim iAnimGroup);
 
-    CPlayerPedSAInterface* GetPlayerPedInterface() { return static_cast<CPlayerPedSAInterface*>(m_pInterface); };
+    CEntity* GetTargetedEntity() const override;
+    void SetTargetedEntity(CEntity* targetEntity) override;
+
+    CPlayerPedSAInterface* GetPlayerPedInterface() const noexcept { return static_cast<CPlayerPedSAInterface*>(m_pInterface); };
 
     static void StaticSetHooks();
 };

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp

@@ -14,16 +14,16 @@
 //
 
 IMPLEMENT_ENUM_BEGIN(eLuaType)
-ADD_ENUM(LUA_TNONE, "none")
-ADD_ENUM(LUA_TNIL, "nil")
-ADD_ENUM(LUA_TBOOLEAN, "boolean")
-ADD_ENUM(LUA_TLIGHTUSERDATA, "lightuserdata")
-ADD_ENUM(LUA_TNUMBER, "number")
-ADD_ENUM(LUA_TSTRING, "string")
-ADD_ENUM(LUA_TTABLE, "table")
-ADD_ENUM(LUA_TFUNCTION, "function")
-ADD_ENUM(LUA_TUSERDATA, "userdata")
-ADD_ENUM(LUA_TTHREAD, "thread")
+ADD_ENUM(static_cast<eLuaType>(LUA_TNONE), "none")
+ADD_ENUM(static_cast<eLuaType>(LUA_TNIL), "nil")
+ADD_ENUM(static_cast<eLuaType>(LUA_TBOOLEAN), "boolean")
+ADD_ENUM(static_cast<eLuaType>(LUA_TLIGHTUSERDATA), "lightuserdata")
+ADD_ENUM(static_cast<eLuaType>(LUA_TNUMBER), "number")
+ADD_ENUM(static_cast<eLuaType>(LUA_TSTRING), "string")
+ADD_ENUM(static_cast<eLuaType>(LUA_TTABLE), "table")
+ADD_ENUM(static_cast<eLuaType>(LUA_TFUNCTION), "function")
+ADD_ENUM(static_cast<eLuaType>(LUA_TUSERDATA), "userdata")
+ADD_ENUM(static_cast<eLuaType>(LUA_TTHREAD), "thread")
 IMPLEMENT_ENUM_END("lua-type")
 
 IMPLEMENT_ENUM_BEGIN(CGUIVerticalAlign)
@@ -715,15 +715,15 @@ IMPLEMENT_ENUM_CLASS_END("client-model-type")
 
 // Sound effects
 IMPLEMENT_ENUM_BEGIN(eSoundEffectType)
-ADD_ENUM(BASS_FX_DX8_CHORUS, "chorus")
-ADD_ENUM(BASS_FX_DX8_COMPRESSOR, "compressor")
-ADD_ENUM(BASS_FX_DX8_DISTORTION, "distortion")
-ADD_ENUM(BASS_FX_DX8_ECHO, "echo")
-ADD_ENUM(BASS_FX_DX8_FLANGER, "flanger")
-ADD_ENUM(BASS_FX_DX8_GARGLE, "gargle")
-ADD_ENUM(BASS_FX_DX8_I3DL2REVERB, "i3dl2reverb")
-ADD_ENUM(BASS_FX_DX8_PARAMEQ, "parameq")
-ADD_ENUM(BASS_FX_DX8_REVERB, "reverb")
+ADD_ENUM(static_cast<eSoundEffectType>(BASS_FX_DX8_CHORUS), "chorus")
+ADD_ENUM(static_cast<eSoundEffectType>(BASS_FX_DX8_COMPRESSOR), "compressor")
+ADD_ENUM(static_cast<eSoundEffectType>(BASS_FX_DX8_DISTORTION), "distortion")
+ADD_ENUM(static_cast<eSoundEffectType>(BASS_FX_DX8_ECHO), "echo")
+ADD_ENUM(static_cast<eSoundEffectType>(BASS_FX_DX8_FLANGER), "flanger")
+ADD_ENUM(static_cast<eSoundEffectType>(BASS_FX_DX8_GARGLE), "gargle")
+ADD_ENUM(static_cast<eSoundEffectType>(BASS_FX_DX8_I3DL2REVERB), "i3dl2reverb")
+ADD_ENUM(static_cast<eSoundEffectType>(BASS_FX_DX8_PARAMEQ), "parameq")
+ADD_ENUM(static_cast<eSoundEffectType>(BASS_FX_DX8_REVERB), "reverb")
 IMPLEMENT_ENUM_END("soundeffect-type")
 
 IMPLEMENT_ENUM_CLASS_BEGIN(eSoundEffectParams::Chorus)