libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #2320 from leiradel/master

Browse Source 
Added notifications for problems with cheevos; added game hash to the…
This commit is contained in:
Twinaphex 2015-10-31 12:42:23 +01:00
commit 9025fbfe45
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cheevos.c
View File

@ -1142,6 +1142,8 @@ static int test_cheevo(cheevo_t *cheevo)
static int cheevos_login(retro_time_t *timeout)
{
const char *username;
const char *password;
char request[256];
const char *json;
int res;
@ -1149,10 +1151,21 @@ static int cheevos_login(retro_time_t *timeout)
if (cheevos_locals.token[0])
return 0;
username = config_get_ptr()->cheevos.username;
password = config_get_ptr()->cheevos.password;
if (!username || !*username || !password || !*password)
{
rarch_main_msg_queue_push("Missing Retro Achievements account information", 0, 5 * 60, false);
rarch_main_msg_queue_push("Please fill in your account information in Settings", 0, 5 * 60, false);
RARCH_LOG("CHEEVOS username and/or password not informed\n");
return -1;
}
snprintf(
request, sizeof(request),
"http://retroachievements.org/dorequest.php?r=login&u=%s&p=%s",
config_get_ptr()->cheevos.username, config_get_ptr()->cheevos.password
username, password
);
request[sizeof(request) - 1] = 0;
@ -1169,6 +1182,8 @@ static int cheevos_login(retro_time_t *timeout)
}
}
rarch_main_msg_queue_push("Retro Achievements login error", 0, 5 * 60, false);
rarch_main_msg_queue_push("Please make sure your account information is correct", 0, 5 * 60, false);
RARCH_LOG("CHEEVOS error getting user token\n");
return -1;
}
@ -1316,6 +1331,14 @@ static unsigned cheevos_get_game_id(unsigned char *hash, retro_time_t *timeout)
char game_id[16];
int res;
RARCH_LOG(
"CHEEVOS getting game id for hash %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",
hash[ 0], hash[ 1], hash[ 2], hash[ 3],
hash[ 4], hash[ 5], hash[ 6], hash[ 7],
hash[ 8], hash[ 9], hash[10], hash[11],
hash[12], hash[13], hash[14], hash[15]
);
snprintf(
request, sizeof(request),
"http://retroachievements.org/dorequest.php?r=gameid&u=%s&m=%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
@ -1541,7 +1564,11 @@ int cheevos_load(const void *data, size_t size)
free((void*)json);
}
rarch_main_msg_queue_push("Error loading achievements", 0, 5 * 60, false);
}
else
rarch_main_msg_queue_push("This game doesn't feature achievements", 0, 5 * 60, false);
cheevos_locals.loaded = 0;
return -1;