From 4e3fc354019534f650a929e358e853a7f2055ee5 Mon Sep 17 00:00:00 2001 From: withmorten Date: Wed, 23 Jun 2021 20:50:02 +0200 Subject: add no-git-hash option to premake --- src/CMakeLists.txt | 1 + src/core/config.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6c8ab281..28090d7e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -50,6 +50,7 @@ if(LIBRW_PLATFORM_D3D9) endif() target_compile_definitions(${EXECUTABLE} PRIVATE CMAKE_BUILD) +target_compile_definitions(${EXECUTABLE} PRIVATE USE_OUR_VERSIONING) if(${PROJECT}_AUDIO STREQUAL "OAL") find_package(OpenAL REQUIRED) diff --git a/src/core/config.h b/src/core/config.h index 006ebad5..1c1d1985 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -195,7 +195,8 @@ enum Config { #define DRAW_GAME_VERSION_TEXT #ifdef DRAW_GAME_VERSION_TEXT // unlike R* development builds, ours has runtime switch on debug menu & .ini, and disabled as default. - #define USE_OUR_VERSIONING // If you disable this then game will fetch version from peds.col, as R* did while in development + // If you disable this then game will fetch version from peds.col, as R* did while in development. + //#define USE_OUR_VERSIONING // enabled from buildfiles by default #endif // Memory allocation and compression -- cgit v1.2.3 From 9382e86d38bf6fd4460bced0a76d7ca73bb3a31d Mon Sep 17 00:00:00 2001 From: erorcun Date: Fri, 25 Jun 2021 18:29:38 +0300 Subject: Fix Particle FPE --- src/render/Particle.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp index 14b48243..334ceb57 100644 --- a/src/render/Particle.cpp +++ b/src/render/Particle.cpp @@ -1880,11 +1880,20 @@ void CParticle::Render() if ( canDraw && psystem->Flags & DRAWTOP2D ) { - float screenZ = (particle->m_vecPosition.z - CDraw::GetNearClipZ()) + float screenZ; +#ifdef FIX_BUGS + bool zIsZero = true; + if ( particle->m_vecPosition.z != 0.0f ) { +#endif + screenZ = (particle->m_vecPosition.z - CDraw::GetNearClipZ()) * (CSprite::GetFarScreenZ() - CSprite::GetNearScreenZ()) * CDraw::GetFarClipZ() / ( (CDraw::GetFarClipZ() - CDraw::GetNearClipZ()) * particle->m_vecPosition.z ) + CSprite::GetNearScreenZ(); +#ifdef FIX_BUGS + zIsZero = false; + } +#endif float stretchTexW; float stretchTexH; @@ -1900,6 +1909,9 @@ void CParticle::Render() stretchTexH = CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.y + 63.0f; } +#ifdef FIX_BUGS + if (!zIsZero) { +#endif if ( i == PARTICLE_WATERDROP ) { @@ -2001,7 +2013,10 @@ void CParticle::Render() canDraw = false; } - +#ifdef FIX_BUGS + } + if ( !(zIsZero && (i == PARTICLE_WATERDROP || i == PARTICLE_BLOODDROP || i == PARTICLE_HEATHAZE_IN_DIST || i == PARTICLE_HEATHAZE) ) ) +#endif if ( canDraw ) { if ( particle->m_nRotation != 0 ) -- cgit v1.2.3 From 225530ef04c46fc2071225713576f15bc16dd874 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Sat, 26 Jun 2021 04:12:04 +0300 Subject: Fix premature CTimer calls --- src/core/Frontend.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 190cdf32..7491b7e2 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -2902,9 +2902,15 @@ CMenuManager::InitialiseChangedLanguageSettings() { if (m_bFrontEnd_ReloadObrTxtGxt) { m_bFrontEnd_ReloadObrTxtGxt = false; +#ifdef FIX_BUGS + if (gGameState > GS_INIT_ONCE) +#endif CTimer::Stop(); TheText.Unload(); TheText.Load(); +#ifdef FIX_BUGS + if (gGameState > GS_INIT_ONCE) +#endif CTimer::Update(); CGame::frenchGame = false; CGame::germanGame = false; -- cgit v1.2.3 From 9ab4f1a2d911635e6405b23202dd21f073537103 Mon Sep 17 00:00:00 2001 From: withmorten Date: Sat, 26 Jun 2021 13:13:43 +0200 Subject: fix screenshot name space --- src/core/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/core/main.cpp b/src/core/main.cpp index 4902c156..74b896c6 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -379,7 +379,7 @@ DoRWStuffEndOfFrame(void) } #else if (CPad::GetPad(1)->GetLeftShockJustDown() || CPad::GetPad(0)->GetFJustDown(11)) { - sprintf(s, "screen_%11lld.png", time(nil)); + sprintf(s, "screen_0%11lld.png", time(nil)); RwGrabScreen(Scene.camera, s); } #endif -- cgit v1.2.3 From 831737ecc84882fd2e42b17c65ade0ad434b1308 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Sat, 26 Jun 2021 14:25:40 +0300 Subject: Fixes --- src/control/Garages.cpp | 2 +- src/control/Script10.cpp | 2 +- src/control/Script3.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp index 0b65dde7..e7da2eff 100644 --- a/src/control/Garages.cpp +++ b/src/control/Garages.cpp @@ -2140,7 +2140,7 @@ void CStoredCar::StoreCar(CVehicle* pVehicle) m_nModelIndex = pVehicle->GetModelIndex(); m_fPosX = pVehicle->GetPosition().x; m_fPosY = pVehicle->GetPosition().y; - m_fPosY = pVehicle->GetPosition().z; + m_fPosZ = pVehicle->GetPosition().z; m_fForwardX = pVehicle->GetForward().x; m_fForwardY = pVehicle->GetForward().y; m_fForwardZ = pVehicle->GetForward().z; diff --git a/src/control/Script10.cpp b/src/control/Script10.cpp index c619a9dd..ce822505 100644 --- a/src/control/Script10.cpp +++ b/src/control/Script10.cpp @@ -278,7 +278,7 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command) CollectParameters(&m_nIp, 3); CPed* pPed = CPools::GetPedPool()->GetAt(GET_INTEGER_PARAM(0)); if (pPed) - pPed->SetWaitState((eWaitState)GET_INTEGER_PARAM(1), GET_INTEGER_PARAM(2) >= 0 ? (void*)GET_INTEGER_PARAM(2) : nil, true); + pPed->SetWaitState((eWaitState)GET_INTEGER_PARAM(1), GET_INTEGER_PARAM(2) >= 0 ? &GET_INTEGER_PARAM(2) : nil, true); return 0; } case COMMAND_REGISTER_BEST_TIME_GOGO_FAGGIO: diff --git a/src/control/Script3.cpp b/src/control/Script3.cpp index 64014ac8..b0f529c0 100644 --- a/src/control/Script3.cpp +++ b/src/control/Script3.cpp @@ -450,7 +450,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command) CollectParameters(&m_nIp, 2); CAutomobile* pCar = (CAutomobile*)CPools::GetVehiclePool()->GetAt(GET_INTEGER_PARAM(0)); script_assert(pCar); - script_assert(pCar->m_vehType == VEHICLE_TYPE_CAR); + //script_assert(pCar->m_vehType == VEHICLE_TYPE_CAR); UpdateCompareFlag(pCar->m_bombType == GET_INTEGER_PARAM(1)); return 0; } -- cgit v1.2.3