mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-26 09:35:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(360) Have 360 port use same setting variables as PS3 port

Browse Source 
from g_console struct
This commit is contained in:
TwinAphex51224 2012-02-02 19:01:52 +01:00
parent a328dbd213
commit 15bc0e0813
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
360/main.c
View File

@ -46,7 +46,6 @@ typedef struct _STRING {
extern "C" int __stdcall ObCreateSymbolicLink( STRING*, STRING*); extern "C" int __stdcall ObCreateSymbolicLink( STRING*, STRING*);
uint32_t mode_switch = MODE_MENU;
bool init_ssnes = false; bool init_ssnes = false;
int Mounted[20]; int Mounted[20];
uint32_t g_emulator_initialized = 0; uint32_t g_emulator_initialized = 0;
@ -152,16 +151,18 @@ int main(int argc, char *argv[])
config_set_defaults(); config_set_defaults();
g_console->mode_switch = MODE_MENU;
xdk360_video_init(); xdk360_video_init();
menu_init(); menu_init();
begin_loop: begin_loop:
if(mode_switch == MODE_EMULATION) if(g_console->mode_switch == MODE_EMULATION)
{ {
while(ssnes_main_iterate()); while(ssnes_main_iterate());
} }
else if(mode_switch == MODE_MENU) else if(g_console->mode_switch == MODE_MENU)
{ {
menu_loop(); menu_loop();

13
360/menu.cpp
View File

@ -28,7 +28,6 @@
CSSNES app; CSSNES app;
HXUIOBJ hMainScene; HXUIOBJ hMainScene;
uint32_t menu_is_running;
/* Register custom classes */ /* Register custom classes */
HRESULT CSSNES::RegisterXuiClasses (void) HRESULT CSSNES::RegisterXuiClasses (void)
@ -88,8 +87,8 @@ HRESULT CSSNESMain::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
if ( hObjPressed == m_filebrowser ) if ( hObjPressed == m_filebrowser )
{ {
menu_is_running = false; g_console->menu_enable = false;
mode_switch = MODE_EMULATION; g_console->mode_switch = MODE_EMULATION;
init_ssnes = 1; init_ssnes = 1;
} }
else if ( hObjPressed == m_settings ) else if ( hObjPressed == m_settings )
@ -106,8 +105,8 @@ HRESULT CSSNESMain::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
} }
else if ( hObjPressed == m_quit ) else if ( hObjPressed == m_quit )
{ {
menu_is_running = false; g_console->menu_enable = false;
mode_switch = MODE_EXIT; g_console->mode_switch = MODE_EXIT;
init_ssnes = 0; init_ssnes = 0;
} }
@ -158,7 +157,7 @@ int menu_init (void)
void menu_loop(void) void menu_loop(void)
{ {
menu_is_running = true; g_console->menu_enable = true;
HRESULT hr; HRESULT hr;
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)g_d3d;
@ -175,5 +174,5 @@ void menu_loop(void)
/* Present the frame */ /* Present the frame */
vid->xdk360_render_device->Present(NULL, NULL, NULL, NULL); vid->xdk360_render_device->Present(NULL, NULL, NULL, NULL);
}while(menu_is_running); }while(g_console->menu_enable);
} }

1
360/shared.h
View File

@ -25,5 +25,4 @@ enum
MODE_EXIT MODE_EXIT
}; };
extern uint32_t mode_switch;
extern bool init_ssnes; extern bool init_ssnes;

5
360/xdk360_video.cpp
View File

@ -77,6 +77,7 @@ static void xdk360_gfx_free(void * data)
return; return;
xdk360_video_t *vid = (xdk360_video_t*)data; xdk360_video_t *vid = (xdk360_video_t*)data;
if (!vid) if (!vid)
return; return;
@ -93,8 +94,8 @@ static void xdk360_gfx_free(void * data)
static void *xdk360_gfx_init(const video_info_t *video, const input_driver_t **input, void **input_data) static void *xdk360_gfx_init(const video_info_t *video, const input_driver_t **input, void **input_data)
{ {
if (g_d3d) if (g_d3d)
return g_d3d; return g_d3d;
xdk360_video_t *vid = (xdk360_video_t*)calloc(1, sizeof(xdk360_video_t)); xdk360_video_t *vid = (xdk360_video_t*)calloc(1, sizeof(xdk360_video_t));
if (!vid) if (!vid)