Major scoped-enum refactor

2025-12-09 11:47:43 +00:00 · 2015-11-20 15:16:07 -10:00
parent 4c09ded013
commit e423db32ee
83 changed files with 958 additions and 904 deletions
--- a/Runtime/Input/ControlMapper.hpp
+++ b/Runtime/Input/ControlMapper.hpp
@@ -8,97 +8,97 @@ class CFinalInput;
 class ControlMapper
 {
 public:
-    enum ECommands
+    enum class ECommands
    {
-        CmdForward,
-        CmdBackward,
-        CmdTurnLeft,
-        CmdTurnRight,
-        CmdStrafeLeft,
-        CmdStrafeRight,
-        CmdLookLeft,
-        CmdLookRight,
-        CmdLookUp,
-        CmdLookDown,
-        CmdJumpOrBoost,
-        CmdFireOrBomb,
-        CmdMissileOrPowerBomb,
-        CmdMorph,
-        CmdAimUp,
-        CmdAimDown,
-        CmdCycleBeamUp,
-        CmdCycleBeamDown,
-        CmdCycleItem,
-        CmdPowerBeam,
-        CmdIceBeam,
-        CmdWaveBeam,
-        CmdPlasmaBeam,
-        CmdToggleHolster,
-        CmdOrbitClose,
-        CmdOrbitFar,
-        CmdOrbitObject,
-        CmdOrbitSelect,
-        CmdOrbitConfirm,
-        CmdOrbitLeft,
-        CmdOrbitRight,
-        CmdOrbitUp,
-        CmdOrbitDown,
-        CmdLookHold1,
-        CmdLookHold2,
-        CmdLookZoomIn,
-        CmdLookZoomOut,
-        CmdAimHold,
-        CmdMapCircleUp,
-        CmdMapCircleDown,
-        CmdMapCircleLeft,
-        CmdMapCircleRight,
-        CmdMapMoveForward,
-        CmdMapMoveBack,
-        CmdMapMoveLeft,
-        CmdMapMoveRight,
-        CmdMapZoomIn,
-        CmdMapZoomOut,
-        CmdChaseCamera,
-        CmdXrayVisor,
-        CmdThermoVisor,
-        CmdInviroVisor,
-        CmdNoVisor,
-        CmdVisorMenu,
-        CmdVisorUp,
-        CmdVisorDown,
-        CmdUseSheild=0x3B,
-        CmdScanItem=0x3C,
-        CmdUNKNOWN,
-        CmdNone,
-        CmdMAX
+        Forward,
+        Backward,
+        TurnLeft,
+        TurnRight,
+        StrafeLeft,
+        StrafeRight,
+        LookLeft,
+        LookRight,
+        LookUp,
+        LookDown,
+        JumpOrBoost,
+        FireOrBomb,
+        MissileOrPowerBomb,
+        Morph,
+        AimUp,
+        AimDown,
+        CycleBeamUp,
+        CycleBeamDown,
+        CycleItem,
+        PowerBeam,
+        IceBeam,
+        WaveBeam,
+        PlasmaBeam,
+        ToggleHolster,
+        OrbitClose,
+        OrbitFar,
+        OrbitObject,
+        OrbitSelect,
+        OrbitConfirm,
+        OrbitLeft,
+        OrbitRight,
+        OrbitUp,
+        OrbitDown,
+        LookHold1,
+        LookHold2,
+        LookZoomIn,
+        LookZoomOut,
+        AimHold,
+        MapCircleUp,
+        MapCircleDown,
+        MapCircleLeft,
+        MapCircleRight,
+        MapMoveForward,
+        MapMoveBack,
+        MapMoveLeft,
+        MapMoveRight,
+        MapZoomIn,
+        MapZoomOut,
+        ChaseCamera,
+        XrayVisor,
+        ThermoVisor,
+        InviroVisor,
+        NoVisor,
+        VisorMenu,
+        VisorUp,
+        VisorDown,
+        UseSheild=0x3B,
+        ScanItem=0x3C,
+        UNKNOWN,
+        None,
+        MAX
    };

-    enum EFunctionList
+    enum class EFunctionList
    {
-        FuncNone,
-        FuncLeftStickUp,
-        FuncLeftStickDown,
-        FuncLeftStickLeft,
-        FuncLeftStickRight,
-        FuncRightStickUp,
-        FuncRightStickDown,
-        FuncRightStickLeft,
-        FuncRightStickRight,
-        FuncLeftTrigger,
-        FuncRightTrigger,
-        FuncDPadUp,
-        FuncDPadDown,
-        FuncDPadLeft,
-        FuncDPadRight,
-        FuncAButton,
-        FuncBButton,
-        FuncXButton,
-        FuncYButton,
-        FuncZButton,
-        FuncLeftTriggerPress,
-        FuncRightTriggerPress,
-        FuncStart,
-        FuncMAX // default case
+        None,
+        LeftStickUp,
+        LeftStickDown,
+        LeftStickLeft,
+        LeftStickRight,
+        RightStickUp,
+        RightStickDown,
+        RightStickLeft,
+        RightStickRight,
+        LeftTrigger,
+        RightTrigger,
+        DPadUp,
+        DPadDown,
+        DPadLeft,
+        DPadRight,
+        AButton,
+        BButton,
+        XButton,
+        YButton,
+        ZButton,
+        LeftTriggerPress,
+        RightTriggerPress,
+        Start,
+        MAX // default case
    };

    static void SetCommandFiltered(ECommands cmd, bool filtered);