Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Detect R and start game on menu

Browse Source
This commit is contained in:
eray orçunus 2020-05-28 12:46:51 +03:00
parent 98a97a32fa
commit e6401bce18
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/control/Script.cpp
View File

@ -538,22 +538,14 @@ void CRunningScript::Init()
} }
#ifdef USE_DEBUG_SCRIPT_LOADER #ifdef USE_DEBUG_SCRIPT_LOADER
int scriptToLoad = 0;
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> #include <Windows.h>
#endif #endif
int open_script() int open_script()
{ {
static int scriptToLoad = 0; // glfwGetKey doesn't work because of CGame::Initialise is blocking
// Doesn't work because of CGame::Initialise is blocking
/*
if (glfwGetKey(PSGLOBAL(window), GLFW_KEY_G) == GLFW_PRESS)
scriptToLoad = 0;
if (glfwGetKey(PSGLOBAL(window), GLFW_KEY_R) == GLFW_PRESS)
scriptToLoad = 1;
if (glfwGetKey(PSGLOBAL(window), GLFW_KEY_D) == GLFW_PRESS)
scriptToLoad = 2;
*/
#ifdef _WIN32 #ifdef _WIN32
if (GetAsyncKeyState('G') & 0x8000) if (GetAsyncKeyState('G') & 0x8000)
scriptToLoad = 0; scriptToLoad = 0;

4
src/control/Script.h
View File

@ -521,3 +521,7 @@ extern bool doingMissionRetry;
uint32 AddExtraDeathDelay(); uint32 AddExtraDeathDelay();
void RetryMission(int, int); void RetryMission(int, int);
#endif #endif
#ifdef USE_DEBUG_SCRIPT_LOADER
extern int scriptToLoad;
#endif

21
src/core/Frontend.cpp
View File

@ -3568,6 +3568,9 @@ CMenuManager::Process(void)
} }
#endif #endif
if (CheckSlotDataValid(m_nCurrSaveSlot)) { if (CheckSlotDataValid(m_nCurrSaveSlot)) {
#ifdef USE_DEBUG_SCRIPT_LOADER
scriptToLoad = 0;
#endif
TheCamera.m_bUseMouse3rdPerson = m_ControlMethod == CONTROL_STANDARD; TheCamera.m_bUseMouse3rdPerson = m_ControlMethod == CONTROL_STANDARD;
if (m_PrefsVsyncDisp != m_PrefsVsync) if (m_PrefsVsyncDisp != m_PrefsVsync)
m_PrefsVsync = m_PrefsVsyncDisp; m_PrefsVsync = m_PrefsVsyncDisp;
@ -3688,6 +3691,24 @@ CMenuManager::ProcessButtonPresses(void)
bool assumeIncrease = false; bool assumeIncrease = false;
#endif #endif
#ifdef USE_DEBUG_SCRIPT_LOADER
if (m_nCurrScreen == MENUPAGE_START_MENU || m_nCurrScreen == MENUPAGE_NEW_GAME || m_nCurrScreen == MENUPAGE_NEW_GAME_RELOAD) {
#ifdef RW_GL3
if (glfwGetKey(PSGLOBAL(window), GLFW_KEY_R) == GLFW_PRESS) {
scriptToLoad = 1;
DoSettingsBeforeStartingAGame();
return;
}
#elif defined _WIN32
if (GetAsyncKeyState('R') & 0x8000) {
scriptToLoad = 1;
DoSettingsBeforeStartingAGame();
return;
}
#endif
}
#endif
if (!m_bShowMouse && (m_nMouseOldPosX != m_nMousePosX || m_nMouseOldPosY != m_nMousePosY)) { if (!m_bShowMouse && (m_nMouseOldPosX != m_nMousePosX || m_nMouseOldPosY != m_nMousePosY)) {
m_bShowMouse = true; m_bShowMouse = true;
} }