modern dkp

Craftyawesome · Jun 2, 2024 · 6ee0b76 · 6ee0b76
1 parent 311130f
commit 6ee0b76
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml
@@ -1,15 +1,16 @@
 name: Nintendo Switch
 
 on:
+  workflow_dispatch:
   push:
     branches: [ switch-port ]
   pull_request:
     branches: [ switch-port ]
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
-    container: devkitpro/devkita64:20200730
+    runs-on: ubuntu-latest
+    container: devkitpro/devkita64
     steps:
     - name: Install 7z/zip
       run: |

diff --git a/src/console.c b/src/console.c
@@ -895,7 +895,7 @@ void CON_Responder_SWITCH_SwkbdDecidedEnter_cb(const char* str, SwkbdDecidedEnte
 	CON_InputSetString(str);
 
 	if (!input_len)
-		return true;
+		return;
 
 	// push the command
 	COM_BufAddText(inputlines[inputline]);

diff --git a/src/hu_stuff.c b/src/hu_stuff.c
@@ -54,6 +54,11 @@
 #include "s_sound.h" // song credits
 #include "k_kart.h"
 
+#ifdef __SWITCH__
+#include "switch/swkbd.h"
+#endif
+
+
 // coords are scaled
 #define HU_INPUTX 0
 #define HU_INPUTY 0
@@ -1243,7 +1248,7 @@ void CHAT_Close() {
 
 void CHAT_SetText(const char* str) {
 	// if (strlen(str) > HU_MAXMSGLEN) return; // Overflow prevention
-	SDL_strlcpy(w_chat, str, HU_MAXMSGLEN);
+	strlcpy(w_chat, str, HU_MAXMSGLEN);
 }
 
 void CHAT_SendText(const char* str) {
@@ -1255,8 +1260,6 @@ void CHAT_SendText(const char* str) {
 
 #ifdef __SWITCH__
 
-#include "switch/swkbd.h"
-
 void CHAT_Switch_SwkbdChanged(const char* str, SwkbdChangedStringArg* arg) {
 	CHAT_SetText(str);
 	c_input = arg->cursorPos;

diff --git a/src/m_menu.c b/src/m_menu.c
@@ -2505,7 +2505,7 @@ void M_Responder_Switch_SwkbdChanged(const char* str, SwkbdChangedStringArg* arg
 	CV_Set(currentMenu->menuitems[itemOn].itemaction, str);
 }
 
-void M_Responder_Switch_SwkbdMovedCursor(const char* str, SwkbdChangedStringArg* arg) {
+void M_Responder_Switch_SwkbdMovedCursor(const char* str, SwkbdMovedCursorArg* arg) {
 	char *currentStr = ((consvar_t *)currentMenu->menuitems[itemOn].itemaction)->string;
 	swkbdInlineSetCursorPos(&switch_kbdinline, strlen(currentStr)); // Place swkbd cursor at string end
 }
@@ -9315,13 +9315,13 @@ void M_HandleConnectIP_Switch_SwkbdChanged(const char* str, SwkbdChangedStringAr
 	SDL_strlcpy(setupm_ip, str, sizeof(setupm_ip));
 }
 
-void M_HandleConnectIP_Switch_SwkbdDecidedEnter(const char* str, SwkbdChangedStringArg* arg) {
+void M_HandleConnectIP_Switch_SwkbdDecidedEnter(const char* str, SwkbdDecidedEnterArg* arg) {
 	S_StartSound(NULL,sfx_menu1); // Tails
 	currentMenu->lastOn = itemOn;
 	M_ConnectIP(1);
 }
 
-void M_HandleConnectIP_Switch_SwkbdMovedCursor(const char* str, SwkbdChangedStringArg* arg) {
+void M_HandleConnectIP_Switch_SwkbdMovedCursor(const char* str, SwkbdMovedCursorArg* arg) {
 	swkbdInlineSetCursorPos(&switch_kbdinline, strlen(setupm_ip)); // Place swkbd cursor at string end
 }
 

diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
@@ -1326,7 +1326,7 @@ void I_OsPolling(void)
 {
 	#ifdef __SWITCH__
 		// Disable input if software keyboard is up
-		if (switch_kbdstate == SwkbdState_TextAvailable)
+		if (switch_kbdstate == SwkbdState_Shown)
 			return;
 	#endif
 	SDL_Keymod mod;