Skip to content

Commit

Permalink
Fix ScreenGameplaySync not syncing & Disallow exiting with Enter
Browse files Browse the repository at this point in the history
  • Loading branch information
poco0317 committed Nov 28, 2019
1 parent 3e0e477 commit 04bb22f
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/Etterna/Screen/Gameplay/ScreenGameplaySyncMachine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,14 @@ ScreenGameplaySyncMachine::Init()

PROFILEMAN->LoadLocalProfileFromMachine(PLAYER_1);
GAMESTATE->LoadCurrentSettingsFromProfile(PLAYER_1);

ScreenGameplayNormal::Init();

SO_GROUP_ASSIGN(GAMESTATE->m_SongOptions,
ModsLevel_Stage,
m_AutosyncType,
AutosyncType_Machine);

ScreenGameplayNormal::Init();

ClearMessageQueue(); // remove all of the messages set in ScreenGameplay
// that animate "ready", "here we go", etc.

Expand Down Expand Up @@ -94,6 +95,9 @@ ScreenGameplaySyncMachine::Input(const InputEventPlus& input)
if (_input.pn != PLAYER_INVALID)
_input.pn = PLAYER_1;

// Hacky way to never allow skipping to "eval" from this screen
AbortGiveUp(false);

return ScreenGameplay::Input(_input);
}

Expand Down

0 comments on commit 04bb22f

Please sign in to comment.