diff options
Diffstat (limited to 'src/crepe')
| -rw-r--r-- | src/crepe/api/LoopManager.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp index 14e68c2..4a6d2cd 100644 --- a/src/crepe/api/LoopManager.cpp +++ b/src/crepe/api/LoopManager.cpp @@ -59,13 +59,8 @@ 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() { |