diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-07-08 23:05:26 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-07-08 23:05:26 +0200 |
| commit | d781db6c0f669eaccecee246260290aa20f70020 (patch) | |
| tree | fc963b1e8f3c127a49095a127850bfc1cd09111e /src/core | |
| parent | Mission audio cleanup + sound pause (diff) | |
| parent | Use CPad functions to check key states in script loader (diff) | |
| download | re3-d781db6c0f669eaccecee246260290aa20f70020.tar re3-d781db6c0f669eaccecee246260290aa20f70020.tar.gz re3-d781db6c0f669eaccecee246260290aa20f70020.tar.bz2 re3-d781db6c0f669eaccecee246260290aa20f70020.tar.lz re3-d781db6c0f669eaccecee246260290aa20f70020.tar.xz re3-d781db6c0f669eaccecee246260290aa20f70020.tar.zst re3-d781db6c0f669eaccecee246260290aa20f70020.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/CdStreamPosix.cpp | 1 | ||||
| -rw-r--r-- | src/core/Frontend.cpp | 10 | ||||
| -rw-r--r-- | src/core/main.cpp | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/core/CdStreamPosix.cpp b/src/core/CdStreamPosix.cpp index 30fe06a0..bc9129eb 100644 --- a/src/core/CdStreamPosix.cpp +++ b/src/core/CdStreamPosix.cpp @@ -13,6 +13,7 @@ #include <fcntl.h> #include <sys/resource.h> #include <stdarg.h> +#include <limits.h> #ifdef __linux__ #include <sys/syscall.h> diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index bbc79d4e..975cc7da 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -4575,19 +4575,11 @@ CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, u #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) { + if (CPad::GetPad(0)->GetChar('R')) { scriptToLoad = 1; DoSettingsBeforeStartingAGame(); return; } -#elif defined _WIN32 - if (GetAsyncKeyState('R') & 0x8000) { - scriptToLoad = 1; - DoSettingsBeforeStartingAGame(); - return; - } -#endif } #endif diff --git a/src/core/main.cpp b/src/core/main.cpp index 8e53901f..4a61267d 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -387,7 +387,7 @@ DoRWStuffEndOfFrame(void) } #else if (CPad::GetPad(1)->GetLeftShockJustDown() || CPad::GetPad(0)->GetFJustDown(11)) { - sprintf(s, "screen_0%11lld.png", time(nil)); + sprintf(s, "screen_%011lld.png", time(nil)); RwGrabScreen(Scene.camera, s); } #endif |