Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion RetroGBm/Include/Application.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class Application
std::unique_ptr<Render::RenderShader> m_RenderShader = nullptr;

// Boot ROM
bool SkipBootRom = false;
bool SkipBootRom = true;

private:
void Init();
Expand Down
2 changes: 1 addition & 1 deletion RetroGBm/Include/Windows/MainWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class MainWindow
HMENU m_StatusBar = NULL;

// Other unknown atm
bool m_StretchDisplay = true;
bool m_StretchDisplay = false;

void OpenDialog();
void OpenDialogRomDirectory();
Expand Down
21 changes: 15 additions & 6 deletions RetroGBm/Source/Windows/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,6 @@ void MainWindow::HandleMenu(UINT msg, WPARAM wParam, LPARAM lParam)

case m_MenuOptionsSkipBootRom:
{
/*bool bootrom_enabled = m_Application->GetEmulator()->GetBootRomEnabled();
m_Application->GetEmulator()->SetBootRom(!bootrom_enabled);*/

m_Application->SkipBootRom = !m_Application->SkipBootRom;

if (m_Application->SkipBootRom)
Expand Down Expand Up @@ -700,6 +697,18 @@ void MainWindow::RefreshRomList()

void MainWindow::LoadRom(const std::string& path)
{
m_Application->m_RenderShader->UseLinearFiltering = true;
m_Application->SoundOutput->EnableAudio = false;

RECT rect;
if (GetWindowRect(m_RenderHwnd, &rect))
{
int width = (rect.right - rect.left);
int height = (rect.bottom - rect.top);

m_Application->m_RenderShader->UpdateSize(width, height, m_StretchDisplay);
}

m_FilePath = path;
m_Application->LoadRom(path);
EnableMenuItem(m_ToolsMenuItem, m_MenuToolsCartridgeInfo, MF_ENABLED);
Expand Down Expand Up @@ -1138,9 +1147,9 @@ void MainWindow::CreateMenuBar()

// Options menu
m_OptionsMenuItem = CreateMenu();
AppendMenuW(m_OptionsMenuItem, MF_CHECKED, m_MenuOptionsEnableAudio, L"Enable Audio");
AppendMenuW(m_OptionsMenuItem, MF_CHECKED, m_MenuOptionsStretchDisplay, L"Stretch Display");
AppendMenuW(m_OptionsMenuItem, MF_UNCHECKED, m_MenuOptionsLinearFilter, L"Linear Filtering");
AppendMenuW(m_OptionsMenuItem, MF_UNCHECKED, m_MenuOptionsEnableAudio, L"Enable Audio");
AppendMenuW(m_OptionsMenuItem, MF_UNCHECKED, m_MenuOptionsStretchDisplay, L"Stretch Display");
AppendMenuW(m_OptionsMenuItem, MF_CHECKED, m_MenuOptionsLinearFilter, L"Linear Filtering");
AppendMenuW(m_OptionsMenuItem, (m_Application->SkipBootRom ? MF_CHECKED : MF_UNCHECKED), m_MenuOptionsSkipBootRom, L"Skip Boot ROM");
AppendMenuW(m_OptionsMenuItem, MF_SEPARATOR, NULL, NULL);
AppendMenuW(m_OptionsMenuItem, MF_UNCHECKED, m_MenuOptionsNetworkHost, L"Network Host");
Expand Down
Loading