Get rid of fake 60 fps framerate patch

It did basically nothing then making the code more complicated.

misc/FFNx.cfg

@@ -151,25 +151,6 @@ external_music_path = music/vgmstream
 # Enable alpha blending for textures without an existing blending effect
 #fancy_transparency = no
 
-# Replace FF7's default framelimiter timer source
-#use_new_timer = yes
-
-# Reset internal framerate.
-# WARNING: changing these value MAY break your game.
-#field_framerate = 60
-#battle_framerate = 60
-#worldmap_framerate = 60
-#menu_framerate = 60
-#chocobo_framerate = 60
-#condor_framerate = 60
-#submarine_framerate = 60
-#gameover_framerate = 60
-#credits_framerate = 60
-#snowboard_framerate = 60
-#highway_framerate = 30
-#coaster_framerate = 60
-#battleswirl_framerate = 60
-
 # Skip movie frames if necessary.
 #skip_frames = no
 

src/cfg.cpp

@@ -50,20 +50,6 @@ cfg_bool_t preserve_aspect = cfg_bool_t(true);
 cfg_bool_t fullscreen = cfg_bool_t(false);
 long refresh_rate = 0;
 cfg_bool_t enable_vsync = cfg_bool_t(true);
-long field_framerate = 60;
-long battle_framerate = 60;
-long worldmap_framerate = 60;
-long menu_framerate = 60;
-long chocobo_framerate = 60;
-long condor_framerate = 60;
-long submarine_framerate = 60;
-long gameover_framerate = 60;
-long credits_framerate = 60;
-long snowboard_framerate = 60;
-long highway_framerate = 30;
-long coaster_framerate = 60;
-long battleswirl_framerate = 60;
-cfg_bool_t use_new_timer = cfg_bool_t(true);
 cfg_bool_t linear_filter = cfg_bool_t(false);
 cfg_bool_t transparent_dialogs = cfg_bool_t(false);
 cfg_bool_t mdef_fix = cfg_bool_t(true);
@@ -107,20 +93,6 @@ cfg_opt_t opts[] = {
 		CFG_SIMPLE_BOOL("fullscreen", &fullscreen),
 		CFG_SIMPLE_INT("refresh_rate", &refresh_rate),
 		CFG_SIMPLE_BOOL("enable_vsync", &enable_vsync),
-		CFG_SIMPLE_INT("field_framerate", &field_framerate),
-		CFG_SIMPLE_INT("battle_framerate", &battle_framerate),
-		CFG_SIMPLE_INT("worldmap_framerate", &worldmap_framerate),
-		CFG_SIMPLE_INT("menu_framerate", &menu_framerate),
-		CFG_SIMPLE_INT("chocobo_framerate", &chocobo_framerate),
-		CFG_SIMPLE_INT("condor_framerate", &condor_framerate),
-		CFG_SIMPLE_INT("submarine_framerate", &submarine_framerate),
-		CFG_SIMPLE_INT("gameover_framerate", &gameover_framerate),
-		CFG_SIMPLE_INT("credits_framerate", &credits_framerate),
-		CFG_SIMPLE_INT("snowboard_framerate", &snowboard_framerate),
-		CFG_SIMPLE_INT("highway_framerate", &highway_framerate),
-		CFG_SIMPLE_INT("coaster_framerate", &coaster_framerate),
-		CFG_SIMPLE_INT("battleswirl_framerate", &battleswirl_framerate),
-		CFG_SIMPLE_BOOL("use_new_timer", &use_new_timer),
 		CFG_SIMPLE_BOOL("linear_filter", &linear_filter),
 		CFG_SIMPLE_BOOL("transparent_dialogs", &transparent_dialogs),
 		CFG_SIMPLE_BOOL("mdef_fix", &mdef_fix),

src/cfg.h

@@ -54,20 +54,6 @@ extern cfg_bool_t preserve_aspect;
 extern cfg_bool_t fullscreen;
 extern long refresh_rate;
 extern cfg_bool_t enable_vsync;
-extern long field_framerate;
-extern long battle_framerate;
-extern long worldmap_framerate;
-extern long menu_framerate;
-extern long chocobo_framerate;
-extern long condor_framerate;
-extern long submarine_framerate;
-extern long gameover_framerate;
-extern long credits_framerate;
-extern long snowboard_framerate;
-extern long highway_framerate;
-extern long coaster_framerate;
-extern long battleswirl_framerate;
-extern cfg_bool_t use_new_timer;
 extern cfg_bool_t linear_filter;
 extern cfg_bool_t transparent_dialogs;
 extern cfg_bool_t mdef_fix;

src/common.cpp

@@ -320,7 +320,6 @@ void common_flip(struct game_obj *game_object)
 	if (trace_all) trace("dll_gfx: flip (%i)\n", frame_counter);
 
 	VOBJ(game_obj, game_object, game_object);
-	static time_t last_gametime;
 	static struct timeb last_frame;
 	static uint fps_counters[3] = {0, 0, 0};
 	time_t last_seconds = last_frame.time;
@@ -451,19 +450,6 @@ void common_flip(struct game_obj *game_object)
 	current_state.texture_filter = true;
 	current_state.fb_texture = false;
 
-	// new framelimiter, not based on vsync
-	if(!ff8 && use_new_timer)
-	{
-		time_t gametime;
-		double framerate = mode->framerate;
-
-		if(framerate == 0.0) framerate = 60.0;
-
-		do qpc_get_time(&gametime); while(gametime > last_gametime && gametime - last_gametime < VREF(game_object, countspersecond * (1.0 / framerate)));
-
-		last_gametime = gametime;
-	}
-
 	if(!fullscreen) ShowCursor(true);
 
 	// fix unresponsive quit menu

src/common.h

@@ -107,7 +107,6 @@ struct game_mode
 	uint driver_mode;
 	uint trace;
 	uint main_loop;
-	uint framerate;
 };
 
 gfx_init common_init;

src/ff7_data.h

@@ -63,13 +63,6 @@ void ff7_set_main_loop(uint driver_mode, uint main_loop)
 	for(i = 0; i < num_modes; i++) if(ff7_modes[i].driver_mode == driver_mode) ff7_modes[i].main_loop = main_loop;
 }
 
-void ff7_set_mode_framerate(uint driver_mode, uint framerate)
-{
-	uint i;
-
-	for(i = 0; i < num_modes; i++) if(ff7_modes[i].driver_mode == driver_mode) ff7_modes[i].framerate = framerate;
-}
-
 void ff7_find_externals()
 {
 	uint main_loop = ff7_externals.cdcheck + 0xF3;
@@ -308,20 +301,6 @@ void ff7_find_externals()
 
 	ff7_externals.cleanup_game = get_absolute_value(ff7_externals.init_stuff, 0x350);
 	ff7_externals.cleanup_midi = get_relative_call(ff7_externals.cleanup_game, 0x72);
-
-	ff7_set_mode_framerate(MODE_FIELD, field_framerate);
-	ff7_set_mode_framerate(MODE_BATTLE, battle_framerate);
-	ff7_set_mode_framerate(MODE_WORLDMAP, worldmap_framerate);
-	ff7_set_mode_framerate(MODE_MENU, menu_framerate);
-	ff7_set_mode_framerate(MODE_CHOCOBO, chocobo_framerate);
-	ff7_set_mode_framerate(MODE_CONDOR, condor_framerate);
-	ff7_set_mode_framerate(MODE_SUBMARINE, submarine_framerate);
-	ff7_set_mode_framerate(MODE_GAMEOVER, gameover_framerate);
-	ff7_set_mode_framerate(MODE_CREDITS, credits_framerate);
-	ff7_set_mode_framerate(MODE_SNOWBOARD, snowboard_framerate);
-	ff7_set_mode_framerate(MODE_HIGHWAY, highway_framerate);
-	ff7_set_mode_framerate(MODE_COASTER, coaster_framerate);
-	ff7_set_mode_framerate(MODE_SWIRL, battleswirl_framerate);
 }
 
 void ff7_data()

src/ff7_opengl.cpp

@@ -122,16 +122,6 @@ struct ff7_gfx_driver *ff7_load_driver(struct ff7_game_obj *game_object)
 	replace_function(ff7_externals.lgp_get_filesize, lgp_get_filesize);
 	replace_function(ff7_externals.lgp_seek_file, lgp_seek_file);
 
-	if(use_new_timer)
-	{
-		// replace rdtsc timing
-		replace_function(common_externals.get_time, qpc_get_time);
-
-		// override the timer calibration
-		QueryPerformanceFrequency((LARGE_INTEGER *)&game_object->_countspersecond);
-		game_object->countspersecond = (double)game_object->_countspersecond;
-	}
-
 	replace_function(ff7_externals.magic_thread_start, magic_thread_start);
 
 	replace_function(ff7_externals.kernel2_reset_counters, kernel2_reset_counters);