Ticket #2807: replayWarnOnModMismatch_v2.diff

binaries/data/mods/public/gui/credits/texts/programming.json

@@ -24 +24 @@
             {"nick": "Alan", "name": "Alan Kemp"},
             {"nick": "aBothe", "name": "Alexander Bothe"},
             {"nick": "alpha123", "name": "Peter P. Cannici"},
+            {"nick": "ArnH", "name": "Arno Hemelhof"},
             {"nick": "Aurium", "name": "Aurélio Heckert"},
             {"nick": "badmadblacksad", "name": "Martin F"},
             {"name": "Mikołaj \"Bajter\" Korcz"},

source/main.cpp

@@ -453 +453 @@
     // run non-visual simulation replay if requested
     if (isReplay)
     {
+        if (!args.Has("mod"))
+        {
+            LOGERROR("At least one mod should be specified! Did you mean to add the argument '-mod=public'?");
+            CXeromyces::Terminate();
+            return;
+        }
         Paths paths(args);
         g_VFS = CreateVfs(20 * MiB);
         g_VFS->Mount(L"cache/", paths.Cache(), VFS_MOUNT_ARCHIVABLE);

source/ps/Replay.cpp

@@ -25 +25 @@
 #include "lib/res/h_mgr.h"
 #include "lib/tex/tex.h"
 #include "ps/Game.h"
+#include "ps/CLogger.h"
 #include "ps/Loader.h"
 #include "ps/Mod.h"
 #include "ps/Profile.h"
@@ -168 +169 @@
             JS::RootedValue attribs(cx);
             ENSURE(g_Game->GetSimulation2()->GetScriptInterface().ParseJSON(line, &attribs));
 
+            std::vector<CStr> replayModList;
+            g_Game->GetSimulation2()->GetScriptInterface().GetProperty(attribs, "mods", replayModList);
+            
+            // Check for necessary mods which aren't loaded
+            for (const CStr& mod : replayModList)
+                if (mod != "user" && std::find(g_modsLoaded.begin(), g_modsLoaded.end(), mod) == g_modsLoaded.end())
+                    LOGWARNING("The mod '%s' is required by the replay file, but wasn't passed as an argument!", mod);
+            
+            // Check for mods which are loaded, but weren't used when the replay was made
+            for (const CStr& mod : g_modsLoaded)
+                if (mod != "user" && std::find(replayModList.begin(), replayModList.end(), mod) == replayModList.end())
+                    LOGWARNING("The mod '%s' wasn't used when creating this replay file, but was passed as an argument!", mod);
+
             g_Game->StartGame(&attribs, "");
 
             // TODO: Non progressive load can fail - need a decent way to handle this