Menus: Move weapon switching to Control Setup

git-svn-id: https://svn.eduke32.com/eduke32@8023 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-08-16 00:20:45 +00:00 committed by Christoph Oelckers
parent 6c330bba1f
commit 757b19ad3f
1 changed files with 6 additions and 5 deletions

View File

@ -462,11 +462,7 @@ static MenuEntry_t *MEL_GAMESETUP[] = {
#if defined STARTUP_SETUP_WINDOW && !defined EDUKE32_SIMPLE_MENU
&ME_GAMESETUP_STARTWIN,
#endif
&ME_GAMESETUP_WEAPSWITCH_PICKUP,
#ifdef EDUKE32_ANDROID_MENU
&ME_GAMESETUP_QUICKSWITCH,
&ME_GAMESETUP_CROUCHLOCK,
#else
#ifndef EDUKE32_ANDROID_MENU
&ME_GAMESETUP_DEMOREC,
#ifdef _WIN32
&ME_GAMESETUP_UPDATES,
@ -727,6 +723,11 @@ static MenuEntry_t *MEL_CONTROLS[] = {
&ME_Space6_Redfont,
&ME_GAMESETUP_AIM_AUTO,
&ME_GAMESETUP_ALWAYS_RUN,
&ME_GAMESETUP_WEAPSWITCH_PICKUP,
#ifdef EDUKE32_ANDROID_MENU
&ME_GAMESETUP_QUICKSWITCH,
&ME_GAMESETUP_CROUCHLOCK,
#endif
};
static MenuEntry_t *MEL_CHEATS[ARRAY_SIZE(ME_CheatCodes)+1] = {