From f307839a2b9ee23a67ada9cff60fa6a1b9d2b708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Thu, 13 Feb 2020 02:33:21 +0300 Subject: CPlayerPed done --- src/core/Frontend.cpp | 2 +- src/core/Pad.h | 2 ++ src/core/Wanted.cpp | 1 + src/core/Wanted.h | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 113ae345..751ca23f 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -448,7 +448,7 @@ void CMenuManager::Draw() str = TheText.Get(aScreens[m_nCurrScreen].m_aEntries[0].m_EntryName); break; case MENUPAGE_SAVE_OVERWRITE_CONFIRM: - if (Slots[m_nCurrSaveSlot] == SLOT_EMPTY) + if (Slots[m_nCurrSaveSlot + 1] == SLOT_EMPTY) str = TheText.Get("FESZ_QZ"); else str = TheText.Get(aScreens[m_nCurrScreen].m_aEntries[0].m_EntryName); diff --git a/src/core/Pad.h b/src/core/Pad.h index 03b734cb..f4a07cae 100644 --- a/src/core/Pad.h +++ b/src/core/Pad.h @@ -389,6 +389,8 @@ public: bool GetRightShoulder1JustDown() { return !!(NewState.RightShoulder1 && !OldState.RightShoulder1); } bool GetRightShoulder2JustDown() { return !!(NewState.RightShoulder2 && !OldState.RightShoulder2); } bool GetStartJustDown() { return !!(NewState.Start && !OldState.Start); } + bool GetLeftStickXJustDown() { return !!(NewState.LeftStickX && !OldState.LeftStickX); } + bool GetLeftStickYJustDown() { return !!(NewState.LeftStickY && !OldState.LeftStickY); } bool GetTriangle() { return !!NewState.Triangle; } bool GetCircle() { return !!NewState.Circle; } diff --git a/src/core/Wanted.cpp b/src/core/Wanted.cpp index bafe0ae1..7af753e8 100644 --- a/src/core/Wanted.cpp +++ b/src/core/Wanted.cpp @@ -13,6 +13,7 @@ int32 &CWanted::MaximumWantedLevel = *(int32*)0x5F7714; // 6 int32 &CWanted::nMaximumWantedLevel = *(int32*)0x5F7718; // 6400 WRAPPER void CWanted::Reset() { EAXJMP(0x4AD790) }; +WRAPPER void CWanted::Update() { EAXJMP(0x4AD7B0) }; void CWanted::Initialise() diff --git a/src/core/Wanted.h b/src/core/Wanted.h index c908a4e5..f6dbe8d0 100644 --- a/src/core/Wanted.h +++ b/src/core/Wanted.h @@ -78,6 +78,7 @@ public: void ReportCrimeNow(eCrimeType type, const CVector &coors, bool policeDoesntCare); void UpdateWantedLevel(); void Reset(); + void Update(); bool IsIgnored(void) { return m_bIgnoredByCops || m_bIgnoredByEveryone; } -- cgit v1.2.3