summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-07-25 22:34:29 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-07-25 22:34:29 +0200
commit5acce16261606f06e39e09d0bd6ec0d95787ae38 (patch)
treed3b6a483930067302386dc3284dbd68326432bf3 /src/core
parentfixed dinput (diff)
downloadre3-5acce16261606f06e39e09d0bd6ec0d95787ae38.tar
re3-5acce16261606f06e39e09d0bd6ec0d95787ae38.tar.gz
re3-5acce16261606f06e39e09d0bd6ec0d95787ae38.tar.bz2
re3-5acce16261606f06e39e09d0bd6ec0d95787ae38.tar.lz
re3-5acce16261606f06e39e09d0bd6ec0d95787ae38.tar.xz
re3-5acce16261606f06e39e09d0bd6ec0d95787ae38.tar.zst
re3-5acce16261606f06e39e09d0bd6ec0d95787ae38.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/PlayerInfo.cpp9
-rw-r--r--src/core/PlayerInfo.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp
index 81c7a199..d9a4c0b0 100644
--- a/src/core/PlayerInfo.cpp
+++ b/src/core/PlayerInfo.cpp
@@ -1,7 +1,9 @@
#include "common.h"
#include "patcher.h"
+#include "PlayerPed.h"
#include "PlayerInfo.h"
#include "Frontend.h"
+#include "Vehicle.h"
WRAPPER void CPlayerInfo::MakePlayerSafe(bool) { EAXJMP(0x4A1400); }
WRAPPER void CPlayerInfo::LoadPlayerSkin() { EAXJMP(0x4A1700); }
@@ -12,3 +14,10 @@ void CPlayerInfo::SetPlayerSkin(char *skin)
strncpy(m_aSkinName, skin, 32);
LoadPlayerSkin();
}
+
+CVector& CPlayerInfo::GetPos()
+{
+ if (m_pPed->bInVehicle && m_pPed->m_pMyVehicle)
+ return m_pPed->m_pMyVehicle->GetPosition();
+ return m_pPed->GetPosition();
+}
diff --git a/src/core/PlayerInfo.h b/src/core/PlayerInfo.h
index d8128424..edcdad27 100644
--- a/src/core/PlayerInfo.h
+++ b/src/core/PlayerInfo.h
@@ -70,6 +70,7 @@ public:
void LoadPlayerSkin();
void AwardMoneyForExplosion(CVehicle *vehicle);
void SetPlayerSkin(char* skin);
+ CVector& GetPos();
};
static_assert(sizeof(CPlayerInfo) == 0x13C, "CPlayerInfo: error");