Remove our own frame rate limiter, since it will break (brake) vsync when monitor vsync is higher than rate limiter.

Author: perim

lib/framework/Makefile.am

@@ -75,7 +75,6 @@ noinst_HEADERS = \
 	endian_hack.h \
 	gettext.h \
 	macros.h \
-	SDL_framerate.h \
 	wzapp_c.h \
 	wzfs.h \
 	wzglobal.h
@@ -98,7 +97,6 @@ libframework_a_SOURCES = \
 	geometry.cpp \
 	i18n.cpp \
 	lexer_input.cpp \
-	SDL_framerate.cpp \
 	stdio_ext.cpp \
 	strres.cpp \
 	treap.cpp \

lib/framework/frame.cpp

@@ -35,7 +35,6 @@
 #include "frameint.h"
 #include "frameresource.h"
 #include "input.h"
-#include "SDL_framerate.h"
 #include "physfs_ext.h"
 
 #include "cursors.h"
@@ -79,25 +78,6 @@ static uint64_t curFrames = 0; // Number of frames elapsed since start
 static uint64_t lastFrames = 0;
 static uint32_t curTicks = 0; // Number of ticks since execution started
 static uint32_t lastTicks = 0;
-static FPSmanager wzFPSmanager;
-static bool	initFPSmanager = false;
-
-void setFramerateLimit(int fpsLimit)
-{
-	if (!initFPSmanager)
-	{
-		/* Initialize framerate handler */
-		SDL_initFramerate(&wzFPSmanager);
-		initFPSmanager = true;
-	}
-	SDL_setFramerate(&wzFPSmanager, fpsLimit);
-}
-
-
-int getFramerateLimit(void)
-{
-	return SDL_getFramerate(&wzFPSmanager);
-}
 
 /* InitFrameStuff - needs to be called once before frame loop commences */
 static void InitFrameStuff( void )
@@ -137,7 +117,6 @@ static void MaintainFrameStuff( void )
 	}
 }
 
-
 UDWORD frameGetAverageRate(void)
 {
 	SDWORD averageFrames = 0, i = 0;
@@ -148,13 +127,11 @@ UDWORD frameGetAverageRate(void)
 	return averageFrames;
 }
 
-
 UDWORD	frameGetFrameNumber(void)
 {
 	return curFrames;
 }
 
-
 /** Set the current cursor from a Resource ID
  */
 void frameSetCursor(CURSOR cur)
@@ -169,7 +146,6 @@ void frameSetCursor(CURSOR cur)
         }
 }
 
-
 static void initCursors(void)
 {
 	init_system_cursor(CURSOR_ARROW, cursor_type);
@@ -200,7 +176,6 @@ static void initCursors(void)
 	init_system_cursor(CURSOR_SELECT, cursor_type);
 }
 
-
 static void freeCursors(void)
 {
 	// no-op
@@ -263,7 +238,6 @@ void frameUpdate(void)
 {
 	/* Update the frame rate stuff */
 	MaintainFrameStuff();
-	SDL_framerateDelay(&wzFPSmanager);
 }
 
 

lib/framework/makefile.win32

@@ -24,7 +24,6 @@ SRC= \
 	i18n.cpp \
 	input.cpp \
 	lexer_input.cpp \
-	SDL_framerate.cpp \
 	stdio_ext.cpp \
 	strres.cpp \
 	tagfile.cpp \

src/configuration.cpp

@@ -130,7 +130,6 @@ bool loadConfig()
 	war_SetHeight(height);
 
 	if (ini.contains("bpp")) pie_SetVideoBufferDepth(ini.value("bpp").toInt());
-	setFramerateLimit(ini.value("framerate", 60).toInt());
 
 	/**
 	 * Lobby
@@ -186,7 +185,6 @@ bool saveConfig()
 	{
 		ini.setValue("difficulty", getDifficultyLevel());		// level
 	}
-	ini.setValue("framerate", (SDWORD)getFramerateLimit());
 	ini.setValue("showFPS", (SDWORD)showFPS);
 	ini.setValue("scroll",(SDWORD)scroll_speed_accel);		// scroll
 	ini.setValue("visfog",(SDWORD)(!war_GetFog()));			// fogtype

src/keybind.cpp

@@ -536,26 +536,27 @@ void kf_ToggleOrders(void)	// Displays orders & action of currently selected uni
 		showORDERS = !showORDERS;
 		CONPRINTF(ConsoleString, (ConsoleString, "Unit Order/Action displayed is %s", showORDERS ? "Enabled" : "Disabled"));
 }
+
 void kf_ToggleLevelName(void) // toggles level name 
 {
 	showLevelName = !showLevelName;
 }
+
 /* Writes out the frame rate */
 void	kf_FrameRate( void )
 {
-	CONPRINTF(ConsoleString,(ConsoleString, _("FPS %d; FPS-Limit: %d; PIEs %d; polys %d; Terr. polys %d; States %d"),
-	          frameGetAverageRate(), getFramerateLimit(), loopPieCount, loopPolyCount, loopTileCount, loopStateChanges));
-	if (runningMultiplayer()) {
+	CONPRINTF(ConsoleString,(ConsoleString, _("FPS %d; PIEs %d; polys %d; Terr. polys %d; States %d"),
+	          frameGetAverageRate(), loopPieCount, loopPolyCount, loopTileCount, loopStateChanges));
+	if (runningMultiplayer())
+	{
 			CONPRINTF(ConsoleString,(ConsoleString,
 						"NETWORK:  Bytes: s-%d r-%d  Packets: s-%d r-%d",
 						NETgetBytesSent(),
 						NETgetBytesRecvd(),
 						NETgetPacketsSent(),
 						NETgetPacketsRecvd() ));
-
 	}
 	gameStats = !gameStats;
-
 	CONPRINTF(ConsoleString, (ConsoleString,"Built at %s on %s",__TIME__,__DATE__));
 }