summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-12-03 11:30:46 +0100
committeraap <aap@papnet.eu>2020-12-03 11:30:46 +0100
commit0d166081ad3a8691e54dc3256e46ba7768338da3 (patch)
tree1012f044dcffeae228e9235dc6c4da0b1981ace7
parentMerge pull request #863 from erorcun/miami (diff)
downloadre3-0d166081ad3a8691e54dc3256e46ba7768338da3.tar
re3-0d166081ad3a8691e54dc3256e46ba7768338da3.tar.gz
re3-0d166081ad3a8691e54dc3256e46ba7768338da3.tar.bz2
re3-0d166081ad3a8691e54dc3256e46ba7768338da3.tar.lz
re3-0d166081ad3a8691e54dc3256e46ba7768338da3.tar.xz
re3-0d166081ad3a8691e54dc3256e46ba7768338da3.tar.zst
re3-0d166081ad3a8691e54dc3256e46ba7768338da3.zip
-rw-r--r--src/core/AnimViewer.cpp8
-rw-r--r--src/core/Cam.cpp6
2 files changed, 14 insertions, 0 deletions
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp
index 2b45ce02..8b798268 100644
--- a/src/core/AnimViewer.cpp
+++ b/src/core/AnimViewer.cpp
@@ -101,6 +101,9 @@ CAnimViewer::Initialise(void) {
CStreaming::LoadAllRequestedModels(false);
CRenderer::Init();
CVehicleModelInfo::LoadVehicleColours();
+#ifdef FIX_BUGS
+ CVehicleModelInfo::LoadEnvironmentMaps();
+#endif
CAnimManager::LoadAnimFiles();
CWorld::PlayerInFocus = 0;
CWeapon::InitialiseWeapons();
@@ -310,7 +313,12 @@ CAnimViewer::Update(void)
if (pTarget->IsVehicle() || pTarget->IsPed() || pTarget->IsObject()) {
((CPhysical*)pTarget)->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
}
+#ifdef FIX_BUGS
+ // so we don't end up in the water
+ pTarget->GetMatrix().GetPosition().z = 10.0f;
+#else
pTarget->GetMatrix().GetPosition().z = 0.0f;
+#endif
if (modelInfo->GetModelType() == MITYPE_PED) {
((CPed*)pTarget)->bKindaStayInSamePlace = true;
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index 7560a86e..bc01b58e 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -4125,6 +4125,12 @@ CCam::Process_ModelView(const CVector &CameraTarget, float, float, float)
Distance += CPad::GetPad(0)->GetLeftStickY()/1000.0f;
else
Distance += CPad::GetPad(0)->GetLeftStickY() * ((Distance - 10.0f)/20.0f + 1.0f) / 1000.0f;
+#ifdef IMPROVED_CAMERA
+ if(CPad::GetPad(0)->GetLeftMouse()){
+ Distance += DEGTORAD(CPad::GetPad(0)->GetMouseY()/2.0f);
+ Angle += DEGTORAD(CPad::GetPad(0)->GetMouseX()/2.0f);
+ }
+#endif
if(Distance < 1.5f)
Distance = 1.5f;