Merge branch 'master' into attach

Author: Nico8340

Client/core/CCommands.cpp

@@ -125,6 +125,7 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
 
     // Grab the command
     tagCOMMANDENTRY* pEntry = Get(szCommand);
+    bool             wasHandled = false;
     if (pEntry)
     {
         // If its a core command, or if its enabled
@@ -133,14 +134,16 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
             // Execute it
             if (!bIsScriptedBind || pEntry->bAllowScriptedBind)
                 ExecuteHandler(pEntry->pfnCmdFunc, szParameters);
-            return true;
+
+            wasHandled = true;
         }
     }
 
     // Recompose the original command text
     std::string val = std::string(szCommand) + " " + std::string(szParameters ? szParameters : "");
 
     // Is it a cvar? (syntax: cvar[ = value])
+    if (!wasHandled)
     {
         // Check to see if '=' exists
         unsigned int nOpIndex = val.find('=');
@@ -188,7 +191,7 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
 
     // HACK: if its a 'nick' command, save it here
     bool bIsNickCommand = !stricmp(szCommand, "nick");
-    if (bIsNickCommand && szParameters && !bIsScriptedBind)
+    if (!wasHandled && bIsNickCommand && szParameters && !bIsScriptedBind)
     {
         if (CCore::GetSingleton().IsValidNick(szParameters))
         {
@@ -208,10 +211,14 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
     // Try to execute the handler
     if (m_pfnExecuteHandler)
     {
-        if (m_pfnExecuteHandler(szCommand, szParameters, bHandleRemotely, (pEntry != NULL), bIsScriptedBind))
+        bool bAllowScriptedBind = (!pEntry || pEntry->bAllowScriptedBind);
+        if (m_pfnExecuteHandler(szCommand, szParameters, bHandleRemotely, wasHandled, bIsScriptedBind, bAllowScriptedBind))
             return true;
     }
 
+    if (wasHandled)
+        return true;
+
     // Unknown command
     val = _("Unknown command or cvar: ") + szCommand;
     if (!bIsScriptedBind && !bIsNickCommand && pEntry == nullptr)

Client/core/CKeyBinds.cpp

@@ -841,7 +841,8 @@ CCommandBind* CKeyBinds::FindCommandMatch(const char* szKey, const char* szComma
     NullEmptyStrings(szKey, szArguments, szResource, szOriginalScriptKey);
 
     std::string arguments = szArguments ? szArguments : "";
-    szArguments = SharedUtil::Trim(arguments.data());
+    if (!arguments.empty())
+        szArguments = SharedUtil::Trim(arguments.data());
 
     for (KeyBindPtr& bind : m_binds)
     {

Client/game_sa/CBuildingRemovalSA.cpp

@@ -716,4 +716,10 @@ void CBuildingRemovalSA::DropCaches()
 
     m_pBinaryBuildings->clear();
     m_pDataBuildings->clear();
+
+    for (auto &pRemoval : *m_pBuildingRemovals)
+    {
+        pRemoval.second->m_pDataRemoveList->clear();
+        pRemoval.second->m_pBinaryRemoveList->clear();
+    }
 }

Client/game_sa/CCameraSA.cpp

@@ -443,3 +443,18 @@ float CCameraSA::GetShakeForce()
     CCameraSAInterface* pCameraInterface = GetInterface();
     return pCameraInterface->m_fCamShakeForce;
 }
+
+void CCameraSA::ShakeCamera(float radius, float x, float y, float z) noexcept
+{
+    static CCameraSAInterface* cameraInterface = GetInterface();
+    if (radius <= 0.0f)
+        return ResetShakeCamera();
+
+    using ShakeCamera_t = void(__thiscall*)(CCameraSAInterface*, float radius, float x, float y, float z);
+    ((ShakeCamera_t)FUNC_ShakeCam)(cameraInterface, radius, x, y, z);
+}
+
+void CCameraSA::ResetShakeCamera() noexcept
+{
+    GetInterface()->m_fCamShakeForce = 0.0f;
+}

Client/game_sa/CCameraSA.h

@@ -27,6 +27,7 @@
 #define FUNC_GetFading                      0x50ADE0
 #define FUNC_Fade                           0x50AC20
 #define FUNC_SetFadeColour                  0x50BF00
+#define FUNC_ShakeCam                       0x50A9F0
 
 #define VAR_CameraRotation                  0xB6F178 // used for controling where the player faces
 #define VAR_VehicleCameraView               0xB6F0DC
@@ -426,4 +427,7 @@ class CCameraSA : public CCamera
     void      RestoreLastGoodState();
     void      SetShakeForce(float fShakeForce);
     float     GetShakeForce();
+
+    void ShakeCamera(float radius, float x, float y, float z) noexcept override;
+    void ResetShakeCamera() noexcept override;
 };

Client/game_sa/CCarEnterExitSA.cpp

@@ -78,6 +78,19 @@ bool CCarEnterExitSA::GetNearestCarPassengerDoor(CPed* pPed, CVehicle* pVehicle,
     return bReturn;
 }
 
+void CCarEnterExitSA::GetPositionToOpenCarDoor(CVector& position, CVehicle* vehicle, std::uint32_t door) const noexcept
+{
+    CVehicleSA* vehicleSA = dynamic_cast<CVehicleSA*>(vehicle);
+
+    if (!vehicleSA)
+        return;
+
+    CVehicleSAInterface* vehicleInterface = vehicleSA->GetVehicleInterface();
+
+    auto CCarEnterExit_GetPositionToOpenCarDoor = (void(__cdecl*)(CVector&, CVehicleSAInterface*, int))FUNC_GetPositionToOpenCarDoor;
+    CCarEnterExit_GetPositionToOpenCarDoor(position, vehicleInterface, door);
+}
+
 int CCarEnterExitSA::ComputeTargetDoorToExit(CPed* pPed, CVehicle* pVehicle)
 {
     DWORD dwFunc = FUNC_ComputeTargetDoorToExit;

Client/game_sa/CCarEnterExitSA.h

@@ -17,12 +17,14 @@
 #define FUNC_GetNearestCarPassengerDoor         0x650BB0
 #define FUNC_ComputeTargetDoorToExit            0x64F110
 #define FUNC_IsRoomForPedToLeaveCar             0x6504C0
+#define FUNC_GetPositionToOpenCarDoor           0x64E740
 
 class CCarEnterExitSA : public CCarEnterExit
 {
 public:
     bool GetNearestCarDoor(CPed* pPed, CVehicle* pVehicle, CVector* pVector, int* pDoor);
     bool GetNearestCarPassengerDoor(CPed* pPed, CVehicle* pVehicle, CVector* pVector, int* pDoor, bool bUnknown, bool bUnknown2, bool bCheckIfRoomToGetIn);
+    void GetPositionToOpenCarDoor(CVector& position, CVehicle* vehicle, std::uint32_t door) const noexcept;
     int  ComputeTargetDoorToExit(CPed* pPed, CVehicle* pVehicle);
     bool IsRoomForPedToLeaveCar(CVehicle* pVehicle, int iDoor, CVector* pUnknown = 0);
 };

Client/game_sa/CCheckpointSA.cpp

@@ -13,6 +13,10 @@
 #include "C3DMarkerSA.h"
 #include "C3DMarkersSA.h"
 #include "CCheckpointSA.h"
+#include "CCheckpointsSA.h"
+#include "CGameSA.h"
+
+extern CGameSA* pGame;
 
 void CCheckpointSA::SetPosition(CVector* vecPosition)
 {
@@ -132,3 +136,39 @@ void CCheckpointSA::Remove()
     GetInterface()->m_nType = 257;
     GetInterface()->rwColour = 0;
 }
+
+void CCheckpointSA::SetTargetArrowData(const SColor color, float size) noexcept
+{
+    m_targetArrowColor = color;
+    m_targetArrowSize = size;
+}
+
+static void __cdecl RenderTargetArrow(CCheckpointSAInterface* pCheckpoint)
+{
+    CCheckpoint* checkpoint = pGame->GetCheckpoints()->FindMarker(pCheckpoint->m_nIdentifier);
+    if (!checkpoint)
+        return;
+
+    CVector* position = checkpoint->GetPosition();
+    CVector* direction = checkpoint->GetPointDirection();
+    SColor   color = checkpoint->GetTargetArrowColor();
+
+    ((void(__cdecl*)(float, float, float, float, std::uint8_t, std::uint8_t, std::uint8_t, std::uint8_t, float, float, float))C3dMarkers_DirectionArrowSet)(position->fX, position->fY, position->fZ, checkpoint->GetTargetArrowSize(), color.R, color.G, color.B, color.A, -direction->fX, -direction->fY, -direction->fZ);
+}
+
+static void _declspec(naked) HOOK_CCheckpoint__Render()
+{
+    _asm {
+        pushad
+        push esi
+        call RenderTargetArrow
+        add esp, 4
+        popad
+        jmp RETURN_CCheckpoint__Render
+    }
+}
+
+void CCheckpointSA::StaticSetHooks()
+{
+    EZHookInstall(CCheckpoint__Render);
+}

Client/game_sa/CCheckpointSA.h

@@ -14,6 +14,12 @@
 #include <CVector.h>
 #include <game/CCheckpoint.h>
 
+#define HOOKPOS_CCheckpoint__Render  0x725E56
+#define HOOKSIZE_CCheckpoint__Render 0x5
+static constexpr std::uint32_t RETURN_CCheckpoint__Render = 0x725E5B;
+
+#define C3dMarkers_DirectionArrowSet 0x721140
+
 class CCheckpointSAInterface
 {
 public:
@@ -36,12 +42,16 @@ class CCheckpointSA : public CCheckpoint
 {
 private:
     CCheckpointSAInterface* internalInterface;
+    SColor                  m_targetArrowColor{0xFFFF4040};
+    float                   m_targetArrowSize{0.625f};
 
 public:
     CCheckpointSA(CCheckpointSAInterface* checkpointInterface) { internalInterface = checkpointInterface; };
 
     CCheckpointSAInterface* GetInterface() { return internalInterface; }
 
+    static void StaticSetHooks();
+
     void               SetPosition(CVector* vecPosition);
     CVector*           GetPosition();
     void               SetPointDirection(CVector* vecPointDirection);
@@ -62,4 +72,7 @@ class CCheckpointSA : public CCheckpoint
     void               SetPulseFraction(float fPulseFraction);            // doesn't work propperly (not virtualed)
     float              GetPulseFraction();
     void               Remove();
+    SColor             GetTargetArrowColor() const noexcept override { return m_targetArrowColor; };
+    float              GetTargetArrowSize() const noexcept override { return m_targetArrowSize; };
+    void               SetTargetArrowData(const SColor color, float size) noexcept;
 };

Client/game_sa/CCheckpointsSA.cpp

@@ -66,3 +66,14 @@ CCheckpoint* CCheckpointsSA::FindFreeMarker()
     }
     return NULL;
 }
+
+CCheckpoint* CCheckpointsSA::FindMarker(DWORD identifier)
+{
+    for (CCheckpointSA* checkpoint : Checkpoints)
+    {
+        if (checkpoint->GetIdentifier() == identifier)
+            return checkpoint;
+    }
+
+    return nullptr;
+}