Fix for recent patch

.gitignore

@@ -8,3 +8,9 @@
 /x64/Release
 tbf.VC.db
 /tbf.VC.VC.opendb
+*.opendb
+*.db
+/.vs/tbf/v15/Browse.VC.db
+*.ipch
+*.ipch
+*.ipch

include/DLL_VERSION.H

@@ -3,7 +3,7 @@
 
 #define TBF_MAJOR 0
 #define TBF_MINOR 5
-#define TBF_BUILD 1
+#define TBF_BUILD 2
 #define TBF_REV   0
 
 

include/config.h

@@ -42,6 +42,7 @@ struct tbf_config_t
     int      target          = 60;
     float    tolerance       = 0.05f;
     bool     reshade_fix     = false;
+    int64_t  limit_addr      = 0xBCC3FCULL;
   } framerate;
 
   struct {

src/config.cpp

@@ -55,6 +55,7 @@ struct {
 struct {
   tbf::ParameterBool*    replace_limiter;
   tbf::ParameterFloat*   tolerance;
+  tbf::ParameterInt64*   limit_addr;
 } framerate;
 
 struct {
@@ -334,6 +335,16 @@ TBF_LoadConfig (std::wstring name)
       L"Framerate.Fix",
         L"LimiterTolerance" );
 
+  framerate.limit_addr =
+    static_cast <tbf::ParameterInt64 *>
+      (g_ParameterFactory.create_parameter <int64_t> (
+        L"User-Selected Framerate Limit Address")
+      );
+  framerate.limit_addr->register_to_ini (
+    dll_ini,
+       L"TBFIX.System",
+         L"LimitAddress" );
+
 
   input.gamepad.texture_set =
     static_cast <tbf::ParameterStringW *>
@@ -418,6 +429,7 @@ TBF_LoadConfig (std::wstring name)
 
   framerate.replace_limiter->load  (config.framerate.replace_limiter);
   framerate.tolerance->load        (config.framerate.tolerance);
+  framerate.limit_addr->load       (config.framerate.limit_addr);
 
   textures.remaster->load          (config.textures.remaster);
   textures.uncompressed->load      (config.textures.uncompressed);
@@ -445,6 +457,7 @@ TBF_SaveConfig (std::wstring name, bool close_config)
 
   framerate.replace_limiter->store  (config.framerate.replace_limiter);
   framerate.tolerance->store        (config.framerate.tolerance);
+  framerate.limit_addr->store       (config.framerate.limit_addr);
 
   render.dump_shaders->store        (config.render.dump_shaders);
 

src/framerate.cpp

@@ -36,7 +36,7 @@
 // @TODO: Develop a heuristic to scan for this memory address;
 //          hardcoding it is going to break stuff :)
 //
-uintptr_t TICK_ADDR_BASE = 0xB15074;//0xB1B074;
+#define TICK_ADDR_BASE (uintptr_t)config.framerate.limit_addr
 
 int32_t          tbf::FrameRateFix::tick_scale               = INT32_MAX; // 0 FPS
 

tbf.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -21,13 +21,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>