Merge remote-tracking branch 'origin/dev' into dev

altmp · Sep 22, 2023 · 12bf528 · 12bf528
2 parents 81c8e2e + 460ad87
commit 12bf528
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/c-api/cache/CachedPlayer.h b/c-api/cache/CachedPlayer.h
@@ -601,6 +601,11 @@ namespace cache
 
         std::string GetTaskData() const override { return ""; }
 
+        std::string _taskData;
+        std::string GetTaskData() const override {
+            return _taskData;
+        }
+
 #endif
 
     };

diff --git a/cpp-sdk b/cpp-sdk
+3 −0		SDK.h
+4 −0		events/CEvent.h
+40 −0		events/CPedDamageEvent.h
+34 −0		events/CPedDeathEvent.h
+41 −0		events/CPedHealEvent.h
+1 −0		objects/IPlayer.h