aboutsummaryrefslogtreecommitdiff
path: root/src/crepe/api/LoopManager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/crepe/api/LoopManager.cpp')
-rw-r--r--src/crepe/api/LoopManager.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index 4a6d2cd..14e68c2 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -59,8 +59,13 @@ void LoopManager::loop() {
void LoopManager::setup() {
this->game_running = true;
+<<<<<<< HEAD
+ LoopTimer::get_instance().start();
+ LoopTimer::get_instance().set_target_fps(200);
+=======
this->loop_timer->start();
this->loop_timer->set_fps(60);
+>>>>>>> wouter/gameloop-improvements
}
void LoopManager::render() {