Skip to content

Simplify display setup to always use GUI mode #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
markvantilburg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Simplify display setup to always use GUI mode #153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions meka/srcs/meka.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,11 +409,8 @@ int main(int argc, char **argv)
if (!g_config.loaded_configuration_file)
Configuration_Save();

// Setup display (fullscreen/GUI)
if ((g_machine_flags & MACHINE_RUN) == MACHINE_RUN && !g_config.start_in_gui)
g_env.state = MEKA_STATE_GAME;
else
g_env.state = MEKA_STATE_GUI;
// Setup display (GUI-mode)
g_env.state = MEKA_STATE_GUI;
Video_Setup_State();

Machine_Reset (); // Reset Emulated Machine (set default values)
Expand All @@ -422,7 +419,15 @@ int main(int argc, char **argv)

// Load ROM from command line if necessary
Load_ROM_Command_Line();


// Re-evaluate startup display state after loading ROM from command-line.
// This allows start_in_gui = 0 to take effect if a ROM was loaded at startup.
if (!g_config.start_in_gui && (g_machine_flags & MACHINE_RUN) == MACHINE_RUN)
{
g_env.state = MEKA_STATE_GAME;
Video_Setup_State();
}

// Wait for Win32 console signal
if (!ConsoleWaitForAnswer(true))
return (0);
Expand Down