Skip to content

Commit b52fc17

Browse files
jonwilxezon
authored andcommitted
Fix DISABLEDMASK_ALL
1 parent 19998be commit b52fc17

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/game/common/gamemain.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
*/
1515
#include "gamemain.h"
1616
#include "win32gameengine.h"
17+
#include "bitflags.h"
18+
#include "disabledtypes.h"
1719

1820
GameEngine *Create_Game_Engine()
1921
{
@@ -31,6 +33,8 @@ void Game_Main(int argc, char *argv[])
3133
{
3234
g_theGameEngine = Create_Game_Engine();
3335
g_theGameEngine->Init(argc, argv);
36+
// this should happen in GameEngine::Init but we don't have that yet
37+
DISABLEDMASK_ALL.Set_All();
3438
g_theGameEngine->Execute();
3539

3640
if (g_theGameEngine != nullptr) {

src/game/common/system/disabledtypes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ const char *DisabledBitFlags::s_bitNamesList[DISABLED_TYPE_COUNT + 1] = {
3434
nullptr,
3535
};
3636

37-
DisabledBitFlags DISABLEDMASK_ALL; // ???
37+
DisabledBitFlags DISABLEDMASK_ALL;
3838
DisabledBitFlags DISABLEDMASK_NONE;

0 commit comments

Comments
 (0)