Merge pull request #260 from ANTINICKNAMES/master

Update CObject & CProjectile. Add CPedDamageResponse and CPedDamageResponseCalculator

Author: gennariarmando

plugin_sa/game_sa/CObject.cpp

@@ -6,6 +6,30 @@
 */
 #include "CObject.h"
 
+void* CObject::operator new(unsigned int size) {
+    return plugin::CallAndReturn<void*, 0x5A1EE0, unsigned int>(size);
+}
+
+void* CObject::operator new(unsigned int size, int poolRef) {
+    return plugin::CallAndReturn<void*, 0x5A1EF0, unsigned int, int>(size, poolRef);
+}
+
+void CObject::operator delete(void* data) {
+    plugin::Call<0x5A1F20, void*>(data);
+}
+
+CObject::CObject() : CPhysical(plugin::dummy) {
+    plugin::CallMethod<0x5A1D10, CObject*>(this);
+}
+
+CObject::~CObject() {
+    plugin::CallMethod<0x59F660, CObject*>(this);
+}
+
+void CObject::SetIsStatic(bool isStatic) {
+    plugin::CallMethod<0x5A0760, CObject*, bool>(this, isStatic);
+}
+
 // Converted from thiscall void CObject::ProcessGarageDoorBehaviour(void) 0x44A4D0
 void CObject::ProcessGarageDoorBehaviour() {
     ((void(__thiscall *)(CObject*))0x44A4D0)(this);

plugin_sa/game_sa/CObject.h

@@ -11,6 +11,7 @@
 #include "CObjectInfo.h"
 
 enum eObjectType {
+    OBJECT_UNKNOWN,
     OBJECT_MISSION = 2,
     OBJECT_TEMPORARY = 3,
     OBJECT_MISSION2 = 6
@@ -85,6 +86,12 @@ class CObject : public CPhysical {
 
     // class functions
 
+    static void* operator new(unsigned int size);
+    static void* operator new(unsigned int size, int poolRef);
+    static void operator delete(void* data);
+    CObject();
+    ~CObject();
+    void SetIsStatic(bool isStatic);
     void ProcessGarageDoorBehaviour();
     bool CanBeDeleted();
     void SetRelatedDummy(CDummyObject* relatedDummy);

plugin_sa/game_sa/CPedDamageResponse.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "PluginBase.h"
+
+class CPedDamageResponse {
+public:
+    float m_fDamageHealth;
+    float m_fDamageArmor;
+    bool  m_bHealthZero;
+    bool  m_bForceDeath;
+    bool  m_bDamageCalculated;
+    bool  m_bCheckIfAffectsPed;
+
+    inline CPedDamageResponse() {
+        m_fDamageHealth = 0.0f;
+        m_fDamageArmor = 0.0f;
+        m_bHealthZero = false;
+        m_bForceDeath = false;
+        m_bDamageCalculated = false;
+        m_bCheckIfAffectsPed = false;
+    }
+};
+
+VALIDATE_SIZE(CPedDamageResponse, 0xC);

plugin_sa/game_sa/CPedDamageResponseCalculator.cpp

@@ -0,0 +1,40 @@
+/*
+    Plugin-SDK (Grand Theft Auto San Andreas) source file
+    Authors: GTA Community. See more here
+    https://github.com/DK22Pac/plugin-sdk
+    Do not delete this comment block. Respect others' work!
+*/
+#include "CPedDamageResponseCalculator.h"
+
+float& CPedDamageResponseCalculator::ms_damageFactor = *(float*)0x8A6260; // 5555.5498
+
+// 0x4AD3F0
+CPedDamageResponseCalculator::CPedDamageResponseCalculator(CEntity* entity, float fDamage, eWeaponType weaponType, uint8_t bodyPart, bool bSpeak) {
+    ((void(__thiscall*)(CPedDamageResponseCalculator*, CEntity*, float, eWeaponType, uint8_t, bool))0x4AD3F0)(this, entity, fDamage, weaponType, bodyPart, bSpeak);
+}
+
+// 0x4AD430
+void CPedDamageResponseCalculator::AccountForPedDamageStats(CPed* ped, CPedDamageResponse& response) {
+    plugin::CallMethod<0x4AD430, CPedDamageResponseCalculator*, CPed*, CPedDamageResponse&>(this, ped, response);
+}
+
+// 0x4AD550
+void CPedDamageResponseCalculator::AccountForPedArmour(CPed* ped, CPedDamageResponse& response) {
+    plugin::CallMethod<0x4AD550, CPedDamageResponseCalculator*, CPed*, CPedDamageResponse&>(this, ped, response);
+}
+
+// 0x4AD610
+bool CPedDamageResponseCalculator::ComputeWillForceDeath(CPed* ped, CPedDamageResponse& response) {
+    return plugin::CallMethodAndReturn<bool, 0x4AD610, CPedDamageResponseCalculator*, CPed*, CPedDamageResponse&>(this, ped, response);
+}
+
+// 0x4B3210
+void CPedDamageResponseCalculator::ComputeWillKillPed(CPed* ped, CPedDamageResponse& response, bool bSpeak) {
+    plugin::CallMethod<0x4B3210, CPedDamageResponseCalculator*>(this, ped, response, bSpeak);
+}
+
+// 0x4B5AC0
+void CPedDamageResponseCalculator::ComputeDamageResponse(CPed* ped, CPedDamageResponse& response, bool bSpeak)
+{
+    plugin::CallMethod<0x4B5AC0, CPedDamageResponseCalculator*, CPed*, CPedDamageResponse&, bool>(this, ped, response, bSpeak);
+}

plugin_sa/game_sa/CPedDamageResponseCalculator.h

@@ -0,0 +1,37 @@
+/*
+    Plugin-SDK (Grand Theft Auto San Andreas) header file
+    Authors: GTA Community. See more here
+    https://github.com/DK22Pac/plugin-sdk
+    Do not delete this comment block. Respect others' work!
+*/
+#pragma once
+
+#include "PluginBase.h"
+#include "CPedDamageResponse.h"
+#include "eWeaponType.h"
+
+class CEntity;
+class CPed;
+
+class PLUGIN_API CPedDamageResponseCalculator
+{
+public:
+    const CEntity* m_pDamager;
+    float          m_fDamageFactor;
+    uint8_t        m_bodyPart;
+    eWeaponType    m_weaponType;
+    bool           m_bSpeak;
+
+    static float& ms_damageFactor;
+
+    CPedDamageResponseCalculator(CEntity* entity, float fDamage, eWeaponType weaponType, uint8_t bodyPart, bool bSpeak);
+
+public:
+    void AccountForPedDamageStats(CPed* ped, CPedDamageResponse& response);
+    void AccountForPedArmour(CPed* ped, CPedDamageResponse& response);
+    bool ComputeWillForceDeath(CPed* ped, CPedDamageResponse& response);
+    void ComputeWillKillPed(CPed* ped, CPedDamageResponse& response, bool bSpeak);
+    void ComputeDamageResponse(CPed* ped, CPedDamageResponse& response, bool bSpeak);
+};
+
+VALIDATE_SIZE(CPedDamageResponseCalculator, 0x14);

plugin_sa/game_sa/CProjectile.cpp

@@ -4,4 +4,9 @@
     https://github.com/DK22Pac/plugin-sdk
     Do not delete this comment block. Respect others' work!
 */
-#include "CProjectile.h"
+#include "CProjectile.h"
+
+// Converted from thiscall void CProjectile::CProjectile(int) 0x5A4030
+CProjectile::CProjectile(int index) {
+    plugin::CallMethod<0x5A4030, CProjectile*, int>(this, index);
+}

plugin_sa/game_sa/CProjectile.h

@@ -11,6 +11,7 @@
 
 class PLUGIN_API CProjectile : public CObject {
 public:
+    CProjectile(int index);
 };
 
 VALIDATE_SIZE(CProjectile, 0x17C);