jonny_bro/SilentPatch
1
0
Fork 0
mirror of https://github.com/CookiePLMonster/SilentPatch.git synced 2025-01-01 16:53:01 +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 109e1c67f4
commit dbe21b8556
5 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
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);

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)

1
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

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)

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)