summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-04-10 10:06:18 +0200
committerGitHub <noreply@github.com>2020-04-10 10:06:18 +0200
commit0cbcb7a6e6549d82ad04a387e3eed54f08e13e22 (patch)
tree1c3af129a1326b9d889883fd5c53cf5723e0aff2 /core
parent74d432117239d07d497bea5368600acee5ef5af4 (diff)
parent0b9e95cac59b03ab6048b5cc80a1a8476c35cb90 (diff)
Merge pull request #37742 from madmiraal/fix-engine-get_target_fps
Fix Engine get_target_fps() returning float instead of int.
Diffstat (limited to 'core')
-rw-r--r--core/engine.cpp2
-rw-r--r--core/engine.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/engine.cpp b/core/engine.cpp
index 36987eab31..5361e09a8a 100644
--- a/core/engine.cpp
+++ b/core/engine.cpp
@@ -60,7 +60,7 @@ void Engine::set_target_fps(int p_fps) {
_target_fps = p_fps > 0 ? p_fps : 0;
}
-float Engine::get_target_fps() const {
+int Engine::get_target_fps() const {
return _target_fps;
}
diff --git a/core/engine.h b/core/engine.h
index 4cfdeffa82..8512779d4c 100644
--- a/core/engine.h
+++ b/core/engine.h
@@ -86,7 +86,7 @@ public:
float get_physics_jitter_fix() const;
virtual void set_target_fps(int p_fps);
- virtual float get_target_fps() const;
+ virtual int get_target_fps() const;
virtual float get_frames_per_second() const { return _fps; }