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

(XMB) Move another global variable to XMB

This commit is contained in:
twinaphex 2014-10-09 21:57:05 +02:00
parent fd7824ede5
commit 07cd41c46b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/menu/disp/xmb.c
View File

@ -59,7 +59,6 @@ typedef struct
} xmb_node_t; } xmb_node_t;
char xmb_title[256] = "";
int selptr = 0; int selptr = 0;
int oldselptr = 0; int oldselptr = 0;
@ -98,6 +97,7 @@ typedef struct xmb_handle
unsigned xmb_term_height; unsigned xmb_term_height;
char icon_dir[4]; char icon_dir[4];
char box_message[PATH_MAX]; char box_message[PATH_MAX];
char xmb_title[PATH_MAX];
struct xmb_texture_item textures[RMB_TEXTURE_LAST]; struct xmb_texture_item textures[RMB_TEXTURE_LAST];
int xmb_icon_size; int xmb_icon_size;
float xmb_alpha; float xmb_alpha;
@ -199,6 +199,7 @@ static void xmb_draw_text(const char *str, float x,
float y, float scale, float alpha) float y, float scale, float alpha)
{ {
uint8_t a8 = 0; uint8_t a8 = 0;
struct font_params params = {0};
xmb_handle_t *xmb = (xmb_handle_t*)xmb_menu_data; xmb_handle_t *xmb = (xmb_handle_t*)xmb_menu_data;
if (!xmb) if (!xmb)
@ -221,7 +222,6 @@ static void xmb_draw_text(const char *str, float x,
gl_set_viewport(gl, gl->win_width, gl->win_height, false, false); gl_set_viewport(gl, gl->win_width, gl->win_height, false, false);
struct font_params params = {0};
params.x = x / gl->win_width; params.x = x / gl->win_width;
params.y = 1.0f - y / gl->win_height; params.y = 1.0f - y / gl->win_height;
@ -460,12 +460,12 @@ static void xmb_frame(void)
selptr = begin = driver.menu->selection_ptr; selptr = begin = driver.menu->selection_ptr;
get_title(label, dir, menu_type, xmb_title, sizeof(xmb_title)); get_title(label, dir, menu_type, xmb->xmb_title, sizeof(xmb->xmb_title));
if (selptr != oldselptr) if (selptr != oldselptr)
xmb_selection_pointer_changed(); xmb_selection_pointer_changed();
xmb_draw_text(xmb_title, 30, 40, 1, 1); xmb_draw_text(xmb->xmb_title, 30, 40, 1, 1);
const char *core_name = g_extern.menu.info.library_name; const char *core_name = g_extern.menu.info.library_name;
if (!core_name) if (!core_name)