libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(RMenu) Get rid of RMenu frame advance - we will use RetroArch's

Browse Source 
frame advance functionality from now on - this hacky stuff can go
This commit is contained in:
twinaphex 2013-09-29 03:36:51 +02:00
parent 632a5480b9
commit a3559645b2
6 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/menu/rmenu.c
View File

@ -1690,18 +1690,6 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
break;
}
break;
case INGAME_MENU_FRAME_ADVANCE:
switch (action)
{
case RGUI_ACTION_OK:
case RGUI_ACTION_SCROLL_DOWN:
case RGUI_ACTION_SCROLL_UP:
g_extern.lifecycle_state |= (1ULL << RARCH_FRAMEADVANCE);
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT);
settings_set(1ULL << S_FRAME_ADVANCE);
return -1;
}
break;
case SETTING_CUSTOM_VIEWPORT:
if (action == RGUI_ACTION_OK)
menu_stack_push(INGAME_MENU_CUSTOM_RATIO, false);
@ -2310,10 +2298,6 @@ static int select_setting(void *data, uint64_t action)
strlcpy(text, "Settings", sizeof(text));
strlcpy(setting_text, "...", sizeof(setting_text));
break;
case INGAME_MENU_FRAME_ADVANCE:
strlcpy(text, "Frame Advance", sizeof(text));
strlcpy(setting_text, "", sizeof(setting_text));
break;
case INGAME_MENU_SCREENSHOT_MODE:
strlcpy(text, "Take Screenshot", sizeof(text));
strlcpy(setting_text, "", sizeof(setting_text));

1
frontend/menu/rmenu.h
View File

@ -133,7 +133,6 @@ enum
INGAME_MENU_SCREENSHOT_MODE,
INGAME_MENU_RETURN_TO_GAME,
INGAME_MENU_RESET,
INGAME_MENU_FRAME_ADVANCE,
#ifdef HAVE_MULTIMAN
INGAME_MENU_RETURN_TO_MULTIMAN,
#endif

9
frontend/menu/rmenu_xui.cpp
View File

@ -459,10 +459,6 @@ static void init_menulist(unsigned menu_id)
XuiListInsertItems(m_menulist, INGAME_MENU_RESET, 1);
XuiListSetText(m_menulist, INGAME_MENU_RESET, L"Restart Game");
XuiListInsertItems(m_menulist, INGAME_MENU_FRAME_ADVANCE, 1);
XuiListSetText(m_menulist, INGAME_MENU_FRAME_ADVANCE, L"Frame Advance");
XuiListInsertItems(m_menulist, INGAME_MENU_QUIT_RETROARCH, 1);
XuiListSetText(m_menulist, INGAME_MENU_QUIT_RETROARCH, L"Quit RetroArch");
break;
@ -1399,11 +1395,6 @@ HRESULT CRetroArchMain::OnControlNavigate(XUIMessageControlNavigate *pControlNav
process_input_ret = -1;
}
break;
case INGAME_MENU_FRAME_ADVANCE:
g_extern.lifecycle_state |= (1ULL << RARCH_FRAMEADVANCE);
settings_set(1ULL << S_FRAME_ADVANCE);
process_input_ret = -1;
break;
case INGAME_MENU_QUIT_RETROARCH:
if (input == XUI_CONTROL_NAVIGATE_OK)
{

1
frontend/menu/rmenu_xui.h
View File

@ -64,7 +64,6 @@ enum
INGAME_MENU_SCREENSHOT_MODE,
INGAME_MENU_RETURN_TO_GAME,
INGAME_MENU_RESET,
INGAME_MENU_FRAME_ADVANCE,
INGAME_MENU_QUIT_RETROARCH,
INGAME_MENU_MAIN_MODE,
};

1
general.h
View File

@ -640,7 +640,6 @@ enum
S_AUDIO_MUTE,
S_AUDIO_CONTROL_RATE_DECREMENT,
S_AUDIO_CONTROL_RATE_INCREMENT,
S_FRAME_ADVANCE,
S_HW_TEXTURE_FILTER,
S_RESOLUTION_PREVIOUS,
S_RESOLUTION_NEXT,

6
settings.c
View File

@ -1242,12 +1242,6 @@ void settings_set(uint64_t settings)
g_settings.audio.rate_control = true;
}
if (settings & (1ULL << S_FRAME_ADVANCE))
{
g_extern.lifecycle_state |= (1ULL << RARCH_FRAMEADVANCE);
g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
}
if (settings & (1ULL << S_HW_TEXTURE_FILTER))
g_settings.video.smooth = !g_settings.video.smooth;