m

Author: SomeGuyWhoLovesCoding

src/Main.hx

@@ -200,9 +200,7 @@ class Main extends Application
 
 		SaveData.init();
 		Tools.getIconGridMap('assets/images/ui');
-		#if windows
-		Sys.println('Windows: Audio latency set to ' + Mixer.latency());
-		#end
+		//Sys.println('Windows: Audio latency set to ' + Mixer.latency());
 
 		window.frameRate = SaveData.state.graphics.frameRate;
 
@@ -325,9 +323,9 @@ class Main extends Application
 	#end
 	override function update(deltaTime:Int) {
 		#if hxcpp
-		var timestamp:Float = untyped __global__.__time_stamp();
+		/*var timestamp:Float = untyped __global__.__time_stamp();
 		Sys.println('New frame rate ${1 / (timestamp - newTimestamp)}fps');
-		newTimestamp = timestamp;
+		newTimestamp = timestamp;*/
 		#end
 
 		Tools.profileFrame();
@@ -382,6 +380,7 @@ class Main extends Application
 		#if FV_LIME_FORK
 		var renderFrameRate = Application.current.window.renderFrameRate;
 		if (renderFrameRate == 0) renderFrameRate = Application.current.window.renderFrameRate = context.window.displayMode.refreshRate;
+		//Sys.println('Monitor refresh rate right now is $renderFrameRate');
 		#else
 		var renderFrameRate = Application.current.window.frameRate;
 		#end

src/data/SaveData.hx

@@ -81,13 +81,14 @@ class SaveData {
 		window.onClose.add(save);
 
 		if (!FileSystem.exists('save.dat')) {
-			var window = lime.app.Application.current.window;
 			save();
 		}
 
 		open();
 
-		if (state.graphics.frameRate == 0) state.graphics.frameRate = window.displayMode.refreshRate * 4;
+		if (state.graphics.frameRate == 0) {
+			state.graphics.frameRate = window.displayMode.refreshRate * 4;
+		}
 	}
 
 	static function open() {
@@ -174,7 +175,25 @@ class SaveData_Preferences {
 @:structInit
 @:publicFields
 class SaveData_Graphics {
-	var frameRate:Int;
+	var frameRate(default, set):Float;
+	inline function set_frameRate(value:Float) {
+		var window = lime.app.Application.current.window;
+		var newValue:Float = value;
+		var rateAlignment:Float = Math.ffloor(newValue / window.displayMode.refreshRate);
+
+		if (newValue == 0 ||
+			newValue < window.displayMode.refreshRate // too slow!
+		) {
+			newValue = window.displayMode.refreshRate * 4;
+		} else if (
+			newValue / window.displayMode.refreshRate != rateAlignment // Doesn't align properly with new frameRate)
+			|| rateAlignment < 2
+		) {
+			newValue = window.displayMode.refreshRate * Math.max(rateAlignment, 2);
+		}
+
+		return frameRate = newValue;
+	}
 	var antialiasing:Bool;
 	var customTitleBarColor:Int;
 	var customWindowOutlineColor:Int;

src/music/Mixer.hx

@@ -104,7 +104,7 @@ class Mixer {
 			#if FV_LIME_FORK
 			var frameTimeDiff:Float = (1000 / window.frameRate) / (1000 / window.renderFrameRate);
 			#else
-			var refreshRate = window.displayMode.refreshRate;
+			var refreshRate = window.displayMode.refreshRate; // integer version if you're on vanilla lime
 			var frameTimeDiff:Float = (1000 / window.frameRate) / (1000 / refreshRate);
 			#end
 			var smallest:Float = 5;