Update IV

DK22Pac · Nov 4, 2023 · 6033510 · 6033510
1 parent 076d687
commit 6033510
Show file tree

Hide file tree

Showing 151 changed files with 136,644 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,6 @@ nbproject
 vsproject
 Makefile
 output
-DXSDK
 generated/
 
 ### Eclipse ###

diff --git a/plugin_IV/game_IV/CCamIdle.cpp b/plugin_IV/game_IV/CCamIdle.cpp
@@ -0,0 +1,17 @@
+/*
+    Plugin-SDK (Grand Theft Auto IV) source file
+    Authors: GTA Community. See more here
+    https://github.com/DK22Pac/plugin-sdk
+    Do not delete this comment block. Respect others' work!
+*/
+#include "CCamIdle.h"
+
+static uint32_t CCam__ResetStatsAddr;
+void CCamIdle::ResetStats(bool unused) {
+    plugin::CallMethodDyn(CCam__ResetStatsAddr, this, unused);
+}
+
+template<>
+void plugin::InitPatterns<CCamIdle>() {
+    CCam__ResetStatsAddr = plugin::GetPattern("C7 81 ? ? ? ? ? ? ? ? C7 81 ? ? ? ? ? ? ? ? C7 81 ? ? ? ? ? ? ? ? C7 81 ? ? ? ? ? ? ? ? C7 81 ? ? ? ? ? ? ? ? C7 81 ? ? ? ? ? ? ? ? C7 81 ? ? ? ? ? ? ? ? 80 A1 ? ? ? ? ? 8B 81", 0);
+}
diff --git a/plugin_IV/game_IV/CCamIdle.h b/plugin_IV/game_IV/CCamIdle.h
@@ -0,0 +1,18 @@
+/*
+    Plugin-SDK (Grand Theft Auto IV) 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 "Rage.h"
+#include "CCam.h"
+
+class CCamIdle : CCam {
+public:
+
+public:
+    void ResetStats(bool unused);
+
+};
diff --git a/plugin_IV/game_IV/CEntity.h b/plugin_IV/game_IV/CEntity.h
@@ -128,8 +128,8 @@ class CEntity : CVirtualBase {
     void CleanUpOldReference(void* object);
 
 public:
-    void Teleport(rage::Matrix44* mat, int32_t dontUpdatePhysicsMatrix, bool clearTasks) { plugin::CallVirtualMethod<1>(this, mat, dontUpdatePhysicsMatrix, clearTasks); }
-    void Teleport(rage::Vector4* pos, int32_t dontUpdatePhysicsMatrix, bool clearTasks) { plugin::CallVirtualMethod<2>(this, pos, dontUpdatePhysicsMatrix, clearTasks); }
+    void Teleport(rage::Matrix44* mat, int32_t dontUpdatePhysicsMatrix, bool immediately) { plugin::CallVirtualMethod<1>(this, mat, dontUpdatePhysicsMatrix, immediately); }
+    void Teleport(rage::Vector4* pos, int32_t dontUpdatePhysicsMatrix, bool immediately) { plugin::CallVirtualMethod<2>(this, pos, dontUpdatePhysicsMatrix, immediately); }
 };
 
 VALIDATE_SIZE(CEntity, 0x70);
diff --git a/plugin_IV/game_IV/CPed.h b/plugin_IV/game_IV/CPed.h
@@ -300,8 +300,8 @@ class CPed : public CPhysical {
     // Ped Flags 4
     uint32_t m_bPedFlags4_1 : 1;
     uint32_t m_bPedFlags4_2 : 1;
+    uint32_t m_bPedFlags4_3 : 1;
     uint32_t m_bInVehicle : 1;
-    uint32_t m_bPedFlags4_4 : 1;
     uint32_t m_bPedFlags4_5 : 1;
     uint32_t m_bPedFlags4_6 : 1;
     uint32_t m_bPedFlags4_7 : 1;

diff --git a/plugin_IV/game_IV/Rage.h b/plugin_IV/game_IV/Rage.h
@@ -725,7 +725,7 @@ namespace rage {
         }
     };
 
-    Vector3 operator*(const Matrix44& mat, const Vector3& vec) {
+    static inline Vector3 operator*(const Matrix44& mat, const Vector3& vec) {
         return Vector3(mat.right.x * vec.x + mat.up.x * vec.y + mat.at.x * vec.z + mat.pos.x,
                        mat.right.y * vec.x + mat.up.y * vec.y + mat.at.y * vec.z + mat.pos.y,
                        mat.right.z * vec.x + mat.up.z * vec.y + mat.at.z * vec.z + mat.pos.z);

diff --git a/shared/Events.cpp b/shared/Events.cpp
@@ -377,7 +377,7 @@ StdcallEvent <AddressList<0x45C2DB, H_CALL>, PRIORITY_AFTER, ArgPickNone, void()
 ThiscallEvent <AddressList<0x45C20D, H_CALL>, PRIORITY_AFTER, ArgPickN<CPlayerPed*, 0>, void(CPlayerPed*)> plugin::Events::processPlayerPedEvent;
 #endif
 #ifdef GTAIV
-CdeclEvent <AddressList<0xB1E6F5, H_CALL>, PRIORITY_AFTER, ArgPickNone, void()> plugin::Events::initGameEvent;
+CdeclEvent <AddressList<0x5C12AD, H_CALL>, PRIORITY_AFTER, ArgPickNone, void(const char*)> plugin::Events::initGameEvent;
 CdeclEvent <AddressList<0x5C2B7A, H_CALL>, PRIORITY_AFTER, ArgPickNone, void()> plugin::Events::gameProcessEvent;
 CdeclEvent <AddressList<0x5A9107, H_CALL>, PRIORITY_AFTER, ArgPickNone, uint32_t()> plugin::Events::drawMenuEvent;
 CdeclEvent <AddressList<0xB01893, H_CALL>, PRIORITY_AFTER, ArgPickNone, uint32_t()> plugin::Events::drawingEvent;
@@ -393,7 +393,7 @@ ThiscallEvent <AddressList<0xA3DAB0, H_CALL, 0xA3DB13, H_CALL>, PRIORITY_BEFORE,
 template<>
 void plugin::InitPatterns<CallingConventions>() {
 #ifdef GTAIV
-    plugin::Events::initGameEvent.SetRefAddr(plugin::GetPattern("E8 ? ? ? ? E8 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ? 8B 0D ? ? ? ? E8", 0));
+    plugin::Events::initGameEvent.SetRefAddr(plugin::GetPattern("E8 ? ? ? ? 83 C4 04 E8 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ? E8", 0));
     plugin::Events::gameProcessEvent.SetRefAddr(plugin::GetPattern("E8 ? ? ? ? 80 3D ? ? ? ? ? 74 09 C6 05", 0));
     plugin::Events::drawMenuEvent.SetRefAddr(plugin::GetPattern("E8 ? ? ? ? 80 3D ? ? ? ? ? 74 23 A1 ? ? ? ? 83 F8 22", 0));
     plugin::Events::drawingEvent.SetRefAddr(plugin::GetPattern("E8 ? ? ? ? E8 ? ? ? ? 83 3D ? ? ? ? ? 74 6B", 0));

diff --git a/shared/Events.h b/shared/Events.h
@@ -434,7 +434,7 @@ extern ThiscallEvent <AddressList<0x45C20D, H_CALL>, PRIORITY_AFTER, ArgPickN<CP
 #ifdef GTAIV
 class CBaseDC;
 class CAutomobile;
-extern CdeclEvent <AddressList<0xB1E6F5, H_CALL>, PRIORITY_AFTER, ArgPickNone, void()> initGameEvent;
+extern CdeclEvent <AddressList<0x5C12AD, H_CALL>, PRIORITY_AFTER, ArgPickNone, void(const char*)> initGameEvent;
 extern CdeclEvent <AddressList<0x5C2B7A, H_CALL>, PRIORITY_AFTER, ArgPickNone, void()> gameProcessEvent;
 extern CdeclEvent <AddressList<0x5A9107, H_CALL>, PRIORITY_AFTER, ArgPickNone, uint32_t()> drawMenuEvent;
 extern CdeclEvent <AddressList<0xB01893, H_CALL>, PRIORITY_AFTER, ArgPickNone, uint32_t()> drawingEvent;