SilentPatch: Simplify RwIm2DRenderLine function pointer declaration

MinGW GCC doesn't seem to unwind the layers of the macro define
properly (which causes it to not find the declaration type)
This commit is contained in:
Echo J 2024-11-07 00:49:10 +02:00
parent a3f946b30f
commit 5459cbf037
4 changed files with 10 additions and 4 deletions

View file

@ -34,7 +34,7 @@ namespace HandlingNameLoadFix
// ============= Corona lines rendering fix ============= // ============= Corona lines rendering fix =============
namespace CoronaLinesFix namespace CoronaLinesFix
{ {
static decltype(RwIm2DRenderLine)* orgRwIm2DRenderLine; static RwIm2DRenderLineFunction orgRwIm2DRenderLine;
static RwBool RenderLine_SetRecipZ( RwIm2DVertex *vertices, RwInt32 numVertices, RwInt32 vert1, RwInt32 vert2 ) static RwBool RenderLine_SetRecipZ( RwIm2DVertex *vertices, RwInt32 numVertices, RwInt32 vert1, RwInt32 vert2 )
{ {
const RwReal nearScreenZ = RwIm2DGetNearScreenZ(); const RwReal nearScreenZ = RwIm2DGetNearScreenZ();
@ -379,4 +379,4 @@ namespace Common {
TXN_CATCH(); TXN_CATCH();
} }
} }
} }

View file

@ -9,6 +9,10 @@
#define STATIC_INLINE static inline #define STATIC_INLINE static inline
#endif #endif
#define RwEngineInstance (*rwengine)
extern "C" void** rwengine;
namespace ExtraCompSpecularity namespace ExtraCompSpecularity
{ {
void ReadExtraCompSpecularityExceptions(const wchar_t* pPath); void ReadExtraCompSpecularityExceptions(const wchar_t* pPath);

View file

@ -1,8 +1,6 @@
#include "Utils/MemoryMgr.h" #include "Utils/MemoryMgr.h"
#include "Utils/Patterns.h" #include "Utils/Patterns.h"
#define RwEngineInstance (*rwengine)
#include <rwcore.h> #include <rwcore.h>
#include "RWGTA.h" #include "RWGTA.h"

View file

@ -1,5 +1,9 @@
#pragma once #pragma once
#define RwEngineInstance (*rwengine)
extern void** rwengine;
namespace RWGTA::Patches namespace RWGTA::Patches
{ {
bool TryLocateRwD3D8(); bool TryLocateRwD3D8();