From f1f0b76a2b662e6bd9a7c8c391d7ebc481e80c04 Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Thu, 14 Jan 2016 20:21:10 +0000 Subject: [PATCH] remove cdecl original call macros --- src/addresses.h | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/src/addresses.h b/src/addresses.h index 35a90b3de1..7c09c48659 100644 --- a/src/addresses.h +++ b/src/addresses.h @@ -29,32 +29,6 @@ #define RCT2_ADDRESS(address, type) ((type*)(address)) #define RCT2_GLOBAL(address, type) (*((type*)(address))) -#ifdef __WINDOWS__ -#define RCT2_CALLPROC(address) (((void(*)())(address))()) -#define RCT2_CALLFUNC(address, returnType) (((returnType(*)())(address))()) - -#define RCT2_CALLFUNC_1(address, returnType, a1, v1) (((returnType(*)(a1))(address))(v1)) -#define RCT2_CALLFUNC_2(address, returnType, a1, a2, v1, v2) (((returnType(*)(a1, a2))(address))(v1, v2)) -#define RCT2_CALLFUNC_3(address, returnType, a1, a2, a3, v1, v2, v3) (((returnType(*)(a1, a2, a3))(address))(v1, v2, v3)) -#define RCT2_CALLFUNC_4(address, returnType, a1, a2, a3, a4, v1, v2, v3, v4) (((returnType(*)(a1, a2, a3, a4))(address))(v1, v2, v3, v4)) -#define RCT2_CALLFUNC_5(address, returnType, a1, a2, a3, a4, a5, v1, v2, v3, v4, v5) (((returnType(*)(a1, a2, a3, a4, a5))(address))(v1, v2, v3, v4, v5)) -#define RCT2_CALLFUNC_6(address, returnType, a1, a2, a3, a4, a5, a6, v1, v2, v3, v4, v5, v6) (((returnType(*)(a1, a2, a3, a4, a5, a6))(address))(v1, v2, v3, v4, v5, v6)) -#else -#define RCT2_CALLPROC(address) -#define RCT2_CALLFUNC(address, returnType) -#define RCT2_CALLFUNC_1(address, returnType, a1, v1) -#define RCT2_CALLFUNC_2(address, returnType, a1, a2, v1, v2) -#define RCT2_CALLFUNC_3(address, returnType, a1, a2, a3, v1, v2, v3) -#define RCT2_CALLFUNC_4(address, returnType, a1, a2, a3, a4, v1, v2, v3, v4) -#define RCT2_CALLFUNC_5(address, returnType, a1, a2, a3, a4, a5, v1, v2, v3, v4, v5) -#define RCT2_CALLFUNC_6(address, returnType, a1, a2, a3, a4, a5, a6, v1, v2, v3, v4, v5, v6) -#endif // __WINDOWS__ - -#define RCT2_CALLPROC_1(address, a1, v1) RCT2_CALLFUNC_1(address, void, a1, v1) -#define RCT2_CALLPROC_2(address, a1, a2, v1, v2) RCT2_CALLFUNC_2(address, void, a1, a2, v1, v2) -#define RCT2_CALLPROC_3(address, a1, a2, a3, v1, v2, v3) RCT2_CALLFUNC_3(address, void, a1, a2, a3, v1, v2, v3) -#define RCT2_CALLPROC_4(address, a1, a2, a3, a4, v1, v2, v3, v4) RCT2_CALLFUNC_4(address, void, a1, a2, a3, a4, v1, v2, v3, v4) -#define RCT2_CALLPROC_5(address, a1, a2, a3, a4, a5, v1, v2, v3, v4, v5) RCT2_CALLFUNC_5(address, void, a1, a2, a3, a4, a5, v1, v2, v3, v4, v5) #pragma region Memory locations