From 70876d3cde319a586c3b9a8c74b97c0325278d21 Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Sat, 3 Jul 2021 16:43:35 +0200
Subject: fix screenshot name

---
 src/core/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/core')

diff --git a/src/core/main.cpp b/src/core/main.cpp
index 74b896c6..e84c6eeb 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -379,7 +379,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
-- 
cgit v1.2.3


From c5e896c4202e6518a31cf7edb5a4f9c8bfdb2dea Mon Sep 17 00:00:00 2001
From: mssx86 <mss@tutanota.de>
Date: Thu, 1 Jul 2021 20:12:28 +0300
Subject: fix: add missing limits.h includes to enable bulding on musl.

---
 src/core/CdStreamPosix.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/core')

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>
-- 
cgit v1.2.3


From 72f67809059c732588ac29eedf8a10f9156b27b4 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Thu, 8 Jul 2021 03:37:14 +0300
Subject: Use CPad functions to check key states in script loader

---
 src/core/Frontend.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/core')

diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 13db6b98..632a69ab 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -4558,19 +4558,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
 
-- 
cgit v1.2.3