Removed getFrameDeltaMilliseconds from gui handler

client/CVideoHandler.cpp

@@ -12,6 +12,7 @@
 
 #include "CMT.h"
 #include "gui/CGuiHandler.h"
+#include "gui/FramerateManager.h"
 #include "renderSDL/SDL_Extensions.h"
 #include "CPlayerInterface.h"
 #include "../lib/filesystem/Filesystem.h"
@@ -370,7 +371,7 @@ void CVideoPlayer::update( int x, int y, SDL_Surface *dst, bool forceRedraw, boo
 	auto packet_duration = frame->duration;
 #endif
 	double frameEndTime = (frame->pts + packet_duration) * av_q2d(format->streams[stream]->time_base);
-	frameTime += GH.getFrameDeltaMilliseconds() / 1000.0;
+	frameTime += GH.framerateManager().getElapsedMilliseconds() / 1000.0;
 
 	if (frameTime >= frameEndTime )
 	{

client/gui/CGuiHandler.cpp

@@ -761,11 +761,6 @@ const Point & CGuiHandler::getCursorPosition() const
 	return cursorPosition;
 }
 
-uint32_t CGuiHandler::getFrameDeltaMilliseconds() const
-{
-	return framerateManagerInstance->getElapsedMilliseconds();
-}
-
 Point CGuiHandler::screenDimensions() const
 {
 	return Point(screen->w, screen->h);

client/gui/CGuiHandler.h

@@ -87,8 +87,6 @@ private:
 	void fakeMoveCursor(float dx, float dy);
 	void fakeMouseButtonEventRelativeMode(bool down, bool right);
 
-	FramerateManager & framerateManager();
-
 public:
 	void handleElementActivate(CIntObject * elem, ui16 activityFlag);
 	void handleElementDeActivate(CIntObject * elem, ui16 activityFlag);
@@ -100,11 +98,7 @@ public:
 	const Point & getCursorPosition() const;
 
 	ShortcutHandler & shortcutsHandler();
-
-
-	/// returns duration of last frame in milliseconds
-	/// NOTE: avoid to use, preferred method is to overload CIntObject::tick(uint32_t)
-	uint32_t getFrameDeltaMilliseconds() const;
+	FramerateManager & framerateManager();
 
 	/// Returns current logical screen dimensions
 	/// May not match size of window if user has UI scaling different from 100%

client/gui/CursorHandler.cpp

@@ -12,6 +12,7 @@
 #include "CursorHandler.h"
 
 #include "CGuiHandler.h"
+#include "FramerateManager.h"
 #include "../renderSDL/CursorSoftware.h"
 #include "../renderSDL/CursorHardware.h"
 #include "../render/CAnimation.h"
@@ -250,7 +251,7 @@ void CursorHandler::updateSpellcastCursor()
 {
 	static const float frameDisplayDuration = 0.1f; // H3 uses 100 ms per frame
 
-	frameTime += GH.getFrameDeltaMilliseconds() / 1000.f;
+	frameTime += GH.framerateManager().getElapsedMilliseconds() / 1000.f;
 	size_t newFrame = frame;
 
 	while (frameTime >= frameDisplayDuration)