summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-07-03 04:40:22 +0200
committereray orçunus <erayorcunus@gmail.com>2020-07-03 04:40:22 +0200
commited036df3ce0253fe639a441c22a58ecc0f9a116a (patch)
treeeac84f761eb66a26521ec0a97031dd03d63939bd
parentreenabled script logging (diff)
downloadre3-ed036df3ce0253fe639a441c22a58ecc0f9a116a.tar
re3-ed036df3ce0253fe639a441c22a58ecc0f9a116a.tar.gz
re3-ed036df3ce0253fe639a441c22a58ecc0f9a116a.tar.bz2
re3-ed036df3ce0253fe639a441c22a58ecc0f9a116a.tar.lz
re3-ed036df3ce0253fe639a441c22a58ecc0f9a116a.tar.xz
re3-ed036df3ce0253fe639a441c22a58ecc0f9a116a.tar.zst
re3-ed036df3ce0253fe639a441c22a58ecc0f9a116a.zip
-rw-r--r--src/core/Frontend.cpp6
-rw-r--r--src/skel/glfw/glfw.cpp6
-rw-r--r--src/skel/win/win.cpp3
3 files changed, 10 insertions, 5 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 3400d10f..bd03500e 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -1218,7 +1218,7 @@ CMenuManager::Draw()
}
}
} else {
- debug("screen:%d - totalCo: %d, coId: %d, coScreen:%d, coOption:%d\n", m_nCurrScreen, numCustomFrontendOptions, aScreens[m_nCurrScreen].m_aEntries[i].m_TargetMenu, option.screen, option.screenOptionOrder);
+ debug("A- screen:%d option:%d - totalCo: %d, coId: %d, coScreen:%d, coOption:%d\n", m_nCurrScreen, i, numCustomFrontendOptions, aScreens[m_nCurrScreen].m_aEntries[i].m_TargetMenu, option.screen, option.screenOptionOrder);
assert(0 && "Custom frontend options is borked");
}
@@ -4778,7 +4778,7 @@ CMenuManager::ProcessButtonPresses(void)
goBack = true;
}
} else {
- debug("screen:%d - totalCo: %d, coId: %d, coScreen:%d, coOption:%d\n", m_nCurrScreen, numCustomFrontendOptions, aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, option.screen, option.screenOptionOrder);
+ debug("B- screen:%d option:%d - totalCo: %d, coId: %d, coScreen:%d, coOption:%d\n", m_nCurrScreen, m_nCurrOption, numCustomFrontendOptions, aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, option.screen, option.screenOptionOrder);
assert(0 && "Custom frontend options are borked");
}
@@ -5003,7 +5003,7 @@ CMenuManager::ProcessButtonPresses(void)
DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
}
else {
- debug("screen:%d - totalCo: %d, coId: %d, coScreen:%d, coOption:%d\n", m_nCurrScreen, numCustomFrontendOptions, aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, option.screen, option.screenOptionOrder);
+ debug("C- screen:%d option:%d - totalCo: %d, coId: %d, coScreen:%d, coOption:%d\n", m_nCurrScreen, m_nCurrOption, numCustomFrontendOptions, aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, option.screen, option.screenOptionOrder);
assert(0 && "Custom frontend options are borked");
}
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index 0728f6c2..5e0c178c 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -1366,6 +1366,12 @@ WinMain(HINSTANCE instance,
RwInt32 argc;
RwChar** argv;
SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE);
+
+ // TODO: make this an option somewhere
+ AllocConsole();
+ freopen("CONIN$", "r", stdin);
+ freopen("CONOUT$", "w", stdout);
+ freopen("CONOUT$", "w", stderr);
#else
int
main(int argc, char *argv[])
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 484c6fe8..e1fb5b7f 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -1929,13 +1929,12 @@ WinMain(HINSTANCE instance,
StaticPatcher::Apply();
SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE);
-/*
+
// TODO: make this an option somewhere
AllocConsole();
freopen("CONIN$", "r", stdin);
freopen("CONOUT$", "w", stdout);
freopen("CONOUT$", "w", stderr);
-*/
/*
* Initialize the platform independent data.