Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions DPLFusionFix.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DPLFusionFix", "DPLFusionFi
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B2AC0793-8C00-4E71-95DC-CC50A879BE2A}.Debug|x64.ActiveCfg = Debug|x64
{B2AC0793-8C00-4E71-95DC-CC50A879BE2A}.Debug|x64.Build.0 = Debug|x64
{B2AC0793-8C00-4E71-95DC-CC50A879BE2A}.Debug|x86.ActiveCfg = Debug|Win32
{B2AC0793-8C00-4E71-95DC-CC50A879BE2A}.Debug|x86.Build.0 = Debug|Win32
{B2AC0793-8C00-4E71-95DC-CC50A879BE2A}.Release|x64.ActiveCfg = Release|x64
{B2AC0793-8C00-4E71-95DC-CC50A879BE2A}.Release|x64.Build.0 = Release|x64
{B2AC0793-8C00-4E71-95DC-CC50A879BE2A}.Release|x86.ActiveCfg = Release|Win32
{B2AC0793-8C00-4E71-95DC-CC50A879BE2A}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
Expand Down
79 changes: 3 additions & 76 deletions DPLFusionFix/DPLFusionFix.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,49 +9,28 @@
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{B2AC0793-8C00-4E71-95DC-CC50A879BE2A}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>DPLFusionFix</RootNamespace>
<WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v145</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v145</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
Expand All @@ -63,27 +42,15 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<TargetExt>.asi</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<TargetExt>.asi</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
Expand All @@ -102,22 +69,6 @@
<AdditionalLibraryDirectories>dinput8.lib</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;DPLFUSIONFIX_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
Expand All @@ -140,26 +91,6 @@
<AdditionalLibraryDirectories>dinput8.lib</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;DPLFUSIONFIX_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="core\Matrix.h" />
<ClInclude Include="core\Vector.h" />
Expand Down Expand Up @@ -239,7 +170,6 @@
<ClInclude Include="framework.h" />
<ClInclude Include="IniReader.h" />
<ClInclude Include="pch.h" />
<ClInclude Include="utils.h" />
<ClInclude Include="utils\MemoryMgr.h" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -300,11 +230,8 @@
<ClCompile Include="IniReader.cpp" />
<ClCompile Include="pch.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="utils.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="DPLFusionFix.rc" />
Expand Down
6 changes: 0 additions & 6 deletions DPLFusionFix/DPLFusionFix.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@
<ClInclude Include="pch.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="utils.h">
<Filter>External</Filter>
</ClInclude>
<ClInclude Include="utils\MemoryMgr.h">
<Filter>External\utils</Filter>
</ClInclude>
Expand Down Expand Up @@ -422,9 +419,6 @@
<ClCompile Include="dpl\MenuManager.cpp">
<Filter>dpl</Filter>
</ClCompile>
<ClCompile Include="utils.cpp">
<Filter>External</Filter>
</ClCompile>
<ClCompile Include="dpl\HACK_VehicleTypeSelection.cpp">
<Filter>dpl</Filter>
</ClCompile>
Expand Down
12 changes: 6 additions & 6 deletions DPLFusionFix/HooksClass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ void __declspec(naked) HooksClass::Before_OnEnterGarageState()
// Low the ping in and ping out radius to prevent infinite loading
lfs->m_fPingInRadius = 100;
lfs->m_fPingOutRadius = 115;
*(float*)(0x6414f8) = lfs->m_fPingInRadius;
*(float*)(0x641420) = lfs->m_fPingOutRadius;
Memory::Patch<float>(0x6414f8, lfs->m_fPingInRadius);
Memory::Patch<float>(0x641420, lfs->m_fPingOutRadius);

// Restore registers
__asm
Expand Down Expand Up @@ -95,8 +95,8 @@ void __declspec(naked) HooksClass::After_OnEnterGarageState()
// Restore ping in and ping out radius
lfs->m_fPingInRadius = SettingsMgr->fInstances_Spawn_Radius - 10;
lfs->m_fPingOutRadius = SettingsMgr->fInstances_Spawn_Radius;
*(float*)(0x6414f8) = lfs->m_fPingInRadius;
*(float*)(0x641420) = lfs->m_fPingOutRadius;
Memory::Patch<float>(0x6414f8, lfs->m_fPingInRadius);
Memory::Patch<float>(0x641420, lfs->m_fPingOutRadius);

// Restore registers
__asm
Expand Down Expand Up @@ -617,8 +617,8 @@ void __declspec(naked) HooksClass::PS2_Glow_SFX_Settings_Patch()
*/

// Code here
*(int*)(0x976398) = 300; // "Glow pp multiply"
*(int*)(0x9765A4) = 3; // "Glow filter pass count"
Memory::Patch<int>(0x976398, 300); // "Glow pp multiply"
Memory::Patch<int>(0x9765A4, 3); // "Glow filter pass count"

/*
static int DAT_00976398 = 0x976398;
Expand Down
14 changes: 7 additions & 7 deletions DPLFusionFix/core/Vector.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "Vector.h"

inline float RecipSqrt(float x, float y) { return x / sqrt(y); }
inline float RecipSqrt(float x, float y) { return x / sqrtf(y); }
inline float RecipSqrt(float x) { return RecipSqrt(1.0f, x); }

void Vector::Normalise()
Expand All @@ -24,16 +24,16 @@ Vector CrossProduct(const Vector& v1, const Vector& v2)
// Returns the Y axis (in radians) facing a specific vector
float GetYAxisFromDirection(Vector direction)
{
return atan2(direction.X, direction.Y);
return atan2f(direction.X, direction.Y);
}

// Returns a vector with X Y Z axis in radians indicating the direction
void GetAxisVectorFromDirection(Vector direction, Vector& vector)
{
float x = atan2(direction.Y, GetDistanceBetweenPoints2D(0, 0, direction.X, direction.Z));
float x = atan2f(direction.Y, GetDistanceBetweenPoints2D(0, 0, direction.X, direction.Z));
while (x > M_PI*2)
{
x = x - M_PI*2;
x = static_cast<float>(x - M_PI*2);
}
vector.X = x;
vector.Y = GetYAxisFromDirection(direction);
Expand All @@ -42,7 +42,7 @@ void GetAxisVectorFromDirection(Vector direction, Vector& vector)

float GetDistanceBetweenPoints2D(float x1, float y1, float x2, float y2)
{
float dist = pow((x2 - x1) * pow(x2 - x1, 2) + (y2 - y1) * pow(y2 - y1, 2), 0.5f);
float dist = powf((x2 - x1) * powf(x2 - x1, 2) + (y2 - y1) * powf(y2 - y1, 2), 0.5);
if (dist < 0)
dist = 0;
return dist;
Expand All @@ -53,8 +53,8 @@ float GetDistanceBetweenPoints3D(float x1, float y1, float z1, float x2, float y
float dx = x2 - x1;
float dy = y2 - y1;
float dz = z2 - z1;
float dist = sqrt(dx * dx + dy * dy + dz * dz);
float dist = sqrtf(dx * dx + dy * dy + dz * dz);
if (dist < 0)
dist = 0;
return dist;
}
}
6 changes: 3 additions & 3 deletions DPLFusionFix/core/Vector.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ class Vector
Y = b;
Z = c;
}
float Heading(void) const { return atan2(-X, Y); }
float Magnitude(void) const { return sqrt(X * X + Y * Y + Z * Z); }
float Heading(void) const { return atan2f(-X, Y); }
float Magnitude(void) const { return sqrtf(X * X + Y * Y + Z * Z); }
float MagnitudeSqr(void) const { return X * X + Y * Y + Z * Z; }
float Magnitude2D(void) const { return sqrt(X * X + Y * Y); }
float Magnitude2D(void) const { return sqrtf(X * X + Y * Y); }
float MagnitudeSqr2D(void) const { return X * X + Y * Y; }
void Normalise();
Vector Lerp(const Vector& target, float t) const {
Expand Down
Loading