ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove hashes from task_overlay

This commit is contained in:
twinaphex 2018-02-25 13:03:54 +01:00
parent 938f6cc26e
commit fae9223641
2 changed files with 34 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
input/input_overlay.h
View File

@ -28,12 +28,6 @@
RETRO_BEGIN_DECLS RETRO_BEGIN_DECLS
#define BOX_RADIAL 0x18df06d2U
#define BOX_RECT 0x7c9d4d93U
#define KEY_ANALOG_LEFT 0x56b92e81U
#define KEY_ANALOG_RIGHT 0x2e4dc654U
/* Overlay driver acts as a medium between input drivers /* Overlay driver acts as a medium between input drivers
* and video driver. * and video driver.
* *

28
tasks/task_overlay.c
View File

@ -110,7 +110,6 @@ static bool task_overlay_load_desc(
bool normalized, float alpha_mod, float range_mod) bool normalized, float alpha_mod, float range_mod)
{ {
float width_mod, height_mod; float width_mod, height_mod;
uint32_t box_hash, key_hash;
char overlay_desc_key[64]; char overlay_desc_key[64];
char conf_key[64]; char conf_key[64];
char overlay_desc_normalized_key[64]; char overlay_desc_normalized_key[64];
@ -174,22 +173,14 @@ static bool task_overlay_load_desc(
y = list->elems[2].data; y = list->elems[2].data;
box = list->elems[3].data; box = list->elems[3].data;
box_hash = djb2_calculate(box);
key_hash = djb2_calculate(key);
desc->retro_key_idx = 0; desc->retro_key_idx = 0;
BIT256_CLEAR_ALL(desc->button_mask); BIT256_CLEAR_ALL(desc->button_mask);
switch (key_hash) if (string_is_equal(key, "analog_left"))
{
case KEY_ANALOG_LEFT:
desc->type = OVERLAY_TYPE_ANALOG_LEFT; desc->type = OVERLAY_TYPE_ANALOG_LEFT;
break; else if (string_is_equal(key, "analog_right"))
case KEY_ANALOG_RIGHT:
desc->type = OVERLAY_TYPE_ANALOG_RIGHT; desc->type = OVERLAY_TYPE_ANALOG_RIGHT;
break; else if (strstr(key, "retrok_") == key)
default:
if (strstr(key, "retrok_") == key)
{ {
desc->type = OVERLAY_TYPE_KEYBOARD; desc->type = OVERLAY_TYPE_KEYBOARD;
desc->retro_key_idx = input_config_translate_str_to_rk(key + 7); desc->retro_key_idx = input_config_translate_str_to_rk(key + 7);
@ -217,8 +208,6 @@ static bool task_overlay_load_desc(
desc->next_index_name, sizeof(desc->next_index_name)); desc->next_index_name, sizeof(desc->next_index_name));
} }
} }
break;
}
width_mod = 1.0f; width_mod = 1.0f;
height_mod = 1.0f; height_mod = 1.0f;
@ -232,15 +221,12 @@ static bool task_overlay_load_desc(
desc->x = (float)strtod(x, NULL) * width_mod; desc->x = (float)strtod(x, NULL) * width_mod;
desc->y = (float)strtod(y, NULL) * height_mod; desc->y = (float)strtod(y, NULL) * height_mod;
switch (box_hash) if (string_is_equal(box, "radial"))
{
case BOX_RADIAL:
desc->hitbox = OVERLAY_HITBOX_RADIAL; desc->hitbox = OVERLAY_HITBOX_RADIAL;
break; else if (string_is_equal(box, "rect"))
case BOX_RECT:
desc->hitbox = OVERLAY_HITBOX_RECT; desc->hitbox = OVERLAY_HITBOX_RECT;
break; else
default: {
RARCH_ERR("[Overlay]: Hitbox type (%s) is invalid. Use \"radial\" or \"rect\".\n", box); RARCH_ERR("[Overlay]: Hitbox type (%s) is invalid. Use \"radial\" or \"rect\".\n", box);
ret = false; ret = false;
goto end; goto end;