summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/Cam.cpp13
-rw-r--r--src/core/Camera.cpp20
-rw-r--r--src/core/Camera.h1
-rw-r--r--src/core/Frontend.cpp23
-rw-r--r--src/core/Frontend.h1
-rw-r--r--src/entities/Physical.cpp4
-rw-r--r--src/modelinfo/VehicleModelInfo.cpp2
-rw-r--r--src/peds/CopPed.cpp2
-rw-r--r--src/render/2dEffect.h6
-rw-r--r--src/render/Clouds.cpp15
-rw-r--r--src/render/Rubbish.cpp12
-rw-r--r--src/render/Skidmarks.cpp9
-rw-r--r--src/weapons/WeaponEffects.cpp3
13 files changed, 109 insertions, 2 deletions
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index 07dc2051..505f838f 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -2545,11 +2545,13 @@ CCam::Process_M16_1stPerson(const CVector &CameraTarget, float, float, float)
ResetStatics = false;
}
+#ifndef GTA3_1_1_PATCH
((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(&HeadPos, PED_HEAD);
Source = HeadPos;
Source.z += 0.1f;
Source.x -= 0.19f*Cos(m_fInitialPlayerOrientation);
Source.y -= 0.19f*Sin(m_fInitialPlayerOrientation);
+#endif
// Look around
bool UseMouse = false;
@@ -2578,6 +2580,17 @@ CCam::Process_M16_1stPerson(const CVector &CameraTarget, float, float, float)
if(Alpha > DEGTORAD(60.0f)) Alpha = DEGTORAD(60.0f);
if(Alpha < -DEGTORAD(89.5f)) Alpha = -DEGTORAD(89.5f);
+#ifdef GTA3_1_1_PATCH
+ HeadPos.x = 0.0f;
+ HeadPos.y = 0.0f;
+ HeadPos.z = 0.0f;
+ ((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(&HeadPos, PED_HEAD);
+ Source = HeadPos;
+ Source.z += 0.1f;
+ Source.x -= 0.19f * Cos(m_fInitialPlayerOrientation);
+ Source.y -= 0.19f * Sin(m_fInitialPlayerOrientation);
+#endif
+
TargetCoors.x = 3.0f * Cos(Alpha) * Cos(Beta) + Source.x;
TargetCoors.y = 3.0f * Cos(Alpha) * Sin(Beta) + Source.y;
TargetCoors.z = 3.0f * Sin(Alpha) + Source.z;
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 6747ebf5..202d481d 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -71,11 +71,27 @@ bool bDidWeProcessAnyCinemaCam;
#define CTRLDOWN(key) ((KEYDOWN(rsLCTRL) || KEYDOWN(rsRCTRL)) && KEYDOWN((RsKeyCodes)key))
#endif
+CCamera::CCamera(void)
+{
+#ifdef GTA3_1_1_PATCH
+ m_fMouseAccelHorzntl = 0.0025f;
+ m_fMouseAccelVertical = 0.003f;
+#endif
+ Init();
+}
+
void
CCamera::Init(void)
{
+#ifdef GTA3_1_1_PATCH
+ float fMouseAccelHorzntl = m_fMouseAccelHorzntl;
+ float fMouseAccelVertical = m_fMouseAccelVertical;
+#endif
memset(this, 0, sizeof(CCamera)); // getting rid of vtable, eh?
-
+#ifdef GTA3_1_1_PATCH
+ m_fMouseAccelHorzntl = fMouseAccelHorzntl;
+ m_fMouseAccelVertical = fMouseAccelVertical;
+#endif
m_pRwCamera = nil;
m_1rstPersonRunCloseToAWall = false;
m_fPositionAlongSpline = 0.0f;
@@ -191,8 +207,10 @@ CCamera::Init(void)
m_uiTransitionState = 0;
m_uiTimeTransitionStart = 0;
m_bLookingAtPlayer = true;
+#ifndef GTA3_1_1_PATCH
m_fMouseAccelHorzntl = 0.0025f;
m_fMouseAccelVertical = 0.003f;
+#endif
m_f3rdPersonCHairMultX = 0.53f;
m_f3rdPersonCHairMultY = 0.4f;
}
diff --git a/src/core/Camera.h b/src/core/Camera.h
index d1c8ec03..6d53f417 100644
--- a/src/core/Camera.h
+++ b/src/core/Camera.h
@@ -546,6 +546,7 @@ uint32 unknown; // some counter having to do with music
#endif
// High level and misc
+ CCamera(void);
void Init(void);
void Process(void);
void CamControl(void);
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 6fe06d96..0a2903b7 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -2954,8 +2954,10 @@ CMenuManager::LoadAllTextures()
CTxdStore::LoadTxd(frontendTxdSlot, "MODELS/FRONTEND.TXD");
CTxdStore::AddRef(frontendTxdSlot);
CTxdStore::SetCurrentTxd(frontendTxdSlot);
+#ifndef GTA3_1_1_PATCH
CStreaming::IHaveUsedStreamingMemory();
CTimer::Update();
+#endif
for (int i = 0; i < ARRAY_SIZE(FrontendFilenames); i++) {
m_aFrontEndSprites[i].SetTexture(FrontendFilenames[i][0], FrontendFilenames[i][1]);
@@ -2982,6 +2984,10 @@ CMenuManager::LoadAllTextures()
m_aMapSprites[i].SetAddressing(rwTEXTUREADDRESSBORDER);
}
#endif
+#ifdef GTA3_1_1_PATCH
+ CStreaming::IHaveUsedStreamingMemory();
+ CTimer::Update();
+#endif
m_bSpritesLoaded = true;
CTxdStore::PopCurrentTxd();
}
@@ -2993,7 +2999,11 @@ CMenuManager::LoadSettings()
int fileHandle = CFileMgr::OpenFile("gta3.set", "r");
int32 prevLang = m_PrefsLanguage;
+#ifdef GTA3_1_1_PATCH
+ CMBlur::BlurOn = (_dwOperatingSystemVersion != OS_WIN98);
+#else
CMBlur::BlurOn = true;
+#endif
MousePointerStateHelper.bInvertVertically = true;
// 50 is silly
@@ -4456,7 +4466,18 @@ CMenuManager::ProcessButtonPresses(void)
m_PrefsUseWideScreen = false;
m_PrefsShowSubtitles = true;
m_nDisplayVideoMode = m_nPrefsVideoMode;
+#ifdef GTA3_1_1_PATCH
+ if (_dwOperatingSystemVersion == OS_WIN98) {
+ CMBlur::BlurOn = false;
+ CMBlur::MotionBlurClose();
+ }
+ else {
+ CMBlur::BlurOn = true;
+ CMBlur::MotionBlurOpen(Scene.camera);
+ }
+#else
CMBlur::BlurOn = true;
+#endif
SaveSettings();
} else if ((m_nCurrScreen != MENUPAGE_SKIN_SELECT_OLD) && (m_nCurrScreen == MENUPAGE_CONTROLLER_PC)) {
ControlsManager.MakeControllerActionsBlank();
@@ -4986,7 +5007,7 @@ CMenuManager::WaitForUserCD()
CSprite2d *splash;
char *splashscreen = nil;
-#ifndef RANDOMSPLASH
+#if (!(defined RANDOMSPLASH) && !(defined GTA3_1_1_PATCH))
if (CGame::frenchGame || CGame::germanGame || !CGame::nastyGame)
splashscreen = "mainsc2";
else
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index 71aac605..9fb0756f 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -644,3 +644,4 @@ public:
static_assert(sizeof(CMenuManager) == 0x564, "CMenuManager: error");
extern CMenuManager FrontEndMenuManager;
+extern DWORD _dwOperatingSystemVersion; \ No newline at end of file
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index 445cd83f..e2099945 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -814,7 +814,11 @@ CPhysical::ApplyCollisionAlt(CEntity *B, CColPoint &colpoint, float &impulse, CV
normalSpeed = DotProduct(speed, colpoint.normal);
if(normalSpeed < 0.0f){
float minspeed = 0.0104f * CTimer::GetTimeStep();
+#ifdef GTA3_1_1_PATCH
+ if ((IsObject() || IsVehicle() && (GetUp().z < -0.3f || ((CVehicle*)this)->IsBike() && (m_status == STATUS_ABANDONED || m_status == STATUS_WRECKED))) &&
+#else
if((IsObject() || IsVehicle() && GetUp().z < -0.3f) &&
+#endif
!bHasContacted &&
Abs(m_vecMoveSpeed.x) < minspeed &&
Abs(m_vecMoveSpeed.y) < minspeed &&
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp
index 0c3a7720..098400cc 100644
--- a/src/modelinfo/VehicleModelInfo.cpp
+++ b/src/modelinfo/VehicleModelInfo.cpp
@@ -960,7 +960,9 @@ CVehicleModelInfo::DeleteVehicleColourTextures(void)
for(i = 0; i < 256; i++){
if(ms_colourTextureTable[i]){
RwTextureDestroy(ms_colourTextureTable[i]);
+#ifdef GTA3_1_1_PATCH
ms_colourTextureTable[i] = nil;
+#endif
}
}
}
diff --git a/src/peds/CopPed.cpp b/src/peds/CopPed.cpp
index e62743de..63811eae 100644
--- a/src/peds/CopPed.cpp
+++ b/src/peds/CopPed.cpp
@@ -668,11 +668,13 @@ CCopPed::ProcessControl(void)
}
if (bDuckAndCover) {
+#ifndef GTA3_1_1_PATCH
if (!bNotAllowedToDuck && Seek()) {
SetMoveState(PEDMOVE_STILL);
SetMoveAnim();
SetPointGunAt(m_pedInObjective);
}
+#endif
} else if (Seek()) {
CVehicle *playerVeh = FindPlayerVehicle();
if (!playerVeh && player && player->EnteringCar()) {
diff --git a/src/render/2dEffect.h b/src/render/2dEffect.h
index 62216bca..b0615e4d 100644
--- a/src/render/2dEffect.h
+++ b/src/render/2dEffect.h
@@ -76,8 +76,14 @@ public:
if(type == EFFECT_LIGHT){
if(light.corona)
RwTextureDestroy(light.corona);
+#ifdef GTA3_1_1_PATCH
+ light.corona = nil;
+#endif
if(light.shadow)
RwTextureDestroy(light.shadow);
+#ifdef GTA3_1_1_PATCH
+ light.shadow = nil;
+#endif
}
}
};
diff --git a/src/render/Clouds.cpp b/src/render/Clouds.cpp
index 58dc3f93..d4246a15 100644
--- a/src/render/Clouds.cpp
+++ b/src/render/Clouds.cpp
@@ -44,10 +44,25 @@ void
CClouds::Shutdown(void)
{
RwTextureDestroy(gpCloudTex[0]);
+#ifdef GTA3_1_1_PATCH
+ gpCloudTex[0] = nil;
+#endif
RwTextureDestroy(gpCloudTex[1]);
+#ifdef GTA3_1_1_PATCH
+ gpCloudTex[1] = nil;
+#endif
RwTextureDestroy(gpCloudTex[2]);
+#ifdef GTA3_1_1_PATCH
+ gpCloudTex[2] = nil;
+#endif
RwTextureDestroy(gpCloudTex[3]);
+#ifdef GTA3_1_1_PATCH
+ gpCloudTex[3] = nil;
+#endif
RwTextureDestroy(gpCloudTex[4]);
+#ifdef GTA3_1_1_PATCH
+ gpCloudTex[4] = nil;
+#endif
}
void
diff --git a/src/render/Rubbish.cpp b/src/render/Rubbish.cpp
index 31110046..8a0b80e8 100644
--- a/src/render/Rubbish.cpp
+++ b/src/render/Rubbish.cpp
@@ -414,7 +414,19 @@ void
CRubbish::Shutdown(void)
{
RwTextureDestroy(gpRubbishTexture[0]);
+#ifdef GTA3_1_1_PATCH
+ gpRubbishTexture[0] = nil;
+#endif
RwTextureDestroy(gpRubbishTexture[1]);
+#ifdef GTA3_1_1_PATCH
+ gpRubbishTexture[1] = nil;
+#endif
RwTextureDestroy(gpRubbishTexture[2]);
+#ifdef GTA3_1_1_PATCH
+ gpRubbishTexture[2] = nil;
+#endif
RwTextureDestroy(gpRubbishTexture[3]);
+#ifdef GTA3_1_1_PATCH
+ gpRubbishTexture[3] = nil;
+#endif
}
diff --git a/src/render/Skidmarks.cpp b/src/render/Skidmarks.cpp
index f3479536..5d521041 100644
--- a/src/render/Skidmarks.cpp
+++ b/src/render/Skidmarks.cpp
@@ -54,8 +54,17 @@ void
CSkidmarks::Shutdown(void)
{
RwTextureDestroy(gpSkidTex);
+#ifdef GTA3_1_1_PATCH
+ gpSkidTex = nil;
+#endif
RwTextureDestroy(gpSkidBloodTex);
+#ifdef GTA3_1_1_PATCH
+ gpSkidBloodTex = nil;
+#endif
RwTextureDestroy(gpSkidMudTex);
+#ifdef GTA3_1_1_PATCH
+ gpSkidMudTex = nil;
+#endif
}
void
diff --git a/src/weapons/WeaponEffects.cpp b/src/weapons/WeaponEffects.cpp
index f7e50f78..46195d2c 100644
--- a/src/weapons/WeaponEffects.cpp
+++ b/src/weapons/WeaponEffects.cpp
@@ -46,6 +46,9 @@ void
CWeaponEffects::Shutdown(void)
{
RwTextureDestroy(gpCrossHairTex);
+#ifdef GTA3_1_1_PATCH
+ gpCrossHairTex = nil;
+#endif
}
void
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 02:55:10 +0100