diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-10-17 12:48:47 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-10-17 12:48:47 -0300 |
| commit | 6f9631fc5151b3267c6fcea5f70249fc36814db8 (patch) | |
| tree | 2aa06230d95846602aa731967264c1619baa2a39 /main/main.cpp | |
| parent | 63033aa646f7a49fbcecbc8cc30077cf268be10c (diff) | |
| parent | be0f7563fbff581ca072504978bedc6a55e180f1 (diff) | |
| download | redot-engine-6f9631fc5151b3267c6fcea5f70249fc36814db8.tar.gz | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/main.cpp b/main/main.cpp index 6f7a56b052..9cd190a0e8 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1544,9 +1544,9 @@ bool Main::iteration() { OS::get_singleton()->delay_usec( OS::get_singleton()->get_frame_delay()*1000 ); } - int taret_fps = OS::get_singleton()->get_target_fps(); - if (taret_fps>0) { - uint64_t time_step = 1000000L/taret_fps; + int target_fps = OS::get_singleton()->get_target_fps(); + if (target_fps>0) { + uint64_t time_step = 1000000L/target_fps; target_ticks += time_step; uint64_t current_ticks = OS::get_singleton()->get_ticks_usec(); if (current_ticks<target_ticks) OS::get_singleton()->delay_usec(target_ticks-current_ticks); |