Autosplitter v2 - memory based this time

engine/source/autosplitter/autosplitter.cpp

@@ -1,6 +1,7 @@
 #include <cstdio> 
 
 #include "autosplitter.h"
+#include "console/console.h"
 #include "platform/platform.h"
 
 
@@ -33,13 +34,26 @@ Autosplitter *Autosplitter::get()
 
 Autosplitter::Autosplitter()
 {
+    // Initialize AutosplitterData memory chunk
+    dMemset(&data, 0, sizeof(data));
+    sprintf(data.signature, "OMBU_ASR_");
+    // We add the "abcdef" procedurally to guarantee that the sigscan only finds this buffer, rather than potentially
+    // finding a full "OMBU_ASR_abcdef" string somewhere else in memory
+    for (int i = 0; i < 6; i++)
+    {
+        data.signature[i + 9] = 'a' + i;
+    }
+    data.currentLevel = -1;
+    // The rest is all zeros thanks to the memset, which is what we want.
+
+    // Initialize autosplitter file
     mActive = false;
     mFilename = Platform::getPrefsPath(AUTOSPLITTER_FILE_NAME);
     mFile.open(mFilename, std::ios_base::app);
     if (!mFile.is_open())
     {
         Con::errorf("Failed to open autosplitter file %s.", mFilename.c_str());
-        Con::errorf("Autosplitter is disabled.");
+        Con::errorf("Autosplitter file is disabled. Autosplitter memory will still work.");
         return;
     }
     Con::printf("Autosplitter Initialized to file %s", mFilename.c_str());
@@ -70,3 +84,45 @@ ConsoleFunction(sendAutosplitterData, void, 2, 2, "")
 
     autosplitter->sendData(argv[1]);
 }
+
+ConsoleFunction(autosplitterSetLevel, void, 2, 2, "autosplitterSetLevel(level)")
+{
+    Autosplitter *autosplitter = Autosplitter::get();
+    autosplitter->data.currentLevel = atoi(argv[1]);
+}
+
+ConsoleFunction(autosplitterSetIsLoading, void, 2, 2, "autosplitterSetIsLoading(isLoading)")
+{
+    Autosplitter *autosplitter = Autosplitter::get();
+    if (dStrcmp(argv[1], "false") == 0 || dStrcmp(argv[1], "0"))
+        autosplitter->data.isLoading = 0;
+    else
+        autosplitter->data.isLoading = 1;
+}
+
+ConsoleFunction(autosplitterSetLevelStarted, void, 2, 2, "autosplitterSetLevelStarted(levelStarted)")
+{
+    Autosplitter *autosplitter = Autosplitter::get();
+    if (dStrcmp(argv[1], "false") == 0 || dStrcmp(argv[1], "0"))
+        autosplitter->data.levelStarted = 0;
+    else
+        autosplitter->data.levelStarted = 1;
+}
+
+ConsoleFunction(autosplitterSetLevelFinished, void, 2, 2, "autosplitterSetLevelFinished(levelFinished)")
+{
+    Autosplitter *autosplitter = Autosplitter::get();
+    if (dStrcmp(argv[1], "false") == 0 || dStrcmp(argv[1], "0"))
+        autosplitter->data.levelFinished = 0;
+    else
+        autosplitter->data.levelFinished = 1;
+}
+
+ConsoleFunction(autosplitterSetEggFound, void, 2, 2, "autosplitterSetEggFound(eggFound)")
+{
+    Autosplitter *autosplitter = Autosplitter::get();
+    if (dStrcmp(argv[1], "false") == 0 || dStrcmp(argv[1], "0"))
+        autosplitter->data.eggFound = 0;
+    else
+        autosplitter->data.eggFound = 1;
+}

engine/source/autosplitter/autosplitter.h

@@ -1,14 +1,23 @@
 #ifndef _AUTOSPLITTER_H_
 #define _AUTOSPLITTER_H_
 
-#include <iostream>
 #include <fstream>
 
-#include "console/console.h"
+#include "platform/types.h"
 
 constexpr const char *AUTOSPLITTER_FILE_NAME = "autosplitter.txt";
 constexpr U32 AUTOSPLITTER_BUF_SIZE = 512;
 
+// This data can be scanned for in memory and used to drive autosplitters more precisely than via a log file
+struct AutosplitterData {
+    char signature[16]; // Header set to "OMBU_ASR_abcdef", entry point for memory scan
+    S32 currentLevel;   // The level index of the current loading/loaded level
+    U8 isLoading;     // When a loading screen is active
+    U8 levelStarted;  // When a level is started from the menu screen
+    U8 levelFinished; // When the finish is entered
+    U8 eggFound;      // When an easter egg is collected
+};
+
 class Autosplitter
 {
 public:
@@ -17,6 +26,7 @@ class Autosplitter
     static Autosplitter *get();
     bool isActive() { return mActive; }
     void sendData(const char *data);
+    AutosplitterData data;
 private:
     Autosplitter();
     ~Autosplitter();

game/marble/client/scripts/game.cs

@@ -799,6 +799,7 @@ function clientCmdSetGameState(%state, %data)
 
       // Tell autosplitter we finished the level
       XBLivePresenceStopTimer();
+      autosplitterSetLevelFinished(true);
       sendAutosplitterData("finish" SPC GameMissionInfo.getCurrentMission().level);
    }
    else
@@ -860,6 +861,8 @@ function clientCmdSetGameState(%state, %data)
          // read the pair of leaderboards
          XBLiveReadStats($Leaderboard::SPOverall, %mission.level, "", true, true);
       }
+      autosplitterSetLevelFinished(false);
+      autosplitterSetEggFound(false);
    }
 
    // Check here to see if we need to pop the upsell

game/marble/client/scripts/playGui.cs

@@ -102,6 +102,7 @@
 	   UpsellGui.displayPDLCUpsell = %isFreeLevel ? false : !%hasLevel;
    }
 
+   autosplitterSetIsLoading(false);
    sendAutosplitterData("loading finished");
 }
 

game/marble/client/ui/LevelPreviewGui.gui

@@ -230,6 +230,8 @@ function levelPreviewGui::onA()
          loadMission(GameMissionInfo.getCurrentMission().file, true);
 
          // Tell autosplitter to start
+         autosplitterSetIsLoading(false);
+         autosplitterSetLevel(GameMissionInfo.getCurrentMission().level);
          sendAutosplitterData("start" SPC GameMissionInfo.getCurrentMission().level);
          sendAutosplitterData("loading started");
       }

game/marble/server/scripts/easter.cs

@@ -65,6 +65,7 @@ function clientCmdOnEasterEggPickup( %index )
       return;
    }
 
+   autosplitterSetEggFound(true);
    sendAutosplitterData("egg" SPC %index);
 
    if( hasFoundEgg( %index ) )