diff options
| author | Jack <66967891+ASpoonPlaysGames@users.noreply.github.com> | 2023-10-07 13:28:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-07 14:28:43 +0200 |
| commit | 024605399a4878f97fd789416d9ea4234241f039 (patch) | |
| tree | 0595fa4df1cf185416bdec4c63c3db106504725a /NorthstarDLL/core | |
| parent | c093ee10f004f7e2b8be2b326a4b087392ded544 (diff) | |
| download | NorthstarLauncher-1.19.5-rc1.tar.gz NorthstarLauncher-1.19.5-rc1.zip | |
Reduce warnings due to calling conventions (#555)v1.19.5-rc1v1.19.5
Fix instances of "anachronism used: modifiers on data are ignored"
Diffstat (limited to 'NorthstarDLL/core')
| -rw-r--r-- | NorthstarDLL/core/convar/concommand.h | 3 | ||||
| -rw-r--r-- | NorthstarDLL/core/hooks.h | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/NorthstarDLL/core/convar/concommand.h b/NorthstarDLL/core/convar/concommand.h index 89363bc7..c11c7ea4 100644 --- a/NorthstarDLL/core/convar/concommand.h +++ b/NorthstarDLL/core/convar/concommand.h @@ -83,8 +83,7 @@ typedef void (*FnCommandCallback_t)(const CCommand& command); //----------------------------------------------------------------------------- // Returns 0 to COMMAND_COMPLETION_MAXITEMS worth of completion strings //----------------------------------------------------------------------------- -typedef int (*__fastcall FnCommandCompletionCallback)( - const char* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH]); +typedef int (*FnCommandCompletionCallback)(const char* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH]); // From r5reloaded class ConCommandBase diff --git a/NorthstarDLL/core/hooks.h b/NorthstarDLL/core/hooks.h index 8721628a..01244b3d 100644 --- a/NorthstarDLL/core/hooks.h +++ b/NorthstarDLL/core/hooks.h @@ -219,7 +219,7 @@ class __autohook type callingConvention CONCAT2(__autohookfunc, name) args; \ namespace \ { \ - type(*callingConvention name) args; \ + type(*name) args; \ __autohook CONCAT2(__autohook, __LINE__)( \ &__FILEAUTOHOOK, __STR(name), __STR(addrString), (LPVOID*)&name, (LPVOID)CONCAT2(__autohookfunc, name)); \ } \ @@ -230,7 +230,7 @@ class __autohook type callingConvention CONCAT2(__autohookfunc, name) args; \ namespace \ { \ - type(*callingConvention name) args; \ + type(*name) args; \ __autohook \ CONCAT2(__autohook, __LINE__)(&__FILEAUTOHOOK, __STR(name), addr, (LPVOID*)&name, (LPVOID)CONCAT2(__autohookfunc, name)); \ } \ @@ -241,7 +241,7 @@ class __autohook type callingConvention CONCAT2(__autohookfunc, name) args; \ namespace \ { \ - type(*callingConvention name) args; \ + type(*name) args; \ __autohook CONCAT2(__autohook, __LINE__)( \ &__FILEAUTOHOOK, __STR(name), __STR(moduleName), __STR(procName), (LPVOID*)&name, (LPVOID)CONCAT2(__autohookfunc, name)); \ } \ @@ -267,7 +267,7 @@ class ManualHook #define HOOK(varName, originalFunc, type, callingConvention, args) \ namespace \ { \ - type(*callingConvention originalFunc) args; \ + type(*originalFunc) args; \ } \ type callingConvention CONCAT2(__manualhookfunc, varName) args; \ ManualHook varName = ManualHook(__STR(varName), (LPVOID*)&originalFunc, (LPVOID)CONCAT2(__manualhookfunc, varName)); \ @@ -316,7 +316,7 @@ class __autovar // FUNCTION_AT(engine.dll + 0xDEADBEEF, void, __fastcall, SomeFunc, (void* a1)) #define FUNCTION_AT(addrString, type, callingConvention, name, args) \ - type(*callingConvention name) args; \ + type(*name) args; \ namespace \ { \ __autovar CONCAT2(__autovar, __LINE__)(&__FILEAUTOHOOK, __STR(addrString), (void**)&name); \ |