summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
m---------externals/SDL0
-rw-r--r--src/core/file_sys/vfs_real.cpp3
-rw-r--r--src/input_common/drivers/mouse.cpp5
4 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5ef0ef50..26e93b038 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -489,7 +489,7 @@ if (ENABLE_SDL2)
489 if (YUZU_USE_BUNDLED_SDL2) 489 if (YUZU_USE_BUNDLED_SDL2)
490 # Detect toolchain and platform 490 # Detect toolchain and platform
491 if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) 491 if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64)
492 set(SDL2_VER "SDL2-2.28.0") 492 set(SDL2_VER "SDL2-2.28.1")
493 else() 493 else()
494 message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.") 494 message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.")
495 endif() 495 endif()
diff --git a/externals/SDL b/externals/SDL
Subproject 491fba1d06a4810645092b2559b9cc94abeb23b Subproject 116a5344ff4e8b8166eac2db540cd6578b4ba02
diff --git a/src/core/file_sys/vfs_real.cpp b/src/core/file_sys/vfs_real.cpp
index b0515ec05..1c706e4d8 100644
--- a/src/core/file_sys/vfs_real.cpp
+++ b/src/core/file_sys/vfs_real.cpp
@@ -283,7 +283,8 @@ std::size_t RealVfsFile::GetSize() const {
283 if (size) { 283 if (size) {
284 return *size; 284 return *size;
285 } 285 }
286 return FS::GetSize(path); 286 auto lk = base.RefreshReference(path, perms, *reference);
287 return reference->file ? reference->file->GetSize() : 0;
287} 288}
288 289
289bool RealVfsFile::Resize(std::size_t new_size) { 290bool RealVfsFile::Resize(std::size_t new_size) {
diff --git a/src/input_common/drivers/mouse.cpp b/src/input_common/drivers/mouse.cpp
index dac29c78f..9fb824baf 100644
--- a/src/input_common/drivers/mouse.cpp
+++ b/src/input_common/drivers/mouse.cpp
@@ -160,8 +160,9 @@ void Mouse::Move(int x, int y, int center_x, int center_y) {
160 last_mouse_change.y += mouse_change.y * y_sensitivity; 160 last_mouse_change.y += mouse_change.y * y_sensitivity;
161 161
162 // Bind the mouse change to [0 <= deadzone_counterweight <= 1.0] 162 // Bind the mouse change to [0 <= deadzone_counterweight <= 1.0]
163 if (last_mouse_change.Length() < deadzone_counterweight) { 163 const float length = last_mouse_change.Length();
164 last_mouse_change /= last_mouse_change.Length(); 164 if (length < deadzone_counterweight && length != 0.0f) {
165 last_mouse_change /= length;
165 last_mouse_change *= deadzone_counterweight; 166 last_mouse_change *= deadzone_counterweight;
166 } 167 }
167 168