From 542a5393acae66a9add32c195939b058bf154b15 Mon Sep 17 00:00:00 2001 From: erorcun Date: Wed, 13 Jan 2021 03:08:50 +0300 Subject: Fix build without FIX_BUGS, divide to 0 fixes --- src/core/config.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/config.h b/src/core/config.h index 8e528a67..2ce692b5 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -238,12 +238,16 @@ enum Config { # define TIMEBARS // print debug timers #endif -#define FIX_BUGS // fixes bugs that we've came across during reversing, TODO: use this more +#define FIX_BUGS // fixes bugs that we've came across during reversing. You can undefine this only on release builds. //#define MORE_LANGUAGES // Add more translations to the game #define COMPATIBLE_SAVES // this allows changing structs while keeping saves compatible #define LOAD_INI_SETTINGS // as the name suggests. fundamental for CUSTOM_FRONTEND_OPTIONS #define FIX_HIGH_FPS_BUGS_ON_FRONTEND +#if defined(__LP64__) || defined(_WIN64) +#define FIX_BUGS_64 // Must have fixes to be able to run 64 bit build +#endif + // Just debug menu entries #ifdef DEBUGMENU #define RELOADABLES // some debug menu options to reload TXD files -- cgit v1.2.3 From 1b55a9956f6dbb2e89e739c133158aa6e08fc9e8 Mon Sep 17 00:00:00 2001 From: aap Date: Wed, 13 Jan 2021 12:31:23 +0100 Subject: some loose ends --- src/core/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/core') diff --git a/src/core/main.cpp b/src/core/main.cpp index d0663c30..a84bd495 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -1421,11 +1421,13 @@ Idle(void *arg) CSprite2d::InitPerFrame(); CFont::InitPerFrame(); + PUSH_MEMID(MEMID_GAME_PROCESS); CPointLights::InitPerFrame(); tbStartTimer(0, "CGame::Process"); CGame::Process(); tbEndTimer("CGame::Process"); + POP_MEMID(); tbStartTimer(0, "DMAudio.Service"); DMAudio.Service(); @@ -1447,6 +1449,8 @@ Idle(void *arg) if(arg == nil) return; + PUSH_MEMID(MEMID_RENDER); + if(!FrontEndMenuManager.m_bMenuActive && TheCamera.GetScreenFadeStatus() != FADE_2) { // This is from SA, but it's nice for windowed mode -- cgit v1.2.3 From e3a261d29cbb10abc0776ca697512349845a105c Mon Sep 17 00:00:00 2001 From: aap Date: Wed, 13 Jan 2021 13:01:20 +0100 Subject: rename m_vehEnterType -> m_vehDoor --- src/core/Camera.cpp | 2 +- src/core/PlayerInfo.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core') diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp index d245bb5a..992c7d74 100644 --- a/src/core/Camera.cpp +++ b/src/core/Camera.cpp @@ -2353,7 +2353,7 @@ CCamera::StartTransition(int16 newMode) while(deltaBeta < -PI) deltaBeta += 2*PI; deltaBeta = Abs(deltaBeta); - door = FindPlayerPed()->m_vehEnterType; + door = FindPlayerPed()->m_vehDoor; if(deltaBeta > HALFPI){ if(((CPed*)pTargetEntity)->m_carInObjective){ if(((CPed*)pTargetEntity)->m_carInObjective->IsUpsideDown()){ diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp index 7289175d..f0f3e2c6 100644 --- a/src/core/PlayerInfo.cpp +++ b/src/core/PlayerInfo.cpp @@ -390,8 +390,8 @@ CPlayerInfo::Process(void) m_pPed->SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, carBelow); } else if (carBelow->IsBoat()) { if (!carBelow->pDriver) { - m_pPed->m_vehEnterType = 0; - m_pPed->SetEnterCar(carBelow, m_pPed->m_vehEnterType); + m_pPed->m_vehDoor = 0; + m_pPed->SetEnterCar(carBelow, m_pPed->m_vehDoor); } } else { m_pPed->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, carBelow); -- cgit v1.2.3