diff --git a/src/m_menu.c b/src/m_menu.c index 286d4ecde..70765ff4a 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -316,7 +316,6 @@ menu_t OP_MPControlsDef, OP_CameraControlsDef, OP_MiscControlsDef; menu_t OP_P1ControlsDef, OP_P2ControlsDef, OP_MouseOptionsDef; menu_t OP_Mouse2OptionsDef, OP_Joystick1Def, OP_Joystick2Def; static void M_VideoModeMenu(INT32 choice); -static void M_SoundMenu(INT32 choice); static void M_Setup1PControlsMenu(INT32 choice); static void M_Setup2PControlsMenu(INT32 choice); static void M_Setup1PJoystickMenu(INT32 choice); @@ -330,40 +329,22 @@ menu_t OP_VideoOptionsDef, OP_VideoModeDef, OP_ColorOptionsDef; menu_t OP_OpenGLOptionsDef, OP_OpenGLFogDef, OP_OpenGLColorDef; #endif menu_t OP_SoundOptionsDef; -<<<<<<< HEAD -static void M_ToggleSFX(INT32 choice); -static void M_ToggleDigital(INT32 choice); -static void M_ToggleMIDI(INT32 choice); //Misc menu_t OP_DataOptionsDef, OP_ScreenshotOptionsDef, OP_EraseDataDef; menu_t OP_ServerOptionsDef; -======= - -//Misc -menu_t OP_DataOptionsDef, OP_ScreenshotOptionsDef, OP_EraseDataDef; -menu_t OP_GameOptionsDef, OP_ChatOptionsDef, OP_ServerOptionsDef; -menu_t OP_NetgameOptionsDef, OP_GametypeOptionsDef; ->>>>>>> public_next-20190101 menu_t OP_MonitorToggleDef; static void M_ScreenshotOptions(INT32 choice); static void M_EraseData(INT32 choice); static void M_Addons(INT32 choice); static void M_AddonsOptions(INT32 choice); -<<<<<<< HEAD -static patch_t *addonsp[NUM_EXT+6]; +static patch_t *addonsp[NUM_EXT+5]; #define numaddonsshown 4 static void M_DrawLevelPlatterHeader(INT32 y, const char *header, boolean headerhighlight, boolean allowlowercase); -======= -static patch_t *addonsp[NUM_EXT+5]; - -#define numaddonsshown 4 - ->>>>>>> public_next-20190101 // Drawing functions static void M_DrawGenericMenu(void); static void M_DrawGenericScrollMenu(void); @@ -405,10 +386,7 @@ static void M_DrawSetupMultiPlayerMenu(void); static boolean M_ExitPandorasBox(void); static boolean M_QuitMultiPlayerMenu(void); static void M_HandleAddons(INT32 choice); -<<<<<<< HEAD static void M_HandleLevelPlatter(INT32 choice); -======= ->>>>>>> public_next-20190101 static void M_HandleSoundTest(INT32 choice); static void M_HandleImageDef(INT32 choice); static void M_HandleLoadSave(INT32 choice); @@ -506,7 +484,6 @@ static consvar_t cv_dummymares = {"dummymares", "Overall", CV_HIDEN|CV_CALL, dum // --------- static menuitem_t MainMenu[] = { -<<<<<<< HEAD {IT_STRING|IT_CALL, NULL, "Secrets", M_SecretsMenu, 76}, {IT_STRING|IT_CALL, NULL, "1 player", M_SinglePlayerMenu, 84}, #ifndef NONET @@ -517,14 +494,6 @@ static menuitem_t MainMenu[] = {IT_STRING|IT_CALL, NULL, "options", M_Options, 100}, {IT_CALL |IT_STRING, NULL, "addons", M_Addons, 108}, {IT_STRING|IT_CALL, NULL, "quit game", M_QuitSRB2, 116}, -======= - {IT_CALL |IT_STRING, NULL, "Secrets", M_SecretsMenu, 76}, - {IT_CALL |IT_STRING, NULL, "1 player", M_SinglePlayerMenu, 84}, - {IT_SUBMENU|IT_STRING, NULL, "multiplayer", &MP_MainDef, 92}, - {IT_CALL |IT_STRING, NULL, "options", M_Options, 100}, - {IT_CALL |IT_STRING, NULL, "Addons", M_Addons, 108}, - {IT_CALL |IT_STRING, NULL, "quit game", M_QuitSRB2, 116}, ->>>>>>> public_next-20190101 }; typedef enum @@ -564,15 +533,9 @@ typedef enum // --------------------- static menuitem_t MPauseMenu[] = { -<<<<<<< HEAD {IT_STRING | IT_CALL, NULL, "Add-ons...", M_Addons, 8}, {IT_STRING | IT_SUBMENU, NULL, "Scramble Teams...", &MISC_ScrambleTeamDef, 16}, {IT_STRING | IT_CALL, NULL, "Switch Gametype/Level...", M_MapChange, 24}, -======= - {IT_STRING | IT_CALL, NULL, "Add-ons...", M_Addons, 8}, - {IT_STRING | IT_SUBMENU, NULL, "Scramble Teams...", &MISC_ScrambleTeamDef, 16}, - {IT_STRING | IT_CALL, NULL, "Switch Map..." , M_MapChange, 24}, ->>>>>>> public_next-20190101 {IT_STRING | IT_CALL, NULL, "Continue", M_SelectableClearMenus,40}, {IT_STRING | IT_CALL, NULL, "Player 1 Setup", M_SetupMultiPlayer, 48}, // splitscreen @@ -1061,21 +1024,9 @@ static menuitem_t OP_MainMenu[] = {IT_CVAR | IT_STRING, NULL, "Controls per key", &cv_controlperkey, 30}, {IT_SUBMENU | IT_STRING, NULL, "Video Options...", &OP_VideoOptionsDef, 50}, - {IT_CALL | IT_STRING, NULL, "Sound Options...", M_SoundMenu, 60}, + {IT_SUBMENU | IT_STRING, NULL, "Sound Options...", &OP_SoundOptionsDef, 60}, -<<<<<<< HEAD {IT_CALL | IT_STRING, NULL, "Server Options...", M_ServerOptions, 80}, -======= - {IT_SUBMENU | IT_STRING, NULL, "Game Options...", &OP_GameOptionsDef, 70}, - {IT_SUBMENU | IT_STRING, NULL, "Server Options...", &OP_ServerOptionsDef, 80}, - {IT_STRING | IT_CALL, NULL, "Add-on Options...", M_AddonsOptions, 90}, -}; - -static menuitem_t OP_ControlsMenu[] = -{ - {IT_SUBMENU | IT_STRING, NULL, "Player 1 Controls...", &OP_P1ControlsDef, 10}, - {IT_SUBMENU | IT_STRING, NULL, "Player 2 Controls...", &OP_P2ControlsDef, 20}, ->>>>>>> public_next-20190101 {IT_SUBMENU | IT_STRING, NULL, "Data Options...", &OP_DataOptionsDef, 100}, }; @@ -1099,53 +1050,12 @@ static menuitem_t OP_P2ControlsMenu[] = { {IT_CALL | IT_STRING, NULL, "Control Configuration...", M_Setup2PControlsMenu, 10}, {IT_SUBMENU | IT_STRING, NULL, "Second Mouse Options...", &OP_Mouse2OptionsDef, 20}, -<<<<<<< HEAD {IT_SUBMENU | IT_STRING, NULL, "Second Gamepad Options...", &OP_Joystick2Def , 30}, -======= - {IT_SUBMENU | IT_STRING, NULL, "Second Joystick Options...", &OP_Joystick2Def , 30}, - - {IT_STRING | IT_CVAR, NULL, "Camera" , &cv_chasecam2 , 50}, - {IT_STRING | IT_CVAR, NULL, "Crosshair", &cv_crosshair2, 60}, - - {IT_STRING | IT_CVAR, NULL, "Analog Control", &cv_useranalog2, 80}, -}; - -static menuitem_t OP_ControlListMenu[] = -{ - {IT_SUBMENU | IT_STRING, NULL, "Movement Controls...", &OP_MoveControlsDef, 10}, - {IT_SUBMENU | IT_STRING, NULL, "Multiplayer Controls...", &OP_MPControlsDef, 20}, - {IT_SUBMENU | IT_STRING, NULL, "Miscellaneous Controls...", &OP_MiscControlsDef, 30}, -}; - -static menuitem_t OP_MoveControlsMenu[] = -{ - {IT_HEADER, NULL, " Movement", NULL, 0}, - {IT_CALL | IT_STRING2, NULL, "Move Forward", M_ChangeControl, gc_forward }, - {IT_CALL | IT_STRING2, NULL, "Move Backward", M_ChangeControl, gc_backward }, - {IT_CALL | IT_STRING2, NULL, "Move Left", M_ChangeControl, gc_strafeleft }, - {IT_CALL | IT_STRING2, NULL, "Move Right", M_ChangeControl, gc_straferight }, - {IT_CALL | IT_STRING2, NULL, "Jump", M_ChangeControl, gc_jump }, - {IT_CALL | IT_STRING2, NULL, "Spin", M_ChangeControl, gc_use }, - {IT_HEADER, NULL, " Camera", NULL, 0}, - {IT_CALL | IT_STRING2, NULL, "Look Up", M_ChangeControl, gc_lookup }, - {IT_CALL | IT_STRING2, NULL, "Look Down", M_ChangeControl, gc_lookdown }, - {IT_CALL | IT_STRING2, NULL, "Turn Left", M_ChangeControl, gc_turnleft }, - {IT_CALL | IT_STRING2, NULL, "Turn Right", M_ChangeControl, gc_turnright }, - {IT_CALL | IT_STRING2, NULL, "Center View", M_ChangeControl, gc_centerview }, - {IT_CALL | IT_STRING2, NULL, "Toggle Mouselook", M_ChangeControl, gc_mouseaiming }, - {IT_CALL | IT_STRING2, NULL, "Toggle Third-Person", M_ChangeControl, gc_camtoggle}, - {IT_CALL | IT_STRING2, NULL, "Reset Camera", M_ChangeControl, gc_camreset }, - {IT_HEADER, NULL, " Advanced", NULL, 0}, - {IT_CALL | IT_STRING2, NULL, "Rotate Camera L", M_ChangeControl, gc_camleft }, - {IT_CALL | IT_STRING2, NULL, "Rotate Camera R", M_ChangeControl, gc_camright }, -}; ->>>>>>> public_next-20190101 {IT_STRING | IT_CVAR, NULL, "Third-person Camera" , &cv_chasecam2 , 50}, {IT_STRING | IT_CVAR, NULL, "Flip Camera with Gravity" , &cv_flipcam2 , 60}, {IT_STRING | IT_CVAR, NULL, "Crosshair", &cv_crosshair2, 70}, -<<<<<<< HEAD //{IT_STRING | IT_CVAR, NULL, "Analog Control", &cv_useranalog2, 90}, {IT_STRING | IT_CVAR, NULL, "Character angle", &cv_directionchar2, 90}, {IT_STRING | IT_CVAR, NULL, "Automatic braking", &cv_autobrake2, 100}, @@ -1175,7 +1085,11 @@ static menuitem_t OP_ChangeControlsMenu[] = {IT_SPACE, NULL, NULL, NULL, 0}, // padding {IT_CALL | IT_STRING2, NULL, "Game Status", M_ChangeControl, gc_scores }, - {IT_CALL | IT_STRING2, NULL, "Pause / Run Retry", M_ChangeControl, gc_pause }, + {IT_CALL | IT_STRING2, NULL, "Pause / Run Retry", M_ChangeControl, gc_pause }, + {IT_CALL | IT_STRING2, NULL, "Screenshot", M_ChangeControl, gc_screenshot }, + {IT_CALL | IT_STRING2, NULL, "Toggle GIF Recording", M_ChangeControl, gc_recordgif }, + {IT_CALL | IT_STRING2, NULL, "Open/Close Menu (ESC)", M_ChangeControl, gc_systemmenu }, + {IT_CALL | IT_STRING2, NULL, "Change Viewpoint", M_ChangeControl, gc_viewpoint }, {IT_CALL | IT_STRING2, NULL, "Console", M_ChangeControl, gc_console }, {IT_HEADER, NULL, "Multiplayer", NULL, 0}, {IT_SPACE, NULL, NULL, NULL, 0}, // padding @@ -1200,25 +1114,10 @@ static menuitem_t OP_ChangeControlsMenu[] = {IT_CALL | IT_STRING2, NULL, "Custom Action 1", M_ChangeControl, gc_custom1 }, {IT_CALL | IT_STRING2, NULL, "Custom Action 2", M_ChangeControl, gc_custom2 }, {IT_CALL | IT_STRING2, NULL, "Custom Action 3", M_ChangeControl, gc_custom3 }, -======= -static menuitem_t OP_MiscControlsMenu[] = -{ - {IT_CALL | IT_STRING2, NULL, "Custom Action 1", M_ChangeControl, gc_custom1 }, - {IT_CALL | IT_STRING2, NULL, "Custom Action 2", M_ChangeControl, gc_custom2 }, - {IT_CALL | IT_STRING2, NULL, "Custom Action 3", M_ChangeControl, gc_custom3 }, - - {IT_CALL | IT_STRING2, NULL, "Pause", M_ChangeControl, gc_pause }, - {IT_CALL | IT_STRING2, NULL, "Screenshot", M_ChangeControl, gc_screenshot }, - {IT_CALL | IT_STRING2, NULL, "Toggle GIF Recording", M_ChangeControl, gc_recordgif }, - {IT_CALL | IT_STRING2, NULL, "Open/Close Menu (ESC)", M_ChangeControl, gc_systemmenu }, - {IT_CALL | IT_STRING2, NULL, "Change Viewpoint", M_ChangeControl, gc_viewpoint }, - {IT_CALL | IT_STRING2, NULL, "Console", M_ChangeControl, gc_console }, ->>>>>>> public_next-20190101 }; static menuitem_t OP_Joystick1Menu[] = { -<<<<<<< HEAD {IT_STRING | IT_CALL, NULL, "Select Gamepad...", M_Setup1PJoystickMenu, 10}, {IT_STRING | IT_CVAR, NULL, "Move \x17 Axis" , &cv_moveaxis , 30}, {IT_STRING | IT_CVAR, NULL, "Move \x18 Axis" , &cv_sideaxis , 40}, @@ -1228,25 +1127,13 @@ static menuitem_t OP_Joystick1Menu[] = {IT_STRING | IT_CVAR, NULL, "Spin Axis" , &cv_spinaxis , 80}, {IT_STRING | IT_CVAR, NULL, "Fire Axis" , &cv_fireaxis , 90}, {IT_STRING | IT_CVAR, NULL, "Fire Normal Axis" , &cv_firenaxis ,100}, -======= - {IT_STRING | IT_CALL, NULL, "Select Joystick...", M_Setup1PJoystickMenu, 10}, - {IT_STRING | IT_CVAR, NULL, "Axis For Turning" , &cv_turnaxis , 30}, - {IT_STRING | IT_CVAR, NULL, "Axis For Moving" , &cv_moveaxis , 40}, - {IT_STRING | IT_CVAR, NULL, "Axis For Strafe" , &cv_sideaxis , 50}, - {IT_STRING | IT_CVAR, NULL, "Axis For Looking" , &cv_lookaxis , 60}, - {IT_STRING | IT_CVAR, NULL, "Axis For Jumping" , &cv_jumpaxis , 70}, - {IT_STRING | IT_CVAR, NULL, "Axis For Spinning" , &cv_spinaxis , 80}, - {IT_STRING | IT_CVAR, NULL, "Axis For Firing" , &cv_fireaxis , 90}, - {IT_STRING | IT_CVAR, NULL, "Axis For NFiring" , &cv_firenaxis , 100}, {IT_STRING | IT_CVAR, NULL, "First-Person Vert-Look", &cv_alwaysfreelook, 120}, {IT_STRING | IT_CVAR, NULL, "Third-Person Vert-Look", &cv_chasefreelook, 130}, ->>>>>>> public_next-20190101 }; static menuitem_t OP_Joystick2Menu[] = { -<<<<<<< HEAD {IT_STRING | IT_CALL, NULL, "Select Gamepad...", M_Setup2PJoystickMenu, 10}, {IT_STRING | IT_CVAR, NULL, "Move \x17 Axis" , &cv_moveaxis2 , 30}, {IT_STRING | IT_CVAR, NULL, "Move \x18 Axis" , &cv_sideaxis2 , 40}, @@ -1256,20 +1143,9 @@ static menuitem_t OP_Joystick2Menu[] = {IT_STRING | IT_CVAR, NULL, "Spin Axis" , &cv_spinaxis2 , 80}, {IT_STRING | IT_CVAR, NULL, "Fire Axis" , &cv_fireaxis2 , 90}, {IT_STRING | IT_CVAR, NULL, "Fire Normal Axis" , &cv_firenaxis2 ,100}, -======= - {IT_STRING | IT_CALL, NULL, "Select Joystick...", M_Setup2PJoystickMenu, 10}, - {IT_STRING | IT_CVAR, NULL, "Axis For Turning" , &cv_turnaxis2 , 30}, - {IT_STRING | IT_CVAR, NULL, "Axis For Moving" , &cv_moveaxis2 , 40}, - {IT_STRING | IT_CVAR, NULL, "Axis For Strafe" , &cv_sideaxis2 , 50}, - {IT_STRING | IT_CVAR, NULL, "Axis For Looking" , &cv_lookaxis2 , 60}, - {IT_STRING | IT_CVAR, NULL, "Axis For Jumping" , &cv_jumpaxis2 , 70}, - {IT_STRING | IT_CVAR, NULL, "Axis For Spinning" , &cv_spinaxis2 , 80}, - {IT_STRING | IT_CVAR, NULL, "Axis For Firing" , &cv_fireaxis2 , 90}, - {IT_STRING | IT_CVAR, NULL, "Axis For NFiring" , &cv_firenaxis2 , 100}, {IT_STRING | IT_CVAR, NULL, "First-Person Vert-Look", &cv_alwaysfreelook2,120}, {IT_STRING | IT_CVAR, NULL, "Third-Person Vert-Look", &cv_chasefreelook2, 130}, ->>>>>>> public_next-20190101 }; static menuitem_t OP_JoystickSetMenu[] = @@ -1286,24 +1162,14 @@ static menuitem_t OP_MouseOptionsMenu[] = {IT_STRING | IT_CVAR, NULL, "Use Mouse", &cv_usemouse, 10}, -<<<<<<< HEAD - {IT_STRING | IT_CVAR, NULL, "Always Mouselook", &cv_alwaysfreelook, 30}, - {IT_STRING | IT_CVAR, NULL, "Mouse Move", &cv_mousemove, 40}, - {IT_STRING | IT_CVAR, NULL, "Invert Y Axis", &cv_invertmouse, 50}, - {IT_STRING | IT_CVAR | IT_CV_SLIDER, - NULL, "Mouse X Sensitivity", &cv_mousesens, 60}, - {IT_STRING | IT_CVAR | IT_CV_SLIDER, - NULL, "Mouse Y Sensitivity", &cv_mouseysens, 70}, -======= {IT_STRING | IT_CVAR, NULL, "First-Person MouseLook", &cv_alwaysfreelook, 30}, {IT_STRING | IT_CVAR, NULL, "Third-Person MouseLook", &cv_chasefreelook, 40}, {IT_STRING | IT_CVAR, NULL, "Mouse Move", &cv_mousemove, 50}, - {IT_STRING | IT_CVAR, NULL, "Invert Mouse", &cv_invertmouse, 60}, + {IT_STRING | IT_CVAR, NULL, "Invert Y Axis", &cv_invertmouse, 60}, {IT_STRING | IT_CVAR | IT_CV_SLIDER, - NULL, "Mouse X Speed", &cv_mousesens, 70}, + NULL, "Mouse X Sensitivity", &cv_mousesens, 70}, {IT_STRING | IT_CVAR | IT_CV_SLIDER, - NULL, "Mouse Y Speed", &cv_mouseysens, 80}, ->>>>>>> public_next-20190101 + NULL, "Mouse Y Sensitivity", &cv_mouseysens, 80}, }; static menuitem_t OP_Mouse2OptionsMenu[] = @@ -1311,24 +1177,14 @@ static menuitem_t OP_Mouse2OptionsMenu[] = {IT_STRING | IT_CVAR, NULL, "Use Mouse 2", &cv_usemouse2, 10}, {IT_STRING | IT_CVAR, NULL, "Second Mouse Serial Port", &cv_mouse2port, 20}, -<<<<<<< HEAD - {IT_STRING | IT_CVAR, NULL, "Always Mouselook", &cv_alwaysfreelook2, 30}, - {IT_STRING | IT_CVAR, NULL, "Mouse Move", &cv_mousemove2, 40}, - {IT_STRING | IT_CVAR, NULL, "Invert Y Axis", &cv_invertmouse2, 50}, - {IT_STRING | IT_CVAR | IT_CV_SLIDER, - NULL, "Mouse X Sensitivity", &cv_mousesens2, 60}, - {IT_STRING | IT_CVAR | IT_CV_SLIDER, - NULL, "Mouse Y Sensitivity", &cv_mouseysens2, 70}, -======= {IT_STRING | IT_CVAR, NULL, "First-Person MouseLook", &cv_alwaysfreelook2, 30}, {IT_STRING | IT_CVAR, NULL, "Third-Person MouseLook", &cv_chasefreelook2, 40}, {IT_STRING | IT_CVAR, NULL, "Mouse Move", &cv_mousemove2, 50}, - {IT_STRING | IT_CVAR, NULL, "Invert Mouse", &cv_invertmouse2, 60}, + {IT_STRING | IT_CVAR, NULL, "Invert Y Axis", &cv_invertmouse2, 60}, {IT_STRING | IT_CVAR | IT_CV_SLIDER, - NULL, "Mouse X Speed", &cv_mousesens2, 70}, + NULL, "Mouse X Sensitivity", &cv_mousesens2, 70}, {IT_STRING | IT_CVAR | IT_CV_SLIDER, - NULL, "Mouse Y Speed", &cv_mouseysens2, 80}, ->>>>>>> public_next-20190101 + NULL, "Mouse Y Sensitivity", &cv_mouseysens2, 80}, }; static menuitem_t OP_VideoOptionsMenu[] = @@ -1364,15 +1220,24 @@ static menuitem_t OP_VideoOptionsMenu[] = {IT_STRING | IT_CVAR, NULL, "Background color", &cons_backcolor, 96}, {IT_STRING | IT_CVAR, NULL, "Text Size", &cv_constextsize, 101}, - {IT_HEADER, NULL, "Level", NULL, 110}, - {IT_STRING | IT_CVAR, NULL, "Draw Distance", &cv_drawdist, 116}, - {IT_STRING | IT_CVAR, NULL, "NiGHTS Draw Dist.", &cv_drawdist_nights, 121}, - {IT_STRING | IT_CVAR, NULL, "Weather Draw Dist.", &cv_drawdist_precip, 126}, - {IT_STRING | IT_CVAR, NULL, "Weather Density", &cv_precipdensity, 131}, + {IT_HEADER, NULL, "Chat", NULL, 110}, + {IT_STRING | IT_CVAR, NULL, "Chat Mode", &cv_consolechat, 116}, + {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Chat Box Width", &cv_chatwidth, 126}, + {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Chat Box Height", &cv_chatheight, 131}, + {IT_STRING | IT_CVAR, NULL, "Message Fadeout Time", &cv_chattime, 136}, + {IT_STRING | IT_CVAR, NULL, "Chat Notifications", &cv_chatnotifications, 141}, + {IT_STRING | IT_CVAR, NULL, "Spam Protection", &cv_chatspamprotection, 146}, + {IT_STRING | IT_CVAR, NULL, "Chat background tint", &cv_chatbacktint, 151}, - {IT_HEADER, NULL, "Diagnostic", NULL, 140}, - {IT_STRING | IT_CVAR, NULL, "Show FPS", &cv_ticrate, 146}, - {IT_STRING | IT_CVAR, NULL, "Clear Before Redraw", &cv_homremoval, 151}, + {IT_HEADER, NULL, "Level", NULL, 160}, + {IT_STRING | IT_CVAR, NULL, "Draw Distance", &cv_drawdist, 166}, + {IT_STRING | IT_CVAR, NULL, "NiGHTS Draw Dist.", &cv_drawdist_nights, 171}, + {IT_STRING | IT_CVAR, NULL, "Weather Draw Dist.", &cv_drawdist_precip, 176}, + {IT_STRING | IT_CVAR, NULL, "Weather Density", &cv_precipdensity, 181}, + + {IT_HEADER, NULL, "Diagnostic", NULL, 190}, + {IT_STRING | IT_CVAR, NULL, "Show FPS", &cv_ticrate, 196}, + {IT_STRING | IT_CVAR, NULL, "Clear Before Redraw", &cv_homremoval, 201}, }; static menuitem_t OP_VideoModeMenu[] = @@ -1466,22 +1331,16 @@ static menuitem_t OP_OpenGLColorMenu[] = static menuitem_t OP_SoundOptionsMenu[] = { - {IT_STRING | IT_KEYHANDLER, NULL, "Sound Effects", M_ToggleSFX, 10}, + {IT_STRING | IT_CVAR, NULL, "Sound Effects", &cv_gamesounds, 10}, {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Sound Volume", &cv_soundvolume, 20}, - {IT_STRING | IT_KEYHANDLER, NULL, "Digital Music", M_ToggleDigital, 40}, + {IT_STRING | IT_CVAR, NULL, "Digital Music", &cv_gamedigimusic, 40}, {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Digital Music Volume", &cv_digmusicvolume, 50}, -<<<<<<< HEAD - {IT_STRING | IT_KEYHANDLER, NULL, "MIDI Music", M_ToggleMIDI, 70}, + {IT_STRING | IT_CVAR, NULL, "MIDI Music", &cv_gamemidimusic, 70}, {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "MIDI Music Volume", &cv_midimusicvolume, 80}, {IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 100}, -======= - {IT_STRING | IT_CVAR, NULL, "SFX" , &cv_gamesounds, 50}, - {IT_STRING | IT_CVAR, NULL, "Digital Music", &cv_gamedigimusic, 60}, - {IT_STRING | IT_CVAR, NULL, "MIDI Music", &cv_gamemidimusic, 70}, ->>>>>>> public_next-20190101 }; static menuitem_t OP_DataOptionsMenu[] = @@ -1537,7 +1396,6 @@ static menuitem_t OP_EraseDataMenu[] = }; static menuitem_t OP_AddonsOptionsMenu[] = -<<<<<<< HEAD { {IT_HEADER, NULL, "Menu", NULL, 0}, {IT_STRING|IT_CVAR, NULL, "Location", &cv_addons_option, 12}, @@ -1549,63 +1407,12 @@ static menuitem_t OP_AddonsOptionsMenu[] = {IT_STRING|IT_CVAR, NULL, "Matching", &cv_addons_search_type, 90}, {IT_STRING|IT_CVAR, NULL, "Case-sensitive", &cv_addons_search_case, 100}, }; -======= -{ - {IT_HEADER, NULL, "Menu", NULL, 0}, - {IT_STRING|IT_CVAR, NULL, "Location", &cv_addons_option, 10}, - {IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Custom Folder", &cv_addons_folder, 20}, - {IT_STRING|IT_CVAR, NULL, "Identify add-ons via", &cv_addons_md5, 48}, - {IT_STRING|IT_CVAR, NULL, "Show unsupported file types", &cv_addons_showall, 58}, - - {IT_HEADER, NULL, "Search", NULL, 76}, - {IT_STRING|IT_CVAR, NULL, "Matching", &cv_addons_search_type, 86}, - {IT_STRING|IT_CVAR, NULL, "Case-sensitive", &cv_addons_search_case, 96}, -}; enum { op_addons_folder = 2, }; -static menuitem_t OP_GameOptionsMenu[] = -{ -#ifndef NONET - {IT_STRING | IT_CVAR | IT_CV_STRING, - NULL, "Master server", &cv_masterserver, 10}, - {IT_STRING | IT_SUBMENU, NULL, "Chat Options...", &OP_ChatOptionsDef, 40}, -#endif - {IT_STRING | IT_CVAR, NULL, "Show HUD", &cv_showhud, 50}, - {IT_STRING | IT_CVAR | IT_CV_SLIDER, - NULL, "HUD Visibility", &cv_translucenthud, 60}, - {IT_STRING | IT_CVAR, NULL, "Timer Display", &cv_timetic, 70}, - {IT_STRING | IT_CVAR, NULL, "Always Compact Rankings", &cv_compactscoreboard, 80}, -#ifdef SEENAMES - {IT_STRING | IT_CVAR, NULL, "HUD Player Names", &cv_seenames, 90}, -#endif - {IT_STRING | IT_CVAR, NULL, "Log Hazard Damage", &cv_hazardlog, 100}, - - {IT_STRING | IT_CVAR, NULL, "Console Back Color", &cons_backcolor, 110}, - {IT_STRING | IT_CVAR, NULL, "Console Text Size", &cv_constextsize,120}, - {IT_STRING | IT_CVAR, NULL, "Uppercase Console", &cv_allcaps, 130}, ->>>>>>> public_next-20190101 - -enum -{ - op_addons_folder = 2, -}; - -static menuitem_t OP_ChatOptionsMenu[] = -{ - {IT_STRING | IT_CVAR, NULL, "Chat Mode", &cv_consolechat, 10}, - - {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Chat Box Width", &cv_chatwidth, 30}, - {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Chat Box Height", &cv_chatheight, 40}, - {IT_STRING | IT_CVAR, NULL, "Message Fadeout Time", &cv_chattime, 50}, - {IT_STRING | IT_CVAR, NULL, "Chat Notifications", &cv_chatnotifications, 60}, - {IT_STRING | IT_CVAR, NULL, "Spam Protection", &cv_chatspamprotection, 70}, - {IT_STRING | IT_CVAR, NULL, "Chat background tint", &cv_chatbacktint, 80}, -}; - static menuitem_t OP_ServerOptionsMenu[] = { {IT_HEADER, NULL, "General", NULL, 0}, @@ -2000,7 +1807,6 @@ menu_t MP_PlayerSetupDef = }; // Options -<<<<<<< HEAD menu_t OP_MainDef = DEFAULTMENUSTYLE("M_OPTTTL", OP_MainMenu, &MainDef, 50, 30); menu_t OP_ChangeControlsDef = CONTROLMENUSTYLE(OP_ChangeControlsMenu, &OP_MainDef); menu_t OP_P1ControlsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_P1ControlsMenu, &OP_MainDef, 50, 30); @@ -2009,20 +1815,6 @@ menu_t OP_MouseOptionsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_MouseOptionsMenu, &O menu_t OP_Mouse2OptionsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_Mouse2OptionsMenu, &OP_P2ControlsDef, 35, 30); menu_t OP_Joystick1Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick1Menu, &OP_P1ControlsDef, 50, 30); menu_t OP_Joystick2Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick2Menu, &OP_P2ControlsDef, 50, 30); -======= -menu_t OP_MainDef = DEFAULTMENUSTYLE("M_OPTTTL", OP_MainMenu, &MainDef, 60, 30); -menu_t OP_ControlsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_ControlsMenu, &OP_MainDef, 60, 30); -menu_t OP_ControlListDef = DEFAULTMENUSTYLE("M_CONTRO", OP_ControlListMenu, &OP_ControlsDef, 60, 30); -menu_t OP_MoveControlsDef = CONTROLMENUSTYLE(OP_MoveControlsMenu, &OP_ControlListDef); -menu_t OP_MPControlsDef = CONTROLMENUSTYLE(OP_MPControlsMenu, &OP_ControlListDef); -menu_t OP_MiscControlsDef = CONTROLMENUSTYLE(OP_MiscControlsMenu, &OP_ControlListDef); -menu_t OP_P1ControlsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_P1ControlsMenu, &OP_ControlsDef, 60, 30); -menu_t OP_P2ControlsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_P2ControlsMenu, &OP_ControlsDef, 60, 30); -menu_t OP_MouseOptionsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_MouseOptionsMenu, &OP_P1ControlsDef, 60, 30); -menu_t OP_Mouse2OptionsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_Mouse2OptionsMenu, &OP_P2ControlsDef, 60, 30); -menu_t OP_Joystick1Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick1Menu, &OP_P1ControlsDef, 60, 30); -menu_t OP_Joystick2Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick2Menu, &OP_P2ControlsDef, 60, 30); ->>>>>>> public_next-20190101 menu_t OP_JoystickSetDef = { "M_CONTRO", @@ -2068,26 +1860,11 @@ menu_t OP_ColorOptionsDef = 0, NULL }; -menu_t OP_SoundOptionsDef = -{ - "M_SOUND", - sizeof (OP_SoundOptionsMenu)/sizeof (menuitem_t), - &OP_MainDef, - OP_SoundOptionsMenu, - M_DrawSoundMenu, - 30, 30, - 0, - NULL -}; +menu_t OP_SoundOptionsDef = DEFAULTMENUSTYLE("M_SOUND", OP_SoundOptionsMenu, &OP_MainDef, 60, 30); +menu_t OP_P1ControlsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_P1ControlsMenu, &OP_MainDef, 50, 30); menu_t OP_ServerOptionsDef = DEFAULTSCROLLMENUSTYLE("M_SERVER", OP_ServerOptionsMenu, &OP_MainDef, 30, 30); -<<<<<<< HEAD -======= -menu_t OP_NetgameOptionsDef = DEFAULTMENUSTYLE("M_SERVER", OP_NetgameOptionsMenu, &OP_ServerOptionsDef, 30, 30); -menu_t OP_GametypeOptionsDef = DEFAULTMENUSTYLE("M_SERVER", OP_GametypeOptionsMenu, &OP_ServerOptionsDef, 30, 30); -menu_t OP_ChatOptionsDef = DEFAULTMENUSTYLE("M_GAME", OP_ChatOptionsMenu, &OP_GameOptionsDef, 30, 30); ->>>>>>> public_next-20190101 menu_t OP_MonitorToggleDef = { "M_SERVER", @@ -2129,7 +1906,6 @@ menu_t OP_OpenGLColorDef = }; #endif menu_t OP_DataOptionsDef = DEFAULTMENUSTYLE("M_DATA", OP_DataOptionsMenu, &OP_MainDef, 60, 30); -<<<<<<< HEAD menu_t OP_ScreenshotOptionsDef = { @@ -2145,10 +1921,6 @@ menu_t OP_ScreenshotOptionsDef = menu_t OP_AddonsOptionsDef = DEFAULTMENUSTYLE("M_ADDONS", OP_AddonsOptionsMenu, &OP_DataOptionsDef, 30, 30); -======= -menu_t OP_ScreenshotOptionsDef = DEFAULTMENUSTYLE("M_DATA", OP_ScreenshotOptionsMenu, &OP_DataOptionsDef, 30, 30); -menu_t OP_AddonsOptionsDef = DEFAULTMENUSTYLE("M_ADDONS", OP_AddonsOptionsMenu, &OP_MainDef, 30, 30); ->>>>>>> public_next-20190101 menu_t OP_EraseDataDef = DEFAULTMENUSTYLE("M_DATA", OP_EraseDataMenu, &OP_DataOptionsDef, 60, 30); // ========================================================================== @@ -5038,12 +4810,8 @@ static void M_AddonsOptions(INT32 choice) M_SetupNextMenu(&OP_AddonsOptionsDef); } -<<<<<<< HEAD -#define LOCATIONSTRING "Visit \x83SRB2.ORG/MODS\x80 to get & make add-ons!" -======= #define LOCATIONSTRING1 "Visit \x83SRB2.ORG/MODS\x80 to get & make add-ons!" //#define LOCATIONSTRING2 "Visit \x88SRB2.ORG/MODS\x80 to get & make add-ons!" ->>>>>>> public_next-20190101 static void M_Addons(INT32 choice) { @@ -5051,14 +4819,11 @@ static void M_Addons(INT32 choice) (void)choice; -<<<<<<< HEAD -======= // If M_GetGameypeColor() is ever ported from Kart, then remove this. highlightflags = V_YELLOWMAP; recommendedflags = V_GREENMAP; warningflags = V_REDMAP; ->>>>>>> public_next-20190101 #if 1 if (cv_addons_option.value == 0) pathname = usehome ? srb2home : srb2path; @@ -5084,12 +4849,8 @@ static void M_Addons(INT32 choice) if (!preparefilemenu(false)) { -<<<<<<< HEAD - M_StartMessage(M_GetText("No files/folders found.\n\n"LOCATIONSTRING"\n\n(Press a key)\n"),NULL,MM_NOTHING); -======= M_StartMessage(va("No files/folders found.\n\n%s\n\n(Press a key)\n",LOCATIONSTRING1),NULL,MM_NOTHING); // (recommendedflags == V_SKYMAP ? LOCATIONSTRING2 : LOCATIONSTRING1)) ->>>>>>> public_next-20190101 return; } else @@ -5098,11 +4859,7 @@ static void M_Addons(INT32 choice) if (addonsp[0]) // never going to have some provided but not all, saves individually checking { size_t i; -<<<<<<< HEAD - for (i = 0; i < NUM_EXT+6; i++) -======= for (i = 0; i < NUM_EXT+5; i++) ->>>>>>> public_next-20190101 W_UnlockCachedPatch(addonsp[i]); } @@ -5112,28 +4869,17 @@ static void M_Addons(INT32 choice) addonsp[EXT_TXT] = W_CachePatchName("M_FTXT", PU_STATIC); addonsp[EXT_CFG] = W_CachePatchName("M_FCFG", PU_STATIC); addonsp[EXT_WAD] = W_CachePatchName("M_FWAD", PU_STATIC); -<<<<<<< HEAD -======= #ifdef USE_KART addonsp[EXT_KART] = W_CachePatchName("M_FKART", PU_STATIC); #endif ->>>>>>> public_next-20190101 addonsp[EXT_PK3] = W_CachePatchName("M_FPK3", PU_STATIC); addonsp[EXT_SOC] = W_CachePatchName("M_FSOC", PU_STATIC); addonsp[EXT_LUA] = W_CachePatchName("M_FLUA", PU_STATIC); addonsp[NUM_EXT] = W_CachePatchName("M_FUNKN", PU_STATIC); -<<<<<<< HEAD - addonsp[NUM_EXT+1] = W_CachePatchName("M_FSEL1", PU_STATIC); - addonsp[NUM_EXT+2] = W_CachePatchName("M_FSEL2", PU_STATIC); - addonsp[NUM_EXT+3] = W_CachePatchName("M_FLOAD", PU_STATIC); - addonsp[NUM_EXT+4] = W_CachePatchName("M_FSRCH", PU_STATIC); - addonsp[NUM_EXT+5] = W_CachePatchName("M_FSAVE", PU_STATIC); -======= addonsp[NUM_EXT+1] = W_CachePatchName("M_FSEL", PU_STATIC); addonsp[NUM_EXT+2] = W_CachePatchName("M_FLOAD", PU_STATIC); addonsp[NUM_EXT+3] = W_CachePatchName("M_FSRCH", PU_STATIC); addonsp[NUM_EXT+4] = W_CachePatchName("M_FSAVE", PU_STATIC); ->>>>>>> public_next-20190101 MISC_AddonsDef.prevMenu = currentMenu; M_SetupNextMenu(&MISC_AddonsDef); @@ -5158,36 +4904,21 @@ static void M_DrawTemperature(INT32 x, fixed_t t) t = (FixedMul(h<>FRACBITS); // border -<<<<<<< HEAD V_DrawFill(x - 1, vpadding, 1, h, 3); V_DrawFill(x + width, vpadding, 1, h, 3); V_DrawFill(x - 1, vpadding-1, width+2, 1, 3); V_DrawFill(x - 1, vpadding+h, width+2, 1, 3); -======= - V_DrawFill(x - 1, vpadding, 1, h, 120); - V_DrawFill(x + width, vpadding, 1, h, 120); - V_DrawFill(x - 1, vpadding-1, width+2, 1, 120); - V_DrawFill(x - 1, vpadding+h, width+2, 1, 120); ->>>>>>> public_next-20190101 // bar itself y = h; if (t) for (t = h - t; y > 0; y--) { -<<<<<<< HEAD UINT8 colours[NUMCOLOURS] = {42, 40, 58, 222, 65, 90, 97, 98}; UINT8 c; if (y <= t) break; if (y+vpadding >= BASEVIDHEIGHT/2) c = 113; -======= - UINT8 colours[NUMCOLOURS] = {135, 133, 92, 77, 114, 178, 161, 162}; - UINT8 c; - if (y <= t) break; - if (y+vpadding >= BASEVIDHEIGHT/2) - c = 185; ->>>>>>> public_next-20190101 else c = colours[(NUMCOLOURS*(y-1))/(h/2)]; V_DrawFill(x, y-1 + vpadding, width, 1, c); @@ -5195,11 +4926,7 @@ static void M_DrawTemperature(INT32 x, fixed_t t) // fill the rest of the backing if (y) -<<<<<<< HEAD V_DrawFill(x, vpadding, width, y, 27); -======= - V_DrawFill(x, vpadding, width, y, 30); ->>>>>>> public_next-20190101 } #undef width #undef vpadding @@ -5254,24 +4981,14 @@ static boolean M_AddonsRefresh(void) { S_StartSound(NULL, sfx_lose); if (refreshdirmenu & REFRESHDIR_MAX) -<<<<<<< HEAD - message = va("\x82%s\x80\nMaximum number of add-ons reached.\nA file could not be loaded.\nIf you want to play with this add-on, restart the game to clear existing ones.\n\n(Press a key)\n", refreshdirname); - else - message = va("\x82%s\x80\nA file was not loaded.\nCheck the console log for more information.\n\n(Press a key)\n", refreshdirname); -======= message = va("%c%s\x80\nMaximum number of add-ons reached.\nA file could not be loaded.\nIf you want to play with this add-on, restart the game to clear existing ones.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname); else message = va("%c%s\x80\nA file was not loaded.\nCheck the console log for more information.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname); ->>>>>>> public_next-20190101 } else if (refreshdirmenu & (REFRESHDIR_WARNING|REFRESHDIR_ERROR)) { S_StartSound(NULL, sfx_skid); -<<<<<<< HEAD - message = va("\x82%s\x80\nA file was loaded with %s.\nCheck the console log for more information.\n\n(Press a key)\n", refreshdirname, ((refreshdirmenu & REFRESHDIR_ERROR) ? "errors" : "warnings")); -======= message = va("%c%s\x80\nA file was loaded with %s.\nCheck the console log for more information.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname, ((refreshdirmenu & REFRESHDIR_ERROR) ? "errors" : "warnings")); ->>>>>>> public_next-20190101 } if (message) @@ -5287,24 +5004,12 @@ static boolean M_AddonsRefresh(void) return false; } -<<<<<<< HEAD -#ifdef FIXUPO0 -#pragma GCC optimize ("0") -#endif - -static void M_DrawAddons(void) -{ - INT32 x, y; - ssize_t i, max; - const char* topstr; -======= static void M_DrawAddons(void) { INT32 x, y; ssize_t i, m; const UINT8 *flashcol = NULL; UINT8 hilicol; ->>>>>>> public_next-20190101 // hack - need to refresh at end of frame to handle addfile... if (refreshdirmenu & M_AddonsRefresh()) @@ -5314,22 +5019,10 @@ static void M_DrawAddons(void) } if (Playing()) -<<<<<<< HEAD - topstr = "\x85""Adding files mid-game may cause problems."; - else if (savemoddata) - topstr = "\x83""Add-on has its own data, saving enabled."; - else if (modifiedgame) - topstr = "\x87""Game is modified, saving is disabled."; - else - topstr = LOCATIONSTRING; - - V_DrawCenteredString(BASEVIDWIDTH/2, 5, 0, topstr); -======= V_DrawCenteredString(BASEVIDWIDTH/2, 5, warningflags, "Adding files mid-game may cause problems."); else V_DrawCenteredString(BASEVIDWIDTH/2, 5, 0, LOCATIONSTRING1); // (recommendedflags == V_SKYMAP ? LOCATIONSTRING2 : LOCATIONSTRING1) ->>>>>>> public_next-20190101 if (numwadfiles <= mainwads+1) y = 0; @@ -5337,13 +5030,8 @@ static void M_DrawAddons(void) y = FRACUNIT; else { -<<<<<<< HEAD - x = FixedDiv((numwadfiles - mainwads+1)<>>>>>> public_next-20190101 if (x > y) y = x; if (y > FRACUNIT) // happens because of how we're shrinkin' it a little @@ -5356,36 +5044,6 @@ static void M_DrawAddons(void) x = currentMenu->x; y = currentMenu->y + 1; -<<<<<<< HEAD - //M_DrawLevelPlatterHeader(y - 16, M_AddonsHeaderPath(), true, true); -- wanted different width - V_DrawString(x-21, (y - 16) + (lsheadingheight - 12), V_YELLOWMAP|V_ALLOWLOWERCASE, M_AddonsHeaderPath()); - V_DrawFill(x-21, (y - 16) + (lsheadingheight - 3), (MAXSTRINGLENGTH*8+6 - 1), 1, yellowmap[3]); - V_DrawFill(x-21 + (MAXSTRINGLENGTH*8+6 - 1), (y - 16) + (lsheadingheight - 3), 1, 1, 26); - V_DrawFill(x-21, (y - 16) + (lsheadingheight - 2), MAXSTRINGLENGTH*8+6, 1, 26); - - V_DrawFill(x - 21, y - 1, MAXSTRINGLENGTH*8+6, (BASEVIDHEIGHT - currentMenu->y + 2) - (y - 1), 159); - - // get bottom... - max = dir_on[menudepthleft] + numaddonsshown + 1; - if (max > (ssize_t)sizedirmenu) - max = sizedirmenu; - - // then top... - i = max - (2*numaddonsshown + 1); - - // then adjust! - if (i < 0) - { - if ((max -= i) > (ssize_t)sizedirmenu) - max = sizedirmenu; - i = 0; - } - - if (i != 0) - V_DrawString(19, y+4 - (skullAnimCounter/5), V_YELLOWMAP, "\x1A"); - - for (; i < max; i++) -======= hilicol = V_GetStringColormap(highlightflags)[120]; V_DrawString(x-21, (y - 16) + (lsheadingheight - 12), highlightflags|V_ALLOWLOWERCASE, M_AddonsHeaderPath()); @@ -5433,7 +5091,6 @@ static void M_DrawAddons(void) flashcol = V_GetStringColormap(highlightflags); for (; i < m; i++) ->>>>>>> public_next-20190101 { UINT32 flags = V_ALLOWLOWERCASE; if (y > BASEVIDHEIGHT) break; @@ -5441,19 +5098,6 @@ static void M_DrawAddons(void) #define type (UINT8)(dirmenu[i][DIR_TYPE]) { if (type & EXT_LOADED) -<<<<<<< HEAD - flags |= V_TRANSLUCENT; - - V_DrawSmallScaledPatch(x-(16+4), y, (flags & V_TRANSLUCENT), addonsp[((UINT8)(dirmenu[i][DIR_TYPE]) & ~EXT_LOADED)]); - - if (type & EXT_LOADED) - V_DrawSmallScaledPatch(x-(16+4), y, 0, addonsp[NUM_EXT+3]); - - if ((size_t)i == dir_on[menudepthleft]) - { - V_DrawSmallScaledPatch(x-(16+4), y, 0, addonsp[NUM_EXT+1+((skullAnimCounter/4) ? 1 : 0)]); - flags = V_ALLOWLOWERCASE|V_YELLOWMAP; -======= { flags |= V_TRANSLUCENT; V_DrawSmallScaledPatch(x-(16+4), y, V_TRANSLUCENT, addonsp[(type & ~EXT_LOADED)]); @@ -5466,7 +5110,6 @@ static void M_DrawAddons(void) { V_DrawFixedPatch((x-(16+4))<>>>>>> public_next-20190101 } #define charsonside 14 @@ -5480,13 +5123,8 @@ static void M_DrawAddons(void) y += 16; } -<<<<<<< HEAD - if (max != (ssize_t)sizedirmenu) - V_DrawString(19, y-12 + (skullAnimCounter/5), V_YELLOWMAP, "\x1B"); -======= if (m != (ssize_t)sizedirmenu) V_DrawString(19, y-12 + (skullAnimCounter/5), highlightflags, "\x1B"); ->>>>>>> public_next-20190101 y = BASEVIDHEIGHT - currentMenu->y + 1; @@ -5500,21 +5138,6 @@ static void M_DrawAddons(void) '_' | 0x80, false); x -= (21 + 5 + 16); -<<<<<<< HEAD - V_DrawSmallScaledPatch(x, y + 4, (menusearch[0] ? 0 : V_TRANSLUCENT), addonsp[NUM_EXT+4]); - - x = BASEVIDWIDTH - x - 16; - V_DrawSmallScaledPatch(x, y + 4, ((!modifiedgame || savemoddata) ? 0 : V_TRANSLUCENT), addonsp[NUM_EXT+5]); - - if (modifiedgame) - V_DrawSmallScaledPatch(x, y + 4, 0, addonsp[NUM_EXT+3]); -} - -#ifdef FIXUPO0 -#pragma GCC reset_options -#endif - -======= V_DrawSmallScaledPatch(x, y + 4, (menusearch[0] ? 0 : V_TRANSLUCENT), addonsp[NUM_EXT+3]); x = BASEVIDWIDTH - x - 16; @@ -5524,18 +5147,13 @@ static void M_DrawAddons(void) V_DrawSmallScaledPatch(x, y + 4, 0, addonsp[NUM_EXT+2]); } ->>>>>>> public_next-20190101 static void M_AddonExec(INT32 ch) { if (ch != 'y' && ch != KEY_ENTER) return; S_StartSound(NULL, sfx_zoom); -<<<<<<< HEAD - COM_BufAddText(va("exec %s%s", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING)); -======= COM_BufAddText(va("exec \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING)); ->>>>>>> public_next-20190101 } #define len menusearch[0] @@ -5585,14 +5203,6 @@ static void M_HandleAddons(INT32 choice) char *tempname = NULL; if (dirmenu && dirmenu[dir_on[menudepthleft]]) tempname = Z_StrDup(dirmenu[dir_on[menudepthleft]]+DIR_STRING); // don't need to I_Error if can't make - not important, just QoL -<<<<<<< HEAD - searchfilemenu(tempname); - /*if (!preparefilemenu(true)) - { - UNEXIST; - return; - }*/ -======= #if 0 // much slower if (!preparefilemenu(true)) { @@ -5602,7 +5212,6 @@ static void M_HandleAddons(INT32 choice) #else // streamlined searchfilemenu(tempname); #endif ->>>>>>> public_next-20190101 } switch (choice) @@ -5652,11 +5261,7 @@ static void M_HandleAddons(INT32 choice) if (!preparefilemenu(false)) { S_StartSound(NULL, sfx_skid); -<<<<<<< HEAD - M_StartMessage(va("\x82%s\x80\nThis folder is empty.\n\n(Press a key)\n", M_AddonsHeaderPath()),NULL,MM_NOTHING); -======= M_StartMessage(va("%c%s\x80\nThis folder is empty.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), M_AddonsHeaderPath()),NULL,MM_NOTHING); ->>>>>>> public_next-20190101 menupath[menupathindex[++menudepthleft]] = 0; if (!preparefilemenu(true)) @@ -5675,11 +5280,7 @@ static void M_HandleAddons(INT32 choice) else { S_StartSound(NULL, sfx_lose); -<<<<<<< HEAD - M_StartMessage(va("\x82%s\x80\nThis folder is too deep to navigate to!\n\n(Press a key)\n", M_AddonsHeaderPath()),NULL,MM_NOTHING); -======= M_StartMessage(va("%c%s\x80\nThis folder is too deep to navigate to!\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), M_AddonsHeaderPath()),NULL,MM_NOTHING); ->>>>>>> public_next-20190101 menupath[menupathindex[menudepthleft]] = 0; } break; @@ -5693,11 +5294,7 @@ static void M_HandleAddons(INT32 choice) } break; case EXT_TXT: -<<<<<<< HEAD - M_StartMessage(va("\x82%s\x80\nThis file may not be a console script.\nAttempt to run anyways? \n\n(Press 'Y' to confirm)\n", dirmenu[dir_on[menudepthleft]]+DIR_STRING),M_AddonExec,MM_YESNO); -======= M_StartMessage(va("%c%s\x80\nThis file may not be a console script.\nAttempt to run anyways? \n\n(Press 'Y' to confirm)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),M_AddonExec,MM_YESNO); ->>>>>>> public_next-20190101 break; case EXT_CFG: M_AddonExec(KEY_ENTER); @@ -5705,22 +5302,15 @@ static void M_HandleAddons(INT32 choice) case EXT_LUA: #ifndef HAVE_BLUA S_StartSound(NULL, sfx_lose); -<<<<<<< HEAD - M_StartMessage(va("\x82%s\x80\nThis copy of SRB2 was compiled\nwithout support for .lua files.\n\n(Press a key)\n", dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING); -======= M_StartMessage(va("%c%s\x80\nThis copy of SRB2 was compiled\nwithout support for .lua files.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING); ->>>>>>> public_next-20190101 break; #endif // else intentional fallthrough case EXT_SOC: case EXT_WAD: -<<<<<<< HEAD -======= #ifdef USE_KART case EXT_KART: #endif ->>>>>>> public_next-20190101 case EXT_PK3: COM_BufAddText(va("addfile \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING)); break; @@ -5744,11 +5334,7 @@ static void M_HandleAddons(INT32 choice) { closefilemenu(true); -<<<<<<< HEAD // secrets disabled by addfile... -======= - // Secret menu! ->>>>>>> public_next-20190101 MainMenu[secrets].status = (M_AnySecretUnlocked()) ? (IT_STRING | IT_CALL) : (IT_DISABLED); if (currentMenu->prevMenu) @@ -5874,11 +5460,7 @@ static void M_Options(INT32 choice) (void)choice; // if the player is not admin or server, disable server options -<<<<<<< HEAD - OP_MainMenu[5].status = (Playing() && !(server || adminplayer == consoleplayer)) ? (IT_GRAYEDOUT) : (IT_STRING|IT_CALL); -======= - OP_MainMenu[5].status = (Playing() && !(server || IsPlayerAdmin(consoleplayer))) ? (IT_GRAYEDOUT) : (IT_STRING|IT_SUBMENU); ->>>>>>> public_next-20190101 + OP_MainMenu[5].status = (Playing() && !(server || IsPlayerAdmin(consoleplayer))) ? (IT_GRAYEDOUT) : (IT_STRING|IT_CALL); // if the player is playing _at all_, disable the erase data options OP_DataOptionsMenu[2].status = (Playing()) ? (IT_GRAYEDOUT) : (IT_STRING|IT_SUBMENU); @@ -9717,9 +9299,8 @@ static void M_Setup2PControlsMenu(INT32 choice) setupcontrols = gamecontrolbis; currentMenu->lastOn = itemOn; -<<<<<<< HEAD - // Hide the five non-P2 controls and their headers - OP_ChangeControlsMenu[18+0].status = IT_GRAYEDOUT2; + // Hide the nine non-P2 controls and their headers + //OP_ChangeControlsMenu[18+0].status = IT_GRAYEDOUT2; OP_ChangeControlsMenu[18+1].status = IT_GRAYEDOUT2; // ... OP_ChangeControlsMenu[18+2].status = IT_GRAYEDOUT2; @@ -9728,19 +9309,13 @@ static void M_Setup2PControlsMenu(INT32 choice) // ... OP_ChangeControlsMenu[23+0].status = IT_GRAYEDOUT2; OP_ChangeControlsMenu[23+1].status = IT_GRAYEDOUT2; - // ... - OP_ChangeControlsMenu[23+2].status = IT_GRAYEDOUT2; + //OP_ChangeControlsMenu[23+2].status = IT_GRAYEDOUT2; OP_ChangeControlsMenu[23+3].status = IT_GRAYEDOUT2; -======= - // Hide the three non-P2 controls - OP_MPControlsMenu[0].status = IT_GRAYEDOUT2; - OP_MPControlsMenu[1].status = IT_GRAYEDOUT2; - OP_MPControlsMenu[2].status = IT_GRAYEDOUT2; - // Hide the pause/console and system menu controls too - OP_MiscControlsMenu[3].status = IT_GRAYEDOUT2; - OP_MiscControlsMenu[6].status = IT_GRAYEDOUT2; - OP_MiscControlsMenu[8].status = IT_GRAYEDOUT2; ->>>>>>> public_next-20190101 + OP_ChangeControlsMenu[23+4].status = IT_GRAYEDOUT2; + OP_ChangeControlsMenu[23+5].status = IT_GRAYEDOUT2; + // ... + OP_ChangeControlsMenu[29+0].status = IT_GRAYEDOUT2; + OP_ChangeControlsMenu[29+1].status = IT_GRAYEDOUT2; OP_ChangeControlsDef.prevMenu = &OP_P2ControlsDef; M_SetupNextMenu(&OP_ChangeControlsDef); @@ -9977,226 +9552,6 @@ static void M_ChangeControl(INT32 choice) M_StartMessage(tmp, M_ChangecontrolResponse, MM_EVENTHANDLER); } -<<<<<<< HEAD -// ===== -// SOUND -// ===== - -static void M_SoundMenu(INT32 choice) -{ - (void)choice; - - OP_SoundOptionsMenu[6].status = (sound_disabled ? IT_GRAYEDOUT : (IT_STRING | IT_CVAR)); - M_SetupNextMenu(&OP_SoundOptionsDef); -} - -void M_DrawSoundMenu(void) -{ - const char* onstring = "ON"; - const char* offstring = "OFF"; - INT32 lengthstring; - M_DrawGenericMenu(); - - V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, - currentMenu->y+currentMenu->menuitems[0].alphaKey, - (sound_disabled ? V_REDMAP : V_YELLOWMAP), - (sound_disabled ? offstring : onstring)); - - V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, - currentMenu->y+currentMenu->menuitems[2].alphaKey, - (digital_disabled ? V_REDMAP : V_YELLOWMAP), - (digital_disabled ? offstring : onstring)); - - V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, - currentMenu->y+currentMenu->menuitems[4].alphaKey, - (midi_disabled ? V_REDMAP : V_YELLOWMAP), - (midi_disabled ? offstring : onstring)); - - if (itemOn == 0) - lengthstring = (sound_disabled ? 3 : 2); - else if (itemOn == 2) - lengthstring = (digital_disabled ? 3 : 2); - else if (itemOn == 4) - lengthstring = (midi_disabled ? 3 : 2); - else - return; - - V_DrawCharacter(BASEVIDWIDTH - currentMenu->x - 10 - (lengthstring*8) - (skullAnimCounter/5), currentMenu->y+currentMenu->menuitems[itemOn].alphaKey, - '\x1C' | V_YELLOWMAP, false); - V_DrawCharacter(BASEVIDWIDTH - currentMenu->x + 2 + (skullAnimCounter/5), currentMenu->y+currentMenu->menuitems[itemOn].alphaKey, - '\x1D' | V_YELLOWMAP, false); -} - -// Toggles sound systems in-game. -static void M_ToggleSFX(INT32 choice) -{ - switch (choice) - { - case KEY_DOWNARROW: - S_StartSound(NULL, sfx_menu1); - itemOn++; - return; - - case KEY_UPARROW: - S_StartSound(NULL, sfx_menu1); - itemOn = currentMenu->numitems-1; - return; - - case KEY_ESCAPE: - if (currentMenu->prevMenu) - M_SetupNextMenu(currentMenu->prevMenu); - else - M_ClearMenus(true); - return; - default: - break; - } - - if (sound_disabled) - { - sound_disabled = false; - S_InitSfxChannels(cv_soundvolume.value); - S_StartSound(NULL, sfx_strpst); - OP_SoundOptionsMenu[6].status = IT_STRING | IT_CVAR; - //M_StartMessage(M_GetText("SFX Enabled\n"), NULL, MM_NOTHING); - } - else - { - sound_disabled = true; - S_StopSounds(); - OP_SoundOptionsMenu[6].status = IT_GRAYEDOUT; - //M_StartMessage(M_GetText("SFX Disabled\n"), NULL, MM_NOTHING); - } -} - -static void M_ToggleDigital(INT32 choice) -{ - switch (choice) - { - case KEY_DOWNARROW: - S_StartSound(NULL, sfx_menu1); - itemOn++; - return; - - case KEY_UPARROW: - S_StartSound(NULL, sfx_menu1); - itemOn--; - return; - - case KEY_ESCAPE: - if (currentMenu->prevMenu) - M_SetupNextMenu(currentMenu->prevMenu); - else - M_ClearMenus(true); - return; - default: - break; - } - - if (digital_disabled) - { - digital_disabled = false; - I_InitMusic(); - S_StopMusic(); - if (Playing()) - P_RestoreMusic(&players[consoleplayer]); - else - S_ChangeMusicInternal("_clear", false); - //M_StartMessage(M_GetText("Digital Music Enabled\n"), NULL, MM_NOTHING); - } - else - { - digital_disabled = true; - if (S_MusicType() != MU_MID) - { - if (midi_disabled) - S_StopMusic(); - else - { - char mmusic[7]; - UINT16 mflags; - boolean looping; - - if (S_MusicInfo(mmusic, &mflags, &looping) && S_MIDIExists(mmusic)) - { - S_StopMusic(); - S_ChangeMusic(mmusic, mflags, looping); - } - else - S_StopMusic(); - } - } - //M_StartMessage(M_GetText("Digital Music Disabled\n"), NULL, MM_NOTHING); - } -} - -static void M_ToggleMIDI(INT32 choice) -{ - switch (choice) - { - case KEY_DOWNARROW: - S_StartSound(NULL, sfx_menu1); - itemOn++; - return; - - case KEY_UPARROW: - S_StartSound(NULL, sfx_menu1); - itemOn--; - return; - - case KEY_LEFTARROW: - case KEY_RIGHTARROW: - if (S_MusicType() != MU_MID && S_MusicType() != MU_NONE) - S_StartSound(NULL, sfx_menu1); - break; - - case KEY_ESCAPE: - if (currentMenu->prevMenu) - M_SetupNextMenu(currentMenu->prevMenu); - else - M_ClearMenus(true); - return; - default: - break; - } - if (midi_disabled) - { - midi_disabled = false; - I_InitMusic(); - if (Playing()) - P_RestoreMusic(&players[consoleplayer]); - else - S_ChangeMusicInternal("_clear", false); - //M_StartMessage(M_GetText("MIDI Music Enabled\n"), NULL, MM_NOTHING); - } - else - { - midi_disabled = true; - if (S_MusicType() == MU_MID) - { - if (digital_disabled) - S_StopMusic(); - else - { - char mmusic[7]; - UINT16 mflags; - boolean looping; - - if (S_MusicInfo(mmusic, &mflags, &looping) && S_DigExists(mmusic)) - { - S_StopMusic(); - S_ChangeMusic(mmusic, mflags, looping); - } - else - S_StopMusic(); - } - } - //M_StartMessage(M_GetText("MIDI Music Disabled\n"), NULL, MM_NOTHING); - } -} - -======= ->>>>>>> public_next-20190101 // =============== // VIDEO MODE MENU // ===============