summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gamefiles/models/x360btns.txdbin0 -> 126760 bytes
-rw-r--r--src/audio/sampman_miles.cpp2
-rw-r--r--src/core/AnimViewer.cpp3
-rw-r--r--src/core/Cam.cpp5
-rw-r--r--src/core/config.h4
5 files changed, 4 insertions, 10 deletions
diff --git a/gamefiles/models/x360btns.txd b/gamefiles/models/x360btns.txd
new file mode 100644
index 00000000..27837c2f
--- /dev/null
+++ b/gamefiles/models/x360btns.txd
Binary files differ
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp
index 3fc43a6e..2a4286eb 100644
--- a/src/audio/sampman_miles.cpp
+++ b/src/audio/sampman_miles.cpp
@@ -1380,7 +1380,7 @@ cSampleManager::Terminate(void)
bool
cSampleManager::CheckForAnAudioFileOnCD(void)
{
-#if !defined(NO_CDCHECK) // TODO: figure out defines
+#if !defined(NO_CDCHECK) // TODO: check steam, probably GTAVC_STEAM_PATCH needs to be added
char filepath[MAX_PATH];
strcpy(filepath, m_MiscomPath);
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