From 4921424c7d17185d5412f392c7a7bd2337c47341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9?=
 <jordan631@yandex.ru>
Date: Sun, 22 May 2022 19:20:56 +0400
Subject: [PATCH] Revert "Set fps limit for main menu and game."

This reverts commit aa178f8faed74b48a5b35d4370230099589cb26b.
---
 CMakeLists.txt    |  1 -
 src/FpsLimiter.cc | 18 ------------------
 src/FpsLimiter.h  | 18 ------------------
 src/main.cc       | 20 +++++---------------
 src/main.h        |  5 ++---
 5 files changed, 7 insertions(+), 55 deletions(-)
 delete mode 100644 src/FpsLimiter.cc
 delete mode 100644 src/FpsLimiter.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50c8d1e..4b202fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,7 +226,6 @@ add_executable(fallout2-ce WIN32
     "src/world_map.h"
     "src/xfile.cc"
     "src/xfile.h"
-    "src/FpsLimiter.cc"
 )
 
 target_compile_definitions(fallout2-ce PUBLIC
diff --git a/src/FpsLimiter.cc b/src/FpsLimiter.cc
deleted file mode 100644
index 156746e..0000000
--- a/src/FpsLimiter.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "FpsLimiter.h"
-
-FpsLimiter::FpsLimiter(size_t fps): 
-    _Fps(fps), 
-    _Ticks(0)
-{
-}
-
-void FpsLimiter::Begin()
-{
-    _Ticks = SDL_GetTicks();
-}
-
-void FpsLimiter::End()
-{
-    if (1000 / _Fps > SDL_GetTicks() - _Ticks) 
-        SDL_Delay(1000 / _Fps - (SDL_GetTicks() - _Ticks));
-}
diff --git a/src/FpsLimiter.h b/src/FpsLimiter.h
deleted file mode 100644
index b1a6b9b..0000000
--- a/src/FpsLimiter.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef Fallout2_RE_FpsLimiter_h_
-#define Fallout2_RE_FpsLimiter_h_
-
-#include <SDL.h>
-
-class FpsLimiter 
-{
-public:
-    FpsLimiter(size_t fps = 60);
-    void Begin();
-    void End();
-
-private:
-    size_t _Fps;
-    size_t _Ticks;
-};
-
-#endif
diff --git a/src/main.cc b/src/main.cc
index fbecc42..2dcea8a 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -130,8 +130,6 @@ int falloutMain(int argc, char** argv)
     gameMoviePlay(MOVIE_INTRO, 0);
     gameMoviePlay(MOVIE_CREDITS, 0);
 
-    FpsLimiter fpsLimiter;
-
     if (mainMenuWindowInit() == 0) {
         bool done = false;
         while (!done) {
@@ -140,7 +138,7 @@ int falloutMain(int argc, char** argv)
             mainMenuWindowUnhide(1);
 
             mouseShowCursor();
-            int mainMenuRc = mainMenuWindowHandleEvents(fpsLimiter);
+            int mainMenuRc = mainMenuWindowHandleEvents();
             mouseHideCursor();
 
             switch (mainMenuRc) {
@@ -156,7 +154,7 @@ int falloutMain(int argc, char** argv)
                     gameMoviePlay(MOVIE_ELDER, GAME_MOVIE_STOP_MUSIC);
                     randomSeedPrerandom(-1);
                     _main_load_new(_mainMap);
-                    mainLoop(fpsLimiter);
+                    mainLoop();
                     paletteFadeTo(gPaletteWhite);
                     objectHide(gDude, NULL);
                     _map_exit();
@@ -191,7 +189,7 @@ int falloutMain(int argc, char** argv)
                     } else if (loadGameRc != 0) {
                         windowDestroy(win);
                         win = -1;
-                        mainLoop(fpsLimiter);
+                        mainLoop();
                     }
                     paletteFadeTo(gPaletteWhite);
                     if (win != -1) {
@@ -300,7 +298,7 @@ int _main_load_new(char* mapFileName)
 }
 
 // 0x480E48
-void mainLoop(FpsLimiter& fpsLimiter)
+void mainLoop()
 {
     bool cursorWasHidden = cursorIsHidden();
     if (cursorWasHidden) {
@@ -312,8 +310,6 @@ void mainLoop(FpsLimiter& fpsLimiter)
     scriptsEnable();
 
     while (_game_user_wants_to_quit == 0) {
-        fpsLimiter.Begin();
-
         int keyCode = _get_input();
         gameHandleKey(keyCode, false);
 
@@ -330,8 +326,6 @@ void mainLoop(FpsLimiter& fpsLimiter)
             _main_show_death_scene = 1;
             _game_user_wants_to_quit = 2;
         }
-
-        fpsLimiter.End();
     }
 
     scriptsDisable();
@@ -765,7 +759,7 @@ int _main_menu_is_enabled()
 }
 
 // 0x481AEC
-int mainMenuWindowHandleEvents(FpsLimiter& fpsLimiter)
+int mainMenuWindowHandleEvents()
 {
     _in_main_menu = true;
 
@@ -778,8 +772,6 @@ int mainMenuWindowHandleEvents(FpsLimiter& fpsLimiter)
 
     int rc = -1;
     while (rc == -1) {
-        fpsLimiter.Begin();
-
         int keyCode = _get_input();
 
         for (int buttonIndex = 0; buttonIndex < MAIN_MENU_BUTTON_COUNT; buttonIndex++) {
@@ -826,8 +818,6 @@ int mainMenuWindowHandleEvents(FpsLimiter& fpsLimiter)
                 rc = MAIN_MENU_TIMEOUT;
             }
         }
-
-        fpsLimiter.End();
     }
 
     if (oldCursorIsHidden) {
diff --git a/src/main.h b/src/main.h
index 50665d3..c878d3c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -2,7 +2,6 @@
 #define MAIN_H
 
 #include "art.h"
-#include "FpsLimiter.h"
 
 #include <stdbool.h>
 
@@ -56,7 +55,7 @@ extern CacheEntry* gMainMenuBackgroundFrmHandle;
 int falloutMain(int argc, char** argv);
 bool falloutInit(int argc, char** argv);
 int _main_load_new(char* fname);
-void mainLoop(FpsLimiter& fpsLimiter);
+void mainLoop();
 void _main_selfrun_exit();
 void showDeath();
 void _main_death_voiceover_callback();
@@ -67,6 +66,6 @@ void mainMenuWindowFree();
 void mainMenuWindowHide(bool animate);
 void mainMenuWindowUnhide(bool animate);
 int _main_menu_is_enabled();
-int mainMenuWindowHandleEvents(FpsLimiter& fpsLimiter);
+int mainMenuWindowHandleEvents();
 
 #endif /* MAIN_H */