diff options
| author | BobTheBob <for.oliver.kirkham@gmail.com> | 2023-03-07 11:26:33 +0000 |
|---|---|---|
| committer | BobTheBob <for.oliver.kirkham@gmail.com> | 2023-03-07 11:26:33 +0000 |
| commit | ddf4448a5cef7c06845d65815602fb6290c460fa (patch) | |
| tree | 2a9def502a9602ea8b7e0a434971fd7d763ca81b /NorthstarDLL/shared | |
| parent | f7e833f62b8db14a9c884729bd1531ba3988da60 (diff) | |
| parent | ecb83ef17e10fc21eaaab6f568adb17b74d4a3bd (diff) | |
| download | NorthstarLauncher-ddf4448a5cef7c06845d65815602fb6290c460fa.tar.gz NorthstarLauncher-ddf4448a5cef7c06845d65815602fb6290c460fa.zip | |
Merge remote-tracking branch 'origin/main' into modloading-rewrite-pr
Diffstat (limited to 'NorthstarDLL/shared')
| -rw-r--r-- | NorthstarDLL/shared/playlist.cpp | 8 | ||||
| -rw-r--r-- | NorthstarDLL/shared/playlist.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/NorthstarDLL/shared/playlist.cpp b/NorthstarDLL/shared/playlist.cpp index f19f32bb..ab7aab22 100644 --- a/NorthstarDLL/shared/playlist.cpp +++ b/NorthstarDLL/shared/playlist.cpp @@ -11,10 +11,10 @@ AUTOHOOK_INIT() // use the R2 namespace for game funcs namespace R2 { - FUNCTION_AT(engine.dll + 0x18C640, const char*, , GetCurrentPlaylistName, ()); - FUNCTION_AT(engine.dll + 0x18EB20, void, , SetCurrentPlaylist, (const char* pPlaylistName)); - FUNCTION_AT(engine.dll + 0x18ED00, void, , SetPlaylistVarOverride, (const char* pVarName, const char* pValue)); - FUNCTION_AT(engine.dll + 0x18C680, const char*, , GetCurrentPlaylistVar, (const char* pVarName, bool bUseOverrides)); + DEFINED_VAR_AT(engine.dll + 0x18C640, GetCurrentPlaylistName); + DEFINED_VAR_AT(engine.dll + 0x18EB20, SetCurrentPlaylist); + DEFINED_VAR_AT(engine.dll + 0x18ED00, SetPlaylistVarOverride); + DEFINED_VAR_AT(engine.dll + 0x18C680, GetCurrentPlaylistVar); } // namespace R2 ConVar* Cvar_ns_use_clc_SetPlaylistVarOverride; diff --git a/NorthstarDLL/shared/playlist.h b/NorthstarDLL/shared/playlist.h index c77b37d9..e56fdf96 100644 --- a/NorthstarDLL/shared/playlist.h +++ b/NorthstarDLL/shared/playlist.h @@ -3,8 +3,8 @@ // use the R2 namespace for game funcs namespace R2 { - extern const char* (*GetCurrentPlaylistName)(); - extern void (*SetCurrentPlaylist)(const char* pPlaylistName); - extern void (*SetPlaylistVarOverride)(const char* pVarName, const char* pValue); - extern const char* (*GetCurrentPlaylistVar)(const char* pVarName, bool bUseOverrides); + inline const char* (*GetCurrentPlaylistName)(); + inline void (*SetCurrentPlaylist)(const char* pPlaylistName); + inline void (*SetPlaylistVarOverride)(const char* pVarName, const char* pValue); + inline const char* (*GetCurrentPlaylistVar)(const char* pVarName, bool bUseOverrides); } // namespace R2 |