CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-15 08:57:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(PS3) Menu fixes

Browse Source
This commit is contained in:
TwinAphex51224 2012-01-13 01:01:08 +01:00
parent 7b0e1e8022
commit 83c3d7be57
5 changed files with 21 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ps3/main.c
View File

@ -243,9 +243,6 @@ int main(int argc, char *argv[])
menu_init();
menu_loop();
/* FIXME - As long as we don't use a menu */
//snprintf(g_extern.system.fullpath, sizeof(g_extern.system.fullpath), "/dev_hdd0/game/SNES90000/USRDIR/main.sfc");
char arg1[] = "ssnes";
char arg2[PATH_MAX];

38
ps3/menu-entries.h
View File

@ -104,7 +104,6 @@ static item items_generalsettings[MAX_NO_OF_CONTROLS_SETTINGS] =
0,
1
},
#ifdef HAVE_GAMEAWARE
{
SETTING_GAME_AWARE_SHADER,
"Game Aware Shader Script",
@ -123,7 +122,6 @@ static item items_generalsettings[MAX_NO_OF_CONTROLS_SETTINGS] =
0,
1
},
#endif
{
SETTING_FONT_SIZE,
"Font Size",
@ -412,6 +410,24 @@ static item items_generalsettings[MAX_NO_OF_CONTROLS_SETTINGS] =
0,
1
},
{
SETTING_EMU_CURRENT_SAVE_STATE_SLOT,
"Current save state slot",
0.0f,
0.0f,
YELLOW,
WHITE,
"INFO - Set the current savestate slot (can also be configured ingame).",
LIGHTBLUE,
0.91f,
0.09f,
0.83f,
NULL,
{0},
{0},
0,
1
},
{
SETTING_EMU_DEFAULT_ALL,
"DEFAULT",
@ -514,7 +530,6 @@ static item items_generalsettings[MAX_NO_OF_CONTROLS_SETTINGS] =
{0},
{0}
},
#ifdef HAVE_CHEATS
{
SETTING_PATH_CHEATS,
"Cheatfile Directory",
@ -531,7 +546,6 @@ static item items_generalsettings[MAX_NO_OF_CONTROLS_SETTINGS] =
{0},
{0}
},
#endif
{
SETTING_PATH_DEFAULT_ALL,
"DEFAULT",
@ -901,11 +915,7 @@ static item items_generalsettings[MAX_NO_OF_CONTROLS_SETTINGS] =
NULL, //setting ptr
{0},
{0},
#ifdef HAVE_CHEATS
SSNES_CHEAT_INDEX_PLUS
#else
0
#endif
},
{
SETTING_CONTROLS_BUTTON_L2_ANALOG_R_LEFT,
@ -922,11 +932,7 @@ static item items_generalsettings[MAX_NO_OF_CONTROLS_SETTINGS] =
NULL, //setting ptr
{0},
{0},
#ifdef HAVE_CHEATS
SSNES_CHEAT_INDEX_MINUS
#else
0
#endif
},
{
SETTING_CONTROLS_BUTTON_L2_ANALOG_R_UP,
@ -943,11 +949,7 @@ static item items_generalsettings[MAX_NO_OF_CONTROLS_SETTINGS] =
NULL, //setting ptr
{0},
{0},
#ifdef HAVE_CHEATS
SSNES_CHEAT_TOGGLE
#else
0
#endif
},
{
SETTING_CONTROLS_BUTTON_L2_ANALOG_R_DOWN,
@ -964,11 +966,7 @@ static item items_generalsettings[MAX_NO_OF_CONTROLS_SETTINGS] =
NULL, //setting ptr
{0},
{0},
#ifdef HAVE_CHEATS
SSNES_CHEAT_INPUT
#else
0
#endif
},
{
SETTING_CONTROLS_BUTTON_R2_ANALOG_R_RIGHT,

10
ps3/menu.c
View File

@ -628,18 +628,10 @@ static void display_label_value(uint64_t switchvalue)
break;
case SETTING_SHADER:
{
#if 0
extract_filename_only(g_settings.video.cg_shader_path);
cellDbgFontPrintf(0.5f, menu_generalvideosettings.items[menu_generalvideosettings.items[switchvalue].enum_id].text_ypos, FONT_SIZE, GREEN, "%s", fname_without_path_extension);
#endif
}
break;
case SETTING_SHADER_2:
{
#if 0
extract_filename_only(g_settings.video.second_pass_shader);
cellDbgFontPrintf(0.5f, menu_generalvideosettings.items[switchvalue].text_ypos, FONT_SIZE, !(g_settings.video.render_to_texture) ? SILVER : GREEN, "%s", fname_without_path_extension);
#endif
}
break;
case SETTING_FONT_SIZE:
@ -658,7 +650,6 @@ static void display_label_value(uint64_t switchvalue)
cellDbgFontPrintf(0.5f, menu_generalvideosettings.items[menu_generalvideosettings.items[switchvalue].enum_id].text_ypos, FONT_SIZE, (menu_generalvideosettings.items[menu_generalvideosettings.items[switchvalue].enum_id].enabled == 0) ? SILVER : g_settings.video.fbo_scale_x == 2 && g_settings.video.fbo_scale_y ? GREEN : ORANGE, "%dx (X), %dx (Y)", g_settings.video.fbo_scale_x, g_settings.video.fbo_scale_y);
break;
case SETTING_HW_OVERSCAN_AMOUNT:
//cellDbgFontPrintf (0.5f, menu_generalvideosettings.items[menu_generalvideosettings.items[switchvalue].enum_id].text_ypos, FONT_SIZE, Settings.PS3OverscanAmount == 0 ? GREEN : ORANGE, "%f", (float)Settings.PS3OverscanAmount/100);
break;
case SETTING_SOUND_MODE:
break;
@ -724,7 +715,6 @@ static void display_label_value(uint64_t switchvalue)
case SETTING_CONTROLS_ANALOG_R_DOWN:
case SETTING_CONTROLS_ANALOG_R_LEFT:
case SETTING_CONTROLS_ANALOG_R_RIGHT:
//cellDbgFontPuts(0.5f, menu_controlssettings.items[switchvalue].text_ypos, FONT_SIZE, control_binds[currently_selected_controller_menu][switchvalue-(FIRST_CONTROL_BIND)] == default_control_binds[switchvalue-FIRST_CONTROL_BIND] ? GREEN : ORANGE, Input_PrintMappedButton(control_binds[currently_selected_controller_menu][switchvalue-FIRST_CONTROL_BIND]));
break;
}
}

1
ps3/menu.h
View File

@ -119,7 +119,6 @@ enum
SETTING_PATH_SAVESTATES_DIRECTORY,
SETTING_PATH_SRAM_DIRECTORY,
SETTING_PATH_CHEATS,
SETTING_PATH_BASE_DIRECTORY,
SETTING_PATH_DEFAULT_ALL,
SETTING_CONTROLS_SCHEME,
SETTING_CONTROLS_NUMBER,

8
ps3/settings-logic.h
View File

@ -143,13 +143,13 @@ static void producesettingentry(uint64_t switchvalue)
case SETTING_HW_TEXTURE_FILTER:
if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state) || CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state) || CTRL_CROSS(state))
{
g_settings.video.smooth = !g_settings.video.smooth;
//g_settings.video.smooth = !g_settings.video.smooth;
//ps3graphics_set_smooth(Settings.PS3Smooth, 0);
set_text_message("", 7);
//set_text_message("", 7);
}
if(CTRL_START(state))
{
g_settings.video.smooth = 1;
//g_settings.video.smooth = 1;
//ps3graphics_set_smooth(Settings.PS3Smooth, 0);
}
break;
@ -310,7 +310,6 @@ static void producesettingentry(uint64_t switchvalue)
}
break;
#ifdef HAVE_CHEATS
case SETTING_PATH_CHEATS:
if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state) || CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state) || CTRL_CROSS(state))
{
@ -320,7 +319,6 @@ static void producesettingentry(uint64_t switchvalue)
set_initial_dir_tmpbrowser = true;
}
break;
#endif
case SETTING_PATH_DEFAULT_ALL:
if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state) || CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state) || CTRL_CROSS(state) || CTRL_START(state))
{