DFSteam no longer needs a console to unload

also replaced most of a macro with a template

Author: ab9rf

library/Core.cpp

@@ -1946,9 +1946,7 @@ int Core::Shutdown ( void )
     // invalidate all modules
     Textures::cleanup();
     DFSDL::cleanup();
-
-    // FIXME console has already been shut down at this point, so getConsole is returning a dead object
-    DFSteam::cleanup(getConsole());
+    DFSteam::cleanup();
 
     d.reset();
 

library/include/modules/DFSteam.h

@@ -24,7 +24,7 @@ bool init(DFHack::color_ostream& out);
 /**
  * Call this when DFHack is being unloaded.
  */
-void cleanup(DFHack::color_ostream& out);
+void cleanup();
 
 DFHACK_EXPORT void launchSteamDFHackIfNecessary(DFHack::color_ostream& out);
 

library/modules/DFSteam.cpp

@@ -54,17 +54,20 @@ bool (*g_SteamAPI_RestartAppIfNecessary)(uint32_t unOwnAppID) = nullptr;
 void* (*g_SteamInternal_FindOrCreateUserInterface)(int, const char*) = nullptr;
 bool (*g_SteamAPI_ISteamApps_BIsAppInstalled)(void *iSteamApps, uint32_t appID) = nullptr;
 
-static void bind_all(color_ostream& out, DFLibrary* handle) {
-#define bind(name) \
-        if (!handle) { \
-            g_##name = nullptr; \
-        } else { \
-            g_##name = (decltype(g_##name))LookupPlugin(handle, #name); \
-            if (!g_##name) { \
-                WARN(dfsteam, out).print("steam library function not found: " #name "\n"); \
-            } \
+template<typename Ptr>
+static void bind_(color_ostream& out, DFLibrary* handle, const char* name, Ptr& func_ptr) {
+    if (!handle) {
+        func_ptr = nullptr;
+    } else {
+        func_ptr = (Ptr)LookupPlugin(handle, name);
+        if (!func_ptr) {
+            WARN(dfsteam, out).print("steam library function not found: {}\n", name);
         }
+    }
+}
 
+static void bind_all(color_ostream& out, DFLibrary* handle) {
+#define bind(name) bind_(out, handle, #name, g_##name)
     bind(SteamAPI_Init);
     bind(SteamAPI_Shutdown);
     bind(SteamAPI_GetHSteamUser);
@@ -75,6 +78,16 @@ static void bind_all(color_ostream& out, DFLibrary* handle) {
 #undef bind
 }
 
+static void unbind_all()
+{
+    g_SteamAPI_Init = nullptr;
+    g_SteamAPI_Shutdown = nullptr;
+    g_SteamAPI_GetHSteamUser = nullptr;
+    g_SteamInternal_FindOrCreateUserInterface = nullptr;
+    g_SteamAPI_RestartAppIfNecessary = nullptr;
+    g_SteamAPI_ISteamApps_BIsAppInstalled = nullptr;
+}
+
 bool DFSteam::init(color_ostream& out) {
     char *steam_client_launch = getenv("SteamClientLaunch");
     if (!steam_client_launch || strncmp(steam_client_launch, "1", 2) != 0) {
@@ -103,7 +116,7 @@ bool DFSteam::init(color_ostream& out) {
     return true;
 }
 
-void DFSteam::cleanup(color_ostream& out) {
+void DFSteam::cleanup() {
     if (!g_steam_handle)
         return;
 
@@ -113,7 +126,7 @@ void DFSteam::cleanup(color_ostream& out) {
     ClosePlugin(g_steam_handle);
     g_steam_handle = nullptr;
 
-    bind_all(out, nullptr);
+    unbind_all();
     g_steam_initialized = false;
 }