Blood: Moved VanillaModeDemo() to gDemo.VanillaDemo()

nukeykt · May 13, 2024 · 0c4bba7 · 0c4bba7
1 parent 8658502
commit 0c4bba7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp
@@ -2782,14 +2782,10 @@ void LoadExtraArts(void)
     }
 }
 
-bool VanillaModeDemo(void) {
-    return gDemo.m_bLegacy && gDemo.at1;
-}
-
 static bool bVanilla = 0;
 
 void VanillaModeUpdate(void) {
-    bVanilla = VanillaModeDemo() || (gVanilla && !gDemo.at0 && gGameOptions.nGameType == kGameTypeSinglePlayer && numplayers == 1);
+    bVanilla = gDemo.VanillaDemo() || (gVanilla && !gDemo.at0 && gGameOptions.nGameType == kGameTypeSinglePlayer && numplayers == 1);
 }
 
 bool VanillaMode(void) {

diff --git a/source/blood/src/blood.h b/source/blood/src/blood.h
@@ -79,7 +79,6 @@ void ProcessFrame(void);
 void ScanINIFiles(void);
 bool LoadArtFile(const char *pzFile);
 void LoadExtraArts(void);
-bool VanillaModeDemo(void);
 void VanillaModeUpdate(void);
 bool VanillaMode(void);
 bool fileExistsRFF(int id, const char* ext);

diff --git a/source/blood/src/demo.cpp b/source/blood/src/demo.cpp
@@ -511,6 +511,11 @@ void CDemo::LoadDemoInfo(void)
     pCurrentDemo = pFirstDemo;
 }
 
+bool CDemo::VanillaDemo(void)
+{
+    return at1 && m_bLegacy;
+}
+
 void CDemo::NextDemo(void)
 {
     pCurrentDemo = pCurrentDemo->pNext ? pCurrentDemo->pNext : pFirstDemo;

diff --git a/source/blood/src/demo.h b/source/blood/src/demo.h
@@ -87,6 +87,7 @@ class CDemo {
     void Playback(void);
     void StopPlayback(void);
     void LoadDemoInfo(void);
+    bool VanillaDemo(void);
     void NextDemo(void);
     void FlushInput(int nCount);
     void ReadInput(int nCount);

diff --git a/source/blood/src/player.cpp b/source/blood/src/player.cpp
@@ -1625,7 +1625,7 @@ void ProcessInput(PLAYER *pPlayer)
         }
         pInput->keyFlags.action = 0;
     }
-    if (VanillaModeDemo())
+    if (gDemo.VanillaDemo())
     {
         if (pInput->keyFlags.lookCenter && !pInput->buttonFlags.lookUp && !pInput->buttonFlags.lookDown)
         {