(XDK) Cleanups

This commit is contained in:
twinaphex 2015-04-06 20:51:24 +02:00
parent 160c581df6
commit b950e4a86a
2 changed files with 3 additions and 8 deletions

View File

@ -1065,7 +1065,7 @@ static void d3d_draw_texture(d3d_video_t *d3d)
menu_texture->x = 0; menu_texture->x = 0;
menu_texture->y = 0; menu_texture->y = 0;
if (d3d->menu_texture_enable) if (d3d->menu->enabled)
{ {
d3d_enable_blend_func(d3d->dev); d3d_enable_blend_func(d3d->dev);
texture_image_render(d3d, menu_texture, texture_image_render(d3d, menu_texture,
@ -1639,7 +1639,7 @@ static bool d3d_frame(void *data, const void *frame,
#ifdef _XBOX #ifdef _XBOX
/* TODO - should be refactored. */ /* TODO - should be refactored. */
if (d3d && d3d->menu_texture_enable) if (d3d && d3d->menu->enabled)
d3d_draw_texture(d3d); d3d_draw_texture(d3d);
#endif #endif
#endif #endif
@ -1863,10 +1863,7 @@ static void d3d_set_menu_texture_enable(void *data,
if (!d3d) if (!d3d)
return; return;
#ifdef _XBOX #ifdef HAVE_MENU
d3d->menu_texture_enable = state;
d3d->menu_texture_full_screen = full_screen;
#else
if (!d3d->menu) if (!d3d->menu)
return; return;

View File

@ -136,8 +136,6 @@ typedef struct d3d_video
std::vector<overlay_t> overlays; std::vector<overlay_t> overlays;
#endif #endif
bool menu_texture_enable;
bool menu_texture_full_screen;
#if defined(HAVE_MENU) #if defined(HAVE_MENU)
overlay_t *menu; overlay_t *menu;
#endif #endif