diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-07-11 10:23:59 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-07-11 10:23:59 +0300 |
| commit | 776d46aacbc9317cb05c0d45949b4e4a2d45d848 (patch) | |
| tree | 5ef3bfb77974917b7bbe47d50045f6b0f4768362 /src/core | |
| parent | 62425b586631f95d67f2c9ba8c9a4f202e03bda4 (diff) | |
| parent | 6a2ce2031392efa51c061e99062bcdff1b5725b1 (diff) | |
Merge remote-tracking branch 'upstream/lcs' into lcs
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/config.h | 5 | ||||
| -rw-r--r-- | src/core/main.cpp | 2 |
4 files changed, 8 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/config.h b/src/core/config.h index 1f042e08..69775a62 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -470,6 +470,11 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually #undef DISABLE_LOADING_SCREEN #undef DISABLE_VSYNC_ON_TEXTURE_CONVERSION +#undef EXTENDED_COLOURFILTER +#undef EXTENDED_PIPELINES +#undef SCREEN_DROPLETS +#undef NEW_RENDERER + #undef FIX_SPRITES #define PC_WATER 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 |