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

(360) Replace static function return_to_game() with calls to new 

rarch_settings_change
This commit is contained in:
TwinAphex51224 2012-05-29 02:05:23 +02:00
parent e49e23687a
commit 87d04b4bbd
3 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
360/menu.cpp
View File

@ -33,13 +33,6 @@ filebrowser_t browser;
filebrowser_t tmp_browser; filebrowser_t tmp_browser;
uint32_t set_shader = 0; uint32_t set_shader = 0;
static void return_to_game (void)
{
g_console.frame_advance_enable = false;
g_console.menu_enable = false;
g_console.mode_switch = MODE_EMULATION;
}
static void return_to_dashboard (void) static void return_to_dashboard (void)
{ {
g_console.menu_enable = false; g_console.menu_enable = false;
@ -351,14 +344,14 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
if (g_console.emulator_initialized) if (g_console.emulator_initialized)
{ {
rarch_load_state(); rarch_load_state();
return_to_game(); rarch_settings_change(S_RETURN_TO_GAME);
} }
break; break;
case MENU_ITEM_SAVE_STATE: case MENU_ITEM_SAVE_STATE:
if (g_console.emulator_initialized) if (g_console.emulator_initialized)
{ {
rarch_save_state(); rarch_save_state();
return_to_game(); rarch_settings_change(S_RETURN_TO_GAME);
} }
break; break;
case MENU_ITEM_KEEP_ASPECT_RATIO: case MENU_ITEM_KEEP_ASPECT_RATIO:
@ -415,11 +408,7 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
break; break;
case MENU_ITEM_FRAME_ADVANCE: case MENU_ITEM_FRAME_ADVANCE:
if (g_console.emulator_initialized) if (g_console.emulator_initialized)
{ rarch_settings_change(S_FRAME_ADVANCE);
g_console.frame_advance_enable = true;
g_console.menu_enable = false;
g_console.mode_switch = MODE_EMULATION;
}
break; break;
case MENU_ITEM_SCREENSHOT_MODE: case MENU_ITEM_SCREENSHOT_MODE:
if (g_console.info_msg_enable) if (g_console.info_msg_enable)
@ -431,13 +420,13 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
case MENU_ITEM_RESET: case MENU_ITEM_RESET:
if (g_console.emulator_initialized) if (g_console.emulator_initialized)
{ {
return_to_game(); rarch_settings_change(S_RETURN_TO_GAME);
rarch_game_reset(); rarch_game_reset();
} }
break; break;
case MENU_ITEM_RETURN_TO_GAME: case MENU_ITEM_RETURN_TO_GAME:
if (g_console.emulator_initialized) if (g_console.emulator_initialized)
return_to_game(); rarch_settings_change(S_RETURN_TO_GAME);
break; break;
case MENU_ITEM_RETURN_TO_DASHBOARD: case MENU_ITEM_RETURN_TO_DASHBOARD:
return_to_dashboard(); return_to_dashboard();
@ -506,7 +495,7 @@ HRESULT CRetroArchFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle
{ {
memset(g_console.rom_path, 0, sizeof(g_console.rom_path)); memset(g_console.rom_path, 0, sizeof(g_console.rom_path));
snprintf(g_console.rom_path, sizeof(g_console.rom_path), "%s\\%s", FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(browser), strbuffer); snprintf(g_console.rom_path, sizeof(g_console.rom_path), "%s\\%s", FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(browser), strbuffer);
return_to_game(); rarch_settings_change(S_RETURN_TO_GAME);
g_console.initialize_rarch_enable = 1; g_console.initialize_rarch_enable = 1;
} }
} }

13
console/console_settings.c
View File

@ -26,6 +26,11 @@ void rarch_settings_change(unsigned setting)
{ {
switch(setting) switch(setting)
{ {
case S_FRAME_ADVANCE:
g_console.frame_advance_enable = true;
g_console.menu_enable = false;
g_console.mode_switch = MODE_EMULATION;
break;
case S_HW_TEXTURE_FILTER: case S_HW_TEXTURE_FILTER:
g_settings.video.smooth = !g_settings.video.smooth; g_settings.video.smooth = !g_settings.video.smooth;
break; break;
@ -35,17 +40,21 @@ void rarch_settings_change(unsigned setting)
case S_OVERSCAN_DECREMENT: case S_OVERSCAN_DECREMENT:
g_console.overscan_amount -= 0.01f; g_console.overscan_amount -= 0.01f;
g_console.overscan_enable = true; g_console.overscan_enable = true;
if(g_console.overscan_amount == 0.0f) if(g_console.overscan_amount == 0.0f)
g_console.overscan_enable = false; g_console.overscan_enable = false;
break; break;
case S_OVERSCAN_INCREMENT: case S_OVERSCAN_INCREMENT:
g_console.overscan_amount += 0.01f; g_console.overscan_amount += 0.01f;
g_console.overscan_enable = true; g_console.overscan_enable = true;
if(g_console.overscan_amount == 0.0f) if(g_console.overscan_amount == 0.0f)
g_console.overscan_enable = 0; g_console.overscan_enable = 0;
break; break;
case S_RETURN_TO_GAME:
g_console.frame_advance_enable = false;
//g_console.ingame_menu_item = 0;
g_console.menu_enable = false;
g_console.mode_switch = MODE_EMULATION;
break;
case S_ROTATION_DECREMENT: case S_ROTATION_DECREMENT:
if(g_console.screen_orientation > ORIENTATION_NORMAL) if(g_console.screen_orientation > ORIENTATION_NORMAL)
g_console.screen_orientation--; g_console.screen_orientation--;

4
console/console_settings.h
View File

@ -19,10 +19,12 @@
enum enum
{ {
S_HW_TEXTURE_FILTER = 0, S_FRAME_ADVANCE = 0,
S_HW_TEXTURE_FILTER,
S_HW_TEXTURE_FILTER_2, S_HW_TEXTURE_FILTER_2,
S_OVERSCAN_DECREMENT, S_OVERSCAN_DECREMENT,
S_OVERSCAN_INCREMENT, S_OVERSCAN_INCREMENT,
S_RETURN_TO_GAME,
S_ROTATION_DECREMENT, S_ROTATION_DECREMENT,
S_ROTATION_INCREMENT, S_ROTATION_INCREMENT,
S_SAVESTATE_DECREMENT, S_SAVESTATE_DECREMENT,