jonny_bro/SilentPatch
1
0
Fork 0
mirror of https://github.com/CookiePLMonster/SilentPatch.git synced 2024-12-29 23:33:02 +05:00
Code Issues Projects Releases Packages Wiki Activity Actions

SilentPatchIII/VC/SA: Mark some function pointers as inline

Browse source 
MinGW GCC's linker can't find them otherwise
This commit is contained in:
Echo J 2024-11-07 09:11:06 +02:00
parent 277515a56b
commit 3106c51455
6 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
SilentPatch/Common.h
View file

@ -2,6 +2,13 @@
#include <cstdint> #include <cstdint>
// Workaround for old MSVC inline function bugs
#if defined(_MSC_VER) && _MSC_VER < 1930
#define STATIC_INLINE static
#else
#define STATIC_INLINE static inline
#endif
namespace ExtraCompSpecularity namespace ExtraCompSpecularity
{ {
void ReadExtraCompSpecularityExceptions(const wchar_t* pPath); void ReadExtraCompSpecularityExceptions(const wchar_t* pPath);
@ -15,4 +22,4 @@ namespace Common
void III_VC_Common(); void III_VC_Common();
void III_VC_SetDelayedPatchesFunc( void(*func)() ); void III_VC_SetDelayedPatchesFunc( void(*func)() );
} }
}; };

4
SilentPatchIII/SilentPatchIII.cpp
View file

@ -1028,7 +1028,7 @@ namespace SlidingTextsScalingFixes
static inline float** pHorShadowValue; static inline float** pHorShadowValue;
template<std::size_t Index> template<std::size_t Index>
static void (*orgPrintString)(float,float,const wchar_t*); STATIC_INLINE void (*orgPrintString)(float,float,const wchar_t*);
template<std::size_t Index> template<std::size_t Index>
static void PrintString_Slide(float fX, float fY, const wchar_t* pText) static void PrintString_Slide(float fX, float fY, const wchar_t* pText)
@ -1055,7 +1055,7 @@ namespace SlidingTextsScalingFixes
static inline bool bSlidingEnabled = false; static inline bool bSlidingEnabled = false;
template<std::size_t Index> template<std::size_t Index>
static void (*orgPrintString)(float,float,const wchar_t*); STATIC_INLINE void (*orgPrintString)(float,float,const wchar_t*);
template<std::size_t Index> template<std::size_t Index>
static void PrintString_Slide(float fX, float fY, const wchar_t* pText) static void PrintString_Slide(float fX, float fY, const wchar_t* pText)

3
SilentPatchSA/GeneralSA.h
View file

@ -2,6 +2,7 @@
#define __GENERAL #define __GENERAL
#include <stdint.h> #include <stdint.h>
#include "Common.h"
#include "TheFLAUtils.h" #include "TheFLAUtils.h"
class CSimpleTransform class CSimpleTransform
@ -570,4 +571,4 @@ static_assert(sizeof(CPhysical) == 0x138, "Wrong size: CPhysical");
static_assert(sizeof(CObject) == 0x17C, "Wrong size: CObject"); static_assert(sizeof(CObject) == 0x17C, "Wrong size: CObject");
static_assert(sizeof(CEscalator) == 0x150, "Wrong size: CEscalator"); static_assert(sizeof(CEscalator) == 0x150, "Wrong size: CEscalator");
#endif #endif

8
SilentPatchSA/SilentPatchSA.cpp
View file

@ -2851,7 +2851,7 @@ namespace CreditsScalingFixes
static const unsigned int FIXED_RES_HEIGHT_SCALE = 448; static const unsigned int FIXED_RES_HEIGHT_SCALE = 448;
template<std::size_t Index> template<std::size_t Index>
static void (*orgPrintString)(float,float,const wchar_t*); STATIC_INLINE void (*orgPrintString)(float,float,const wchar_t*);
template<std::size_t Index> template<std::size_t Index>
static void PrintString_ScaleY(float fX, float fY, const wchar_t* pText) static void PrintString_ScaleY(float fX, float fY, const wchar_t* pText)
@ -2888,7 +2888,7 @@ namespace SlidingTextsScalingFixes
static inline bool bSlidingEnabled = false; static inline bool bSlidingEnabled = false;
template<std::size_t Index> template<std::size_t Index>
static void (*orgPrintString)(float,float,const wchar_t*); STATIC_INLINE void (*orgPrintString)(float,float,const wchar_t*);
template<std::size_t Index> template<std::size_t Index>
static void PrintString_Slide(float fX, float fY, const wchar_t* pText) static void PrintString_Slide(float fX, float fY, const wchar_t* pText)
@ -2898,7 +2898,7 @@ namespace SlidingTextsScalingFixes
} }
template<std::size_t Index> template<std::size_t Index>
static void (*orgSetRightJustifyWrap)(float wrap); STATIC_INLINE void (*orgSetRightJustifyWrap)(float wrap);
template<std::size_t Index> template<std::size_t Index>
static void SetRightJustifyWrap_Slide(float wrap) static void SetRightJustifyWrap_Slide(float wrap)
@ -2915,7 +2915,7 @@ namespace SlidingTextsScalingFixes
static inline bool bSlidingEnabled = false; static inline bool bSlidingEnabled = false;
template<std::size_t Index> template<std::size_t Index>
static void (*orgPrintString)(float,float,const wchar_t*); STATIC_INLINE void (*orgPrintString)(float,float,const wchar_t*);
template<std::size_t Index> template<std::size_t Index>
static void PrintString_Slide(float fX, float fY, const wchar_t* pText) static void PrintString_Slide(float fX, float fY, const wchar_t* pText)

10
SilentPatchSA/VehicleSA.h
View file

@ -302,7 +302,7 @@ public:
private: private:
template<std::size_t Index> template<std::size_t Index>
static void (CVehicle::*orgDoHeadLightBeam)(int type, CMatrix& m, bool right); STATIC_INLINE void (CVehicle::*orgDoHeadLightBeam)(int type, CMatrix& m, bool right);
template<std::size_t Index> template<std::size_t Index>
void DoHeadLightBeam_LightBeamFixSaveObj(int type, CMatrix& m, bool right) void DoHeadLightBeam_LightBeamFixSaveObj(int type, CMatrix& m, bool right)
@ -337,7 +337,7 @@ public:
public: public:
template<std::size_t Index> template<std::size_t Index>
static void (CAutomobile::*orgAutomobilePreRender)(); STATIC_INLINE void (CAutomobile::*orgAutomobilePreRender)();
template<std::size_t Index> template<std::size_t Index>
void PreRender_SilentPatch() void PreRender_SilentPatch()
@ -352,7 +352,7 @@ public:
void HideDestroyedWheels_SilentPatch(void (CAutomobile::*spawnFlyingComponentCB)(int, unsigned int), int nodeID, unsigned int modelID); void HideDestroyedWheels_SilentPatch(void (CAutomobile::*spawnFlyingComponentCB)(int, unsigned int), int nodeID, unsigned int modelID);
template<std::size_t Index> template<std::size_t Index>
static void (CAutomobile::*orgSpawnFlyingComponent)(int, unsigned int); STATIC_INLINE void (CAutomobile::*orgSpawnFlyingComponent)(int, unsigned int);
template<std::size_t Index> template<std::size_t Index>
void SpawnFlyingComponent_HideWheels(int nodeID, unsigned int modelID) void SpawnFlyingComponent_HideWheels(int nodeID, unsigned int modelID)
@ -448,7 +448,7 @@ private:
private: private:
template<std::size_t Index> template<std::size_t Index>
static CVehicle* (CStoredCar::*orgRestoreCar)(); STATIC_INLINE CVehicle* (CStoredCar::*orgRestoreCar)();
template<std::size_t Index> template<std::size_t Index>
CVehicle* RestoreCar_SilentPatch() CVehicle* RestoreCar_SilentPatch()
@ -477,4 +477,4 @@ static_assert(sizeof(CVehicle) == 0x5A0, "Wrong size: CVehicle");
static_assert(sizeof(CAutomobile) == 0x988, "Wrong size: CAutomobile"); static_assert(sizeof(CAutomobile) == 0x988, "Wrong size: CAutomobile");
static_assert(sizeof(CStoredCar) == 0x40, "Wrong size: CStoredCar"); static_assert(sizeof(CStoredCar) == 0x40, "Wrong size: CStoredCar");
#endif #endif

8
SilentPatchVC/SilentPatchVC.cpp
View file

@ -356,7 +356,7 @@ namespace RadarTraceOutlineFixes
} }
template<std::size_t Index> template<std::size_t Index>
static void (*orgShowRadarTraceWithHeight)(float, float, unsigned int, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char); STATIC_INLINE void (*orgShowRadarTraceWithHeight)(float, float, unsigned int, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char);
template<std::size_t Index> template<std::size_t Index>
static void ShowRadarTraceWithHeight_RecalculatePositions(float a1, float a2, unsigned int a3, unsigned char a4, unsigned char a5, unsigned char a6, unsigned char a7, unsigned char a8) static void ShowRadarTraceWithHeight_RecalculatePositions(float a1, float a2, unsigned int a3, unsigned char a4, unsigned char a5, unsigned char a6, unsigned char a7, unsigned char a8)
@ -456,7 +456,7 @@ namespace SlidingTextsScalingFixes
static inline bool bSlidingEnabled = false; static inline bool bSlidingEnabled = false;
template<std::size_t Index> template<std::size_t Index>
static void (*orgPrintString)(float,float,const wchar_t*); STATIC_INLINE void (*orgPrintString)(float,float,const wchar_t*);
template<std::size_t Index> template<std::size_t Index>
static void PrintString_Slide(float fX, float fY, const wchar_t* pText) static void PrintString_Slide(float fX, float fY, const wchar_t* pText)
@ -466,7 +466,7 @@ namespace SlidingTextsScalingFixes
} }
template<std::size_t Index> template<std::size_t Index>
static void (*orgSetRightJustifyWrap)(float wrap); STATIC_INLINE void (*orgSetRightJustifyWrap)(float wrap);
template<std::size_t Index> template<std::size_t Index>
static void SetRightJustifyWrap_Slide(float wrap) static void SetRightJustifyWrap_Slide(float wrap)
@ -483,7 +483,7 @@ namespace SlidingTextsScalingFixes
static inline bool bSlidingEnabled = false; static inline bool bSlidingEnabled = false;
template<std::size_t Index> template<std::size_t Index>
static void (*orgPrintString)(float,float,const wchar_t*); STATIC_INLINE void (*orgPrintString)(float,float,const wchar_t*);
template<std::size_t Index> template<std::size_t Index>
static void PrintString_Slide(float fX, float fY, const wchar_t* pText) static void PrintString_Slide(float fX, float fY, const wchar_t* pText)