libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-01 06:23:42 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

(Zarch) Namespace cleanups

Browse Source
This commit is contained in:
twinaphex 2015-10-25 02:22:00 +01:00
parent c089634f26
commit 6b8cfeb5d9
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
menu/drivers/zarch.c
View File

@ -352,25 +352,25 @@ static void zarch_zui_snow(zui_t *zui)
for (i = 0; i < NPARTICLES; ++i) for (i = 0; i < NPARTICLES; ++i)
{ {
part_t *p = &particles[i]; part_t *p = (part_t*)&particles[i];
if (p->alive) if (p->alive)
{ {
int16_t mouse_x = menu_input_mouse_state(MENU_MOUSE_X_AXIS); int16_t mouse_x = menu_input_mouse_state(MENU_MOUSE_X_AXIS);
p->y += p->yspeed; p->y += p->yspeed;
p->x += zarch_zui_scalef(mouse_x, 0, zui->width, -0.3, 0.3) + p->xspeed; p->x += zarch_zui_scalef(mouse_x, 0, zui->width, -0.3, 0.3) + p->xspeed;
p->alive = p->y >= 0 && p->y < (int)zui->height && p->x >= 0 && p->x < (int)zui->width; p->alive = p->y >= 0 && p->y < (int)zui->height && p->x >= 0 && p->x < (int)zui->width;
} }
else if (max_gen > 0 && timeout <= 0) else if (max_gen > 0 && timeout <= 0)
{ {
p->xspeed = zarch_zui_randf(-0.2, 0.2); p->xspeed = zarch_zui_randf(-0.2, 0.2);
p->yspeed = zarch_zui_randf(1, 2); p->yspeed = zarch_zui_randf(1, 2);
p->y = 0; p->y = 0;
p->x = rand() % (int)zui->width; p->x = rand() % (int)zui->width;
p->alpha = (float)rand() / (float)RAND_MAX; p->alpha = (float)rand() / (float)RAND_MAX;
p->alive = true; p->alive = true;
max_gen--; max_gen--;
} }
@ -459,8 +459,8 @@ static bool zarch_zui_list_item(zui_t *zui, int x1, int y1, const char *label, b
static void zarch_zui_tabbed_begin(zui_t *zui, zui_tabbed_t *tab, int x, int y) static void zarch_zui_tabbed_begin(zui_t *zui, zui_tabbed_t *tab, int x, int y)
{ {
tab->x = x; tab->x = x;
tab->y = y; tab->y = y;
tab->tabline_size = 60 + 4; tab->tabline_size = 60 + 4;
} }
@ -505,16 +505,15 @@ static void zarch_zui_render_lay_settings(zui_t *zui)
{ {
int width, x1, y1; int width, x1, y1;
static zui_tabbed_t tabbed = {~0}; static zui_tabbed_t tabbed = {~0};
tabbed.vertical = true; tabbed.vertical = true;
tabbed.tab_width = 100; tabbed.tab_width = 100;
zarch_zui_tabbed_begin(zui, &tabbed, zui->width - 100, 20); zarch_zui_tabbed_begin(zui, &tabbed, zui->width - 100, 20);
width = 290; width = 290;
x1 = zui->width - width - 20; x1 = zui->width - width - 20;
y1 = 20; y1 = 20;
y1 += 64;
y1 += 64;
if (zarch_zui_button_full(zui, x1, y1, x1 + width, y1 + 64, "Back")) if (zarch_zui_button_full(zui, x1, y1, x1 + width, y1 + 64, "Back"))
layout = LAY_HOME; layout = LAY_HOME;