Subversion Repositories eduke32

Rev

Rev 8501 | Rev 8538 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8501 Rev 8536
Line 899... Line 899...
899
static MenuOption_t MEO_MOUSESETUP_MOUSEAIMING = MAKE_MENUOPTION( &MF_Redfont, &MEOS_NoYes, &g_myAimMode );
899
static MenuOption_t MEO_MOUSESETUP_MOUSEAIMING = MAKE_MENUOPTION( &MF_Redfont, &MEOS_NoYes, &g_myAimMode );
900
static MenuEntry_t ME_MOUSESETUP_MOUSEAIMING = MAKE_MENUENTRY( "Vertical aiming:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_MOUSESETUP_MOUSEAIMING, Option );
900
static MenuEntry_t ME_MOUSESETUP_MOUSEAIMING = MAKE_MENUENTRY( "Vertical aiming:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_MOUSESETUP_MOUSEAIMING, Option );
901
#endif
901
#endif
902
static MenuOption_t MEO_MOUSESETUP_INVERT = MAKE_MENUOPTION( &MF_Redfont, &MEOS_YesNo, &ud.mouseflip );
902
static MenuOption_t MEO_MOUSESETUP_INVERT = MAKE_MENUOPTION( &MF_Redfont, &MEOS_YesNo, &ud.mouseflip );
903
static MenuEntry_t ME_MOUSESETUP_INVERT = MAKE_MENUENTRY( "Invert aiming:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_MOUSESETUP_INVERT, Option );
903
static MenuEntry_t ME_MOUSESETUP_INVERT = MAKE_MENUENTRY( "Invert aiming:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_MOUSESETUP_INVERT, Option );
904
static MenuOption_t MEO_MOUSESETUP_SMOOTH = MAKE_MENUOPTION( &MF_Redfont, &MEOS_NoYes, &ud.config.SmoothInput );
-
 
905
static MenuEntry_t ME_MOUSESETUP_SMOOTH = MAKE_MENUENTRY( "Filter input:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_MOUSESETUP_SMOOTH, Option );
-
 
-
 
904
906
#ifndef EDUKE32_SIMPLE_MENU
905
#ifndef EDUKE32_SIMPLE_MENU
907
static MenuLink_t MEO_MOUSESETUP_ADVANCED = { MENU_MOUSEADVANCED, MA_Advance, };
906
static MenuLink_t MEO_MOUSESETUP_ADVANCED = { MENU_MOUSEADVANCED, MA_Advance, };
908
static MenuEntry_t ME_MOUSESETUP_ADVANCED = MAKE_MENUENTRY( "Advanced setup", &MF_Redfont, &MEF_BigOptionsRt, &MEO_MOUSESETUP_ADVANCED, Link );
907
static MenuEntry_t ME_MOUSESETUP_ADVANCED = MAKE_MENUENTRY( "Advanced setup", &MF_Redfont, &MEF_BigOptionsRt, &MEO_MOUSESETUP_ADVANCED, Link );
909
#endif
908
#endif
910
static MenuRangeInt32_t MEO_MOUSEADVANCED_SCALEX = MAKE_MENURANGE(&ud.config.MouseAnalogueScale[0], &MF_Redfont, -262144, 262144, 65536, 161, 3);
909
static MenuRangeInt32_t MEO_MOUSEADVANCED_SCALEX = MAKE_MENURANGE(&ud.config.MouseAnalogueScale[0], &MF_Redfont, -262144, 262144, 65536, 161, 3);
Line 919... Line 918...
919
    &ME_MOUSEADVANCED_SCALEX,
918
    &ME_MOUSEADVANCED_SCALEX,
920
    &ME_MOUSEADVANCED_SCALEY,
919
    &ME_MOUSEADVANCED_SCALEY,
921
#endif
920
#endif
922
    &ME_Space2_Redfont,
921
    &ME_Space2_Redfont,
923
    &ME_MOUSESETUP_INVERT,
922
    &ME_MOUSESETUP_INVERT,
924
    &ME_MOUSESETUP_SMOOTH,
-
 
925
#ifndef EDUKE32_SIMPLE_MENU
923
#ifndef EDUKE32_SIMPLE_MENU
926
    &ME_MOUSESETUP_MOUSEAIMINGTYPE,
924
    &ME_MOUSESETUP_MOUSEAIMINGTYPE,
927
    &ME_MOUSESETUP_MOUSEAIMING,
925
    &ME_MOUSESETUP_MOUSEAIMING,
928
    &ME_MOUSESETUP_ADVANCED,
926
    &ME_MOUSESETUP_ADVANCED,
929
#endif
927
#endif
Line 3446... Line 3444...
3446
            S_PauseMusic(false);
3444
            S_PauseMusic(false);
3447
        }
3445
        }
3448
    }
3446
    }
3449
    else if (entry == &ME_SOUND_DUKETALK)
3447
    else if (entry == &ME_SOUND_DUKETALK)
3450
        ud.config.VoiceToggle = (ud.config.VoiceToggle&~1) | newOption;
3448
        ud.config.VoiceToggle = (ud.config.VoiceToggle&~1) | newOption;
3451
    else if (entry == &ME_MOUSESETUP_SMOOTH)
-
 
3452
        CONTROL_SmoothMouse = ud.config.SmoothInput;
-
 
3453
    else if (entry == &ME_JOYSTICK_ENABLE)
3449
    else if (entry == &ME_JOYSTICK_ENABLE)
3454
    {
3450
    {
3455
        if (newOption)
3451
        if (newOption)
3456
            CONTROL_ScanForControllers();
3452
            CONTROL_ScanForControllers();
3457
        CONTROL_JoystickEnabled = (newOption && CONTROL_JoyPresent);
3453
        CONTROL_JoystickEnabled = (newOption && CONTROL_JoyPresent);