diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp index d190ce441..e0d639236 100644 --- 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 index 4f02ea6ea..b88ad8456 100644 --- 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 index 6b1db59e0..e4bfef980 100644 --- 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 index 880eef8f3..fddabdfcc 100644 --- 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 index f625c4594..9e0e77176 100644 --- 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) {