Added RetroArch username detection.

libretro · Oct 13, 2019 · 16be481 · 16be481
1 parent e6e4313
commit 16be481
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 3,624 deletions.
diff --git a/code/libretro/libretro.c b/code/libretro/libretro.c
@@ -568,7 +568,7 @@ Sys_Init
 void Sys_Init(void) {
     Cmd_AddCommand("in_restart", Sys_In_Restart_f);
     Cvar_Set("arch", OS_STRING " " ARCH_STRING);
-    Cvar_Set("username", Sys_GetCurrentUser());
+    Cvar_Set("name", Sys_GetCurrentUser());
 }
 
 /*
@@ -1191,6 +1191,7 @@ void retro_run(void)
 		Com_Init(commandLine);
 		NET_Init();
 		update_variables(false);
+		Cvar_Set("name", Sys_GetCurrentUser());
 		first_boot = false;
 	}
 
@@ -1299,7 +1300,17 @@ Sys_GetCurrentUser
 */
 char nick[128];
 char *Sys_GetCurrentUser(void) {
-	sprintf(nick, "username");
+	const char *default_username = NULL;
+	sprintf(nick, "UnnamedPlayer");
+
+	if (environ_cb(RETRO_ENVIRONMENT_GET_USERNAME, &default_username))
+	{
+		if (default_username && default_username[0] != '\0')
+		{
+			sprintf(nick, default_username);
+		}
+	}
+
     return nick;
 }
 

diff --git a/code/psp2/con_psp2.c b/code/psp2/con_psp2.c
diff --git a/code/psp2/dll_psp2.c b/code/psp2/dll_psp2.c
diff --git a/code/psp2/dll_psp2.h b/code/psp2/dll_psp2.h
diff --git a/code/psp2/endian.h b/code/psp2/endian.h