diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c index 0f9bb41735..85c45889ac 100644 --- a/console/griffin/griffin.c +++ b/console/griffin/griffin.c @@ -284,8 +284,7 @@ MENU #if defined(_XBOX360) #include "../../360/frontend-xdk/menu.cpp" #elif defined(_XBOX1) -//#include "../../xbox1/frontend/menu.c" -#include "../../ps3/frontend/menu.c" +#include "../rmenu/rmenu.c" #include "../../xbox1/frontend/RetroLaunch/IoSupport.cpp" #include "../../xbox1/frontend/RetroLaunch/Surface.cpp" #elif defined(GEKKO) diff --git a/console/rmenu/rmenu.c b/console/rmenu/rmenu.c index f18087ad86..b4f1a2b39e 100644 --- a/console/rmenu/rmenu.c +++ b/console/rmenu/rmenu.c @@ -74,18 +74,9 @@ #include "../../xbox1/frontend/RetroLaunch/Surface.h" #include "../../gfx/fonts/xdk1_xfonts.h" -#define NUM_ENTRY_PER_PAGE 17 - #define ROM_PANEL_WIDTH 440 #define ROM_PANEL_HEIGHT 20 -#define MAIN_TITLE_X 305 -#define MAIN_TITLE_Y 30 -#define MAIN_TITLE_COLOR 0xFFFFFFFF - -#define MENU_MAIN_BG_X 0 -#define MENU_MAIN_BG_Y 0 - int xpos, ypos; // Rom selector panel with coords d3d_surface_t m_menuMainRomSelectPanel; @@ -672,7 +663,7 @@ static void display_menubar(menu *current_menu) #ifdef _XBOX1 //Render background image - d3d_surface_render(&m_menuMainBG, MENU_MAIN_BG_X, MENU_MAIN_BG_Y, + d3d_surface_render(&m_menuMainBG, 0, 0, m_menuMainBG.m_imageInfo.Width, m_menuMainBG.m_imageInfo.Height); #else render_msg_place_func(x_position, 0.05f, 1.4f, WHITE, current_menu->title);