The-Homebrew-Cloud/re3-wiiu
2
0
Fork 0
mirror of https://gitlab.com/GaryOderNichts/re3-wiiu.git synced 2024-12-24 00:31:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse Source
This commit is contained in:
Nikolay Korolev 2021-08-08 17:34:28 +03:00
commit 8d9508bda4
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/control/Script.cpp
View File

@ -729,6 +729,11 @@ int CTheScripts::ScriptToLoad = 0;
int CTheScripts::OpenScript() int CTheScripts::OpenScript()
{ {
// glfwGetKey doesn't work because of CGame::Initialise is blocking
CPad::UpdatePads();
if (CPad::GetPad(0)->GetChar('G')) ScriptToLoad = 0;
if (CPad::GetPad(0)->GetChar('R')) ScriptToLoad = 1;
if (CPad::GetPad(0)->GetChar('D')) ScriptToLoad = 2;
CFileMgr::ChangeDir("\\"); CFileMgr::ChangeDir("\\");
switch (ScriptToLoad) { switch (ScriptToLoad) {
case 0: return CFileMgr::OpenFile("data\\main.scm", "rb"); case 0: return CFileMgr::OpenFile("data\\main.scm", "rb");
@ -752,12 +757,6 @@ void CTheScripts::Init()
UpsideDownCars.Init(); UpsideDownCars.Init();
StuckCars.Init(); StuckCars.Init();
#ifdef USE_DEBUG_SCRIPT_LOADER #ifdef USE_DEBUG_SCRIPT_LOADER
// glfwGetKey doesn't work because of CGame::Initialise is blocking
CPad::UpdatePads();
if(CPad::GetPad(0)->GetChar('G')) ScriptToLoad = 0;
if(CPad::GetPad(0)->GetChar('R')) ScriptToLoad = 1;
if(CPad::GetPad(0)->GetChar('D')) ScriptToLoad = 2;
int mainf = OpenScript(); int mainf = OpenScript();
#else #else
CFileMgr::SetDir("data"); CFileMgr::SetDir("data");