summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-12-19 09:49:19 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2020-12-19 09:49:19 +0100
commitbf90fed2b75fc05a9db5b7d102d1dc4c13bf8c81 (patch)
tree60a71d84db48dc7b70ce71dbfe593ec8372e3b6d /src/core
parentMerge remote-tracking branch 'upstream/miami' into miami (diff)
downloadre3-bf90fed2b75fc05a9db5b7d102d1dc4c13bf8c81.tar
re3-bf90fed2b75fc05a9db5b7d102d1dc4c13bf8c81.tar.gz
re3-bf90fed2b75fc05a9db5b7d102d1dc4c13bf8c81.tar.bz2
re3-bf90fed2b75fc05a9db5b7d102d1dc4c13bf8c81.tar.lz
re3-bf90fed2b75fc05a9db5b7d102d1dc4c13bf8c81.tar.xz
re3-bf90fed2b75fc05a9db5b7d102d1dc4c13bf8c81.tar.zst
re3-bf90fed2b75fc05a9db5b7d102d1dc4c13bf8c81.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/AnimViewer.cpp3
-rw-r--r--src/core/Cam.cpp5
-rw-r--r--src/core/config.h4
3 files changed, 3 insertions, 9 deletions
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp
index 30050624..854ec7d4 100644
--- a/src/core/AnimViewer.cpp
+++ b/src/core/AnimViewer.cpp
@@ -47,7 +47,6 @@ CEntity *CAnimViewer::pTarget = nil;
void
CAnimViewer::Render(void) {
if (pTarget) {
-// pTarget->GetPosition() = CVector(0.0f, 0.0f, 0.0f); // Only on Mobile
if (pTarget) {
#ifdef FIX_BUGS
if(pTarget->IsPed())
@@ -113,7 +112,7 @@ CAnimViewer::Initialise(void) {
CTimeCycle::Initialise();
CCarCtrl::Init();
CPlayerPed *player = new CPlayerPed();
- player->SetPosition(0.0f, 0.0f, 0.0f); // This is 1000.f for all axes on Xbox, but 0.f on mobile?
+ player->SetPosition(1000.0f, 1000.0f, 1000.0f);
CWorld::Players[0].m_pPed = player;
CDraw::SetFOV(120.0f);
CDraw::ms_fLODDistance = 500.0f;
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index 98d0369f..9b4715b2 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -5053,9 +5053,8 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
float stickX = -(pad->GetCarGunLeftRight());
float stickY = pad->GetCarGunUpDown();
- // In SA this is for not let num2/num8 move camera when Keyboard & Mouse controls are used.
- // if (CCamera::m_bUseMouse3rdPerson)
- // stickY = 0.0f;
+ if (CCamera::m_bUseMouse3rdPerson)
+ stickY = 0.0f;
float xMovement = Abs(stickX) * (FOV / 80.0f * 5.f / 70.f) * stickX * 0.007f * 0.007f;
float yMovement = Abs(stickY) * (FOV / 80.0f * 3.f / 70.f) * stickY * 0.007f * 0.007f;
diff --git a/src/core/config.h b/src/core/config.h
index 99f2c156..c46adcd8 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -371,7 +371,3 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually
#undef PS2_ALPHA_TEST
#undef NO_ISLAND_LOADING
#endif
-
-#ifdef LIBRW
-// these are not supported with librw yet
-#endif