mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

RA Leaderboards: Submit condition hex multipliers

Browse Source 
Wasn't aware this was possible
This commit is contained in:
celerizer 2017-11-12 11:23:08 -06:00 committed by GitHub
parent b11922dd17
commit 91c40ddfbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cheevos/cheevos.c
View File

@ -975,7 +975,7 @@ static int cheevos_parse_expression(cheevos_expr_t *expr, const char* mem)
if (*aux != '*')
{
/* expression has no multiplier */
// expression has no multiplier
if (*aux == '_')
{
aux++;
@ -989,11 +989,11 @@ static int cheevos_parse_expression(cheevos_expr_t *expr, const char* mem)
i++;
}
/* no multiplier at end of string */
// no multiplier at end of string
else if (*aux == '\0' || *aux == '"' || *aux == ',')
return 0;
/* invalid character in expression */
// invalid character in expression
else
{
free((void*)expr->terms);
@ -1002,7 +1002,10 @@ static int cheevos_parse_expression(cheevos_expr_t *expr, const char* mem)
}
else
{
expr->terms[i].multiplier = strtod(aux + 1, &end);
if(aux[1] == 'h' || aux[1] == 'H')
expr->terms[i].multiplier = (double)strtol(aux + 2, &end, 16);
else
expr->terms[i].multiplier = strtod(aux + 1, &end);
aux = end;
if(*aux == '$')
@ -1014,6 +1017,7 @@ static int cheevos_parse_expression(cheevos_expr_t *expr, const char* mem)
else
expr->terms[i].compare_next = false;
aux++;
i++;
}
}
@ -1179,7 +1183,7 @@ static void cheevos_format_value(const unsigned value, const unsigned type,
unsigned cheevos_parse_format(cheevos_field_t* format)
{
/* Most likely */
//Most likely
if (strncmp(format->string, "VALUE", format->length) == 0)
return CHEEVOS_FORMAT_VALUE;
else if (strncmp(format->string, "TIME", format->length) == 0)
@ -1187,13 +1191,13 @@ unsigned cheevos_parse_format(cheevos_field_t* format)
else if (strncmp(format->string, "SCORE", format->length) == 0)
return CHEEVOS_FORMAT_SCORE;
/* Less likely */
//Less likely
else if (strncmp(format->string, "MILLISECS", format->length) == 0)
return CHEEVOS_FORMAT_MILLIS;
else if (strncmp(format->string, "TIMESECS", format->length) == 0)
return CHEEVOS_FORMAT_SECS;
/* Rare (RPS only) */
//Rare (RPS only)
else if (strncmp(format->string, "POINTS", format->length) == 0)
return CHEEVOS_FORMAT_SCORE;
else if (strncmp(format->string, "FRAMES", format->length) == 0)
@ -1799,7 +1803,7 @@ static int cheevos_expr_value(cheevos_expr_t* expr)
cheevos_term_t* term = expr->terms;
unsigned i;
/* Separate possible values with '$' operator, submit the largest */
//Separate possible values with '$' operator, submit the largest
unsigned current_value = 0;
int values[expr->compare_count];
memset(values, 0, sizeof values);
@ -1907,9 +1911,8 @@ static void cheevos_test_leaderboards(void)
{
lboard->active = 0;
if (value == 0)
if (value == 0) //failsafe for improper LBs
{
/* failsafe for improper LBs */
RARCH_LOG("[CHEEVOS]: error: lboard %s tried to submit 0\n", lboard->title);
runloop_msg_queue_push("Leaderboard attempt cancelled!", 0, 2 * 60, false);
}