diff --git a/mk/cmake/SuperTux/ProvideSimpleSquirrel.cmake b/mk/cmake/SuperTux/ProvideSimpleSquirrel.cmake index 0502c568fb0..1c3427ca050 100644 --- a/mk/cmake/SuperTux/ProvideSimpleSquirrel.cmake +++ b/mk/cmake/SuperTux/ProvideSimpleSquirrel.cmake @@ -1,2 +1,6 @@ add_subdirectory("${CMAKE_SOURCE_DIR}/external/simplesquirrel/") -add_library(LibSimpleSquirrel ALIAS simplesquirrel) +if(MSVC) + add_library(LibSimpleSquirrel ALIAS simplesquirrel_static) +else() + add_library(LibSimpleSquirrel ALIAS simplesquirrel) +endif() diff --git a/src/object/camera.cpp b/src/object/camera.cpp index 86cb486985c..37f3d0016e0 100644 --- a/src/object/camera.cpp +++ b/src/object/camera.cpp @@ -807,7 +807,7 @@ Camera::scroll_to(float x, float y, float scrolltime) void Camera::set_scale(float scale) { - ease_scale(scale, 0, ""); + m_scale = scale; } void diff --git a/src/object/camera.hpp b/src/object/camera.hpp index 312c586a026..912f40e4126 100644 --- a/src/object/camera.hpp +++ b/src/object/camera.hpp @@ -125,9 +125,6 @@ class Camera final : public GameObject, /** get the scale towards which the camera is moving */ float get_target_scale() const { return m_scale_target; } - /** Instantly set the scale of the camera */ - void set_scale(float scale) { m_scale = scale; } - /** smoothly slide the scale and anchor position of the camera towards a new value */ void ease_scale(float scale, float time, easing ease, AnchorPoint anchor = AnchorPoint::ANCHOR_MIDDLE); /** @} */