diff --git a/console/rmenu/rmenu.c b/console/rmenu/rmenu.c index f77767913d..c687290d48 100644 --- a/console/rmenu/rmenu.c +++ b/console/rmenu/rmenu.c @@ -457,14 +457,10 @@ static void menu_stack_refresh (item *items, menu *current_menu) if(!(j < default_pos.entries_per_page)) { j = 0; - default_pos.y_position = POSITION_Y_BEGIN; page++; } - items[i].text_xpos = default_pos.x_position; - items[i].text_ypos = default_pos.y_position; items[i].page = page; - default_pos.y_position += default_pos.y_position_increment; j++; } } @@ -1793,7 +1789,7 @@ static void select_setting(item *items, menu *current_menu, uint64_t input) { rmenu_position_t position = {0}; position.x = default_pos.x_position; - position.y = items[i].text_ypos; + position.y = default_pos.starting_y_position; context->render_selection_panel(&position); context->render_msg(default_pos.x_position, default_pos.comment_y_position, default_pos.font_size, WHITE, current_item.comment); diff --git a/console/rmenu/rmenu.h b/console/rmenu/rmenu.h index 9cac5343b3..9f6b845ed9 100644 --- a/console/rmenu/rmenu.h +++ b/console/rmenu/rmenu.h @@ -34,8 +34,6 @@ typedef struct unsigned char enum_id; /* enum ID of item */ char text[64]; /* item label */ char setting_text[64]; /* setting label */ - float text_xpos; /* text X position (upper left corner) */ - float text_ypos; /* text Y position (upper left corner) */ char comment[192]; /* item comment */ unsigned char page; /* page */ } item; diff --git a/console/rmenu/rmenu_entries.h b/console/rmenu/rmenu_entries.h index e88aae0a0e..c287ddee5b 100644 --- a/console/rmenu/rmenu_entries.h +++ b/console/rmenu/rmenu_entries.h @@ -21,8 +21,6 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] = SETTING_CHANGE_RESOLUTION, /* enum ID of item */ "Resolution", /* item label */ "", /* setting label */ - 0.0f, /* text X position */ - 0.0f, /* text Y position */ "INFO - Change the display resolution.", /* item comment */ }, #endif @@ -31,24 +29,18 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] = SETTING_SHADER_PRESETS, "Shader Preset (CGP)", "", - 0.0f, - 0.0f, "INFO - Select a [CG Preset] script.", }, { SETTING_SHADER, "Selected shader #1", "", - 0.0f, - 0.0f, "INFO - Select a shader as [Shader #1]. NOTE: Some shaders might be\ntoo slow at 1080p. If you experience any slowdown, try another shader.", }, { SETTING_SHADER_2, "Selected shader #2", "", - 0.0f, - 0.0f, "INFO - Select a shader as [Shader #2]. NOTE: Some shaders might be\ntoo slow at 1080p. If you experience any slowdown, try another shader.", }, #endif @@ -56,24 +48,18 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] = SETTING_FONT_SIZE, "Font Size", "", - 0.0f, - 0.0f, "INFO - Increase or decrease the font size.", }, { SETTING_KEEP_ASPECT_RATIO, "Aspect Ratio", "", - 0.0f, - 0.0f, "INFO - [Aspect Ratio] is set to 'Scaled (4:3)'.", }, { SETTING_HW_TEXTURE_FILTER, "Hardware Filtering #1", "", - 0.0f, - 0.0f, "INFO - Hardware filtering #1 is set to 'Bilinear'.", }, #ifdef HAVE_FBO @@ -81,24 +67,18 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] = SETTING_HW_TEXTURE_FILTER_2, "Hardware Filtering #2", "", - 0.0f, - 0.0f, "INFO - Hardware filtering #2 is set to 'Bilinear'.", }, { SETTING_SCALE_ENABLED, "Custom Scaling/Dual Shaders", "", - 0.0f, - 0.0f, "INFO - [Custom Scaling] is set to 'ON' - 2x shaders will look much\nbetter, and you can select a shader for [Shader #2].", }, { SETTING_SCALE_FACTOR, "Custom Scaling Factor", "", - 0.0f, - 0.0f, "INFO - [Custom Scaling Factor] is set to '2x'.", }, #endif @@ -107,16 +87,12 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] = SETTING_FLICKER_FILTER, "Flicker Filter", "", - 0.0f, - 0.0f, "INFO - Toggle the [Flicker Filter].", }, { SETTING_SOFT_DISPLAY_FILTER, "Soft Display Filter", "", - 0.0f, - 0.0f, "INFO - Toggle the [Soft Display Filter].", }, #endif @@ -124,32 +100,24 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] = SETTING_HW_OVERSCAN_AMOUNT, "Overscan", "", - 0.0f, - 0.0f, "INFO - Adjust or decrease [Overscan]. Set this to higher than 0.000\nif the screen doesn't fit on your TV/monitor.", }, { SETTING_THROTTLE_MODE, "Throttle Mode", "", - 0.0f, - 0.0f, "INFO - [Throttle Mode] is set to 'ON' - VSync is enabled and sound\nis turned on.", }, { SETTING_TRIPLE_BUFFERING, "Triple Buffering", "", - 0.0f, - 0.0f, "INFO - [Triple Buffering] is set to 'ON' - faster graphics/shaders at\nthe possible expense of input lag.", }, { SETTING_ENABLE_SCREENSHOTS, "Screenshots Feature", "", - 0.0f, - 0.0f, "INFO - [Screenshots] feature is set to 'OFF'.", }, #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) @@ -157,16 +125,12 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] = SETTING_SAVE_SHADER_PRESET, "SAVE SETTINGS AS CGP PRESET ", "", - 0.0f, - 0.0f, "INFO - Save the current video settings to a [CG Preset] (CGP) file.", }, { SETTING_APPLY_SHADER_PRESET_ON_STARTUP, "APPLY SHADER PRESET ON STARTUP", "", - 0.0f, - 0.0f, "INFO - Automatically load the currently selected [CG Preset] file on startup.", }, #endif @@ -174,16 +138,12 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] = SETTING_DEFAULT_VIDEO_ALL, "DEFAULT", "", - 0.0f, - 0.0f, "INFO - Set all [General Video Settings] back to their 'DEFAULT' values.", }, { SETTING_SOUND_MODE, "Sound Output", "", - 0.0f, - 0.0f, "INFO - [Sound Output] is set to 'Normal' - normal audio output will be\nused.", }, #ifdef HAVE_RSOUND @@ -191,8 +151,6 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] = SETTING_RSOUND_SERVER_IP_ADDRESS, "RSound Server IP Address", "", - 0.0f, - 0.0f, "INFO - Enter the IP Address of the [RSound Audio Server]. IP address\nmust be an IPv4 32-bits address, eg: '192.168.1.7'.", }, #endif @@ -200,120 +158,90 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] = SETTING_ENABLE_CUSTOM_BGM, "Custom BGM Feature", "", - 0.0f, - 0.0f, "INFO - [Custom BGM] feature is set to 'ON'.", }, { SETTING_DEFAULT_AUDIO_ALL, "DEFAULT", "", - 0.0f, - 0.0f, "INFO - Set all [General Audio Settings] back to their 'DEFAULT' values.", }, { SETTING_EMU_CURRENT_SAVE_STATE_SLOT, "Current save state slot", "", - 0.0f, - 0.0f, "INFO - Set the current savestate slot (can also be configured ingame).", }, { SETTING_EMU_SHOW_DEBUG_INFO_MSG, "Debug Info messages", "", - 0.0f, - 0.0f, "INFO - Show onscreen debug messages.", }, { SETTING_EMU_SHOW_INFO_MSG, "Info messages", "", - 0.0f, - 0.0f, "INFO - Show onscreen info messages in the menu.", }, { SETTING_ZIP_EXTRACT, "ZIP extract", "", - 0.0f, - 0.0f, "INFO - Select the [ZIP Extract] mode. This setting controls how ZIP files are extracted.", }, { SETTING_RARCH_DEFAULT_EMU, "Default emulator core", "", - 0.0f, - 0.0f, "INFO - Select a default emulator core to launch at start-up.", }, { SETTING_EMU_DEFAULT_ALL, "DEFAULT", "", - 0.0f, - 0.0f, "INFO - Set [all RetroArch settings] back to their 'DEFAULT' values.", }, { SETTING_EMU_REWIND_ENABLED, "Rewind", "", - 0.0f, - 0.0f, "INFO - [Rewind] feature is set to 'OFF'.", }, { SETTING_EMU_VIDEO_DEFAULT_ALL, "DEFAULT", "", - 0.0f, - 0.0f, "INFO - Set [all RetroArch Video settings] back to their 'DEFAULT' values.", }, { SETTING_EMU_AUDIO_MUTE, "Mute Audio", "", - 0.0f, - 0.0f, "INFO - [Mute Audio] is set to 'OFF'.", }, { SETTING_EMU_AUDIO_DEFAULT_ALL, "DEFAULT", "", - 0.0f, - 0.0f, "INFO - Set [all RetroArch Audio settings] back to their 'DEFAULT' values.", }, { SETTING_PATH_DEFAULT_ROM_DIRECTORY, "Startup ROM Directory", "", - 0.0f, - 0.0f, "INFO - Set the default [Startup ROM directory]. NOTE: You will have to\nrestart the emulator for this change to have any effect.", }, { SETTING_PATH_SAVESTATES_DIRECTORY, "Savestate Directory", "", - 0.0f, - 0.0f, "INFO - Set the default path where all the savestate files will be saved to.", }, { SETTING_PATH_SRAM_DIRECTORY, "SRAM Directory", "", - 0.0f, - 0.0f, "INFO - Set the default SRAM (SaveRAM) directory path. All the\nbattery backup saves will be stored in this directory.", }, #ifdef HAVE_XML @@ -321,8 +249,6 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] = SETTING_PATH_CHEATS, "Cheatfile Directory", "", - 0.0f, - 0.0f, "INFO - Set the default [Cheatfile directory] path. All CHT (cheat) files\nwill be stored here.", }, #endif @@ -330,16 +256,12 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] = SETTING_PATH_SYSTEM, "System Directory", "", - 0.0f, - 0.0f, "INFO - Set the default [System directory] path. System files like\nBIOS files, etc. will be stored here.", }, { SETTING_ENABLE_SRAM_PATH, "Custom SRAM Dir Path", "", - 0.0f, - 0.0f, "INFO - [Custom SRAM Dir Path] feature is set to 'OFF'.", 1 }, @@ -347,176 +269,132 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] = SETTING_ENABLE_STATE_PATH, "Custom Save State Dir Path", "", - 0.0f, - 0.0f, "INFO - [Custom Save State Dir Path] feature is set to 'OFF'.", }, { SETTING_PATH_DEFAULT_ALL, "DEFAULT", "", - 0.0f, - 0.0f, "INFO - Set [all Path settings] back to their 'DEFAULT' values.", }, { SETTING_CONTROLS_SCHEME, "Control Scheme Preset", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_NUMBER, "Controller No", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_B, "B Button", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_Y, "Y Button", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_SELECT, "Select button", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_START, "Start button", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_UP, "D-Pad Up", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_DOWN, "D-Pad Down", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_LEFT, "D-Pad Left", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_A, "A Button", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_X, "X Button", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_L, "L Button", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_R, "R Button", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_L2, "L2 Button", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_R2, "R2 Button", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_L3, "L3 Button", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_R3, "R3 Button", "", - 0.0f, - 0.0f, "", }, { SETTING_CONTROLS_SAVE_CUSTOM_CONTROLS, "SAVE CUSTOM CONTROLS", "", - 0.0f, - 0.0f, "INFO - Save the custom control settings.", }, { SETTING_CONTROLS_DEFAULT_ALL, "DEFAULT", "", - 0.0f, - 0.0f, "INFO - Set all [Controls] back to their 'DEFAULT' values.", } }; @@ -527,40 +405,30 @@ item ingame_menu_settings[MENU_ITEM_LAST] = MENU_ITEM_LOAD_STATE, /* enum ID of item */ "Load State", /* item label */ "", /* setting label */ - 0.0f, /* text X position */ - 0.0f, /* text Y position */ "INFO - Press LEFT or RIGHT to change the current save state slot.\nPress CROSS to load the state from the currently selected save state slot.", }, { MENU_ITEM_SAVE_STATE, "Save State", "", - 0.0f, - 0.0f, "INFO - Press LEFT or RIGHT to change the current save state slot.\nPress CROSS to save the state to the currently selected save state slot.", }, { MENU_ITEM_KEEP_ASPECT_RATIO, "Aspect Ratio", "", - 0.0f, - 0.0f, "INFO - Press LEFT or RIGHT to change the [Aspect Ratio].\nPress START to reset back to default values.", }, { MENU_ITEM_OVERSCAN_AMOUNT, "Overscan", "", - 0.0f, - 0.0f, "INFO - Press LEFT or RIGHT to change the [Overscan] settings.\nPress START to reset back to default values.", }, { MENU_ITEM_ORIENTATION, "Rotation", "", - 0.0f, - 0.0f, "INFO - Press LEFT or RIGHT to change the [Rotation] settings.\nPress START to reset back to default values.", }, #ifdef __CELLOS_LV2__ @@ -568,8 +436,6 @@ item ingame_menu_settings[MENU_ITEM_LAST] = MENU_ITEM_SCALE_FACTOR, "Scale Factor", "", - 0.0f, - 0.0f, "INFO - Press LEFT or RIGHT to change the [Scaling] settings.\nPress START to reset back to default values.", }, #endif @@ -577,56 +443,42 @@ item ingame_menu_settings[MENU_ITEM_LAST] = MENU_ITEM_RESIZE_MODE, "Resize Mode", "", - 0.0f, - 0.0f, "INFO - Allows you to resize the scree by moving the two analog sticks.\nPress TRIANGLE to reset to default values, and CIRCLE to go back.", }, { MENU_ITEM_FRAME_ADVANCE, "Frame Advance", "", - 0.0f, - 0.0f, "INFO - Press 'CROSS', 'L2' or 'R2' button to step one frame.", }, { MENU_ITEM_SCREENSHOT_MODE, "Screenshot Mode", "", - 0.0f, - 0.0f, "INFO - Allows you to take a clean screenshot.\nPress 'CIRCLE' to go back to the in-game menu while in 'Screenshot Mode'.", }, { MENU_ITEM_RESET, "Reset", "", - 0.0f, - 0.0f, "INFO - Press 'CROSS' to reset the game.", }, { MENU_ITEM_RETURN_TO_GAME, "Return to Game", "", - 0.0f, - 0.0f, "INFO - Press 'CROSS' to return back to the game.", }, { MENU_ITEM_RETURN_TO_MENU, "Return to Menu", "", - 0.0f, - 0.0f, "INFO - Press 'CROSS' to return back to the ROM Browser menu.", }, { MENU_ITEM_CHANGE_LIBRETRO, "Change libretro core", "", - 0.0f, - 0.0f, "INFO - Press 'CROSS' to choose a different emulator core.", }, #ifdef HAVE_MULTIMAN @@ -634,8 +486,6 @@ item ingame_menu_settings[MENU_ITEM_LAST] = MENU_ITEM_RETURN_TO_MULTIMAN, "Return to multiMAN", "", - 0.0f, - 0.0f, "INFO - Press 'CROSS' to quit the emulator/game and return to multiMAN.", }, #endif @@ -643,8 +493,6 @@ item ingame_menu_settings[MENU_ITEM_LAST] = MENU_ITEM_RETURN_TO_DASHBOARD, "Return to Dashboard", "", - 0.0f, - 0.0f, "INFO - Press 'CROSS' to quit the emulator/game and return to the XMB.", }, };