Minor CStateManager fixes, CScriptColorModulate imps

2025-12-09 09:47:43 +00:00 · 2016-08-18 11:34:06 -07:00
parent 9ca7f9c9e4
commit 0ef4dbc7d2
8 changed files with 211 additions and 47 deletions
--- a/Runtime/CPlayerState.hpp
+++ b/Runtime/CPlayerState.hpp
@@ -17,47 +17,47 @@ class CPlayerState
 public:
    enum class EItemType : u32
    {
-        PowerBeam,
-        IceBeam,
-        WaveBeam,
-        PlasmaBeam,
-        Missiles,
-        ScanVisor,
-        MorphBallBombs,
-        PowerBombs,
-        Flamethrower,
-        ThermalVisor,
-        ChargeBeam,
-        SuperMissile,
-        GrappleBeam,
-        XRayVisor,
-        IceSpreader,
-        SpaceJumpBoots,
-        MorphBall,
-        CombatVisor,
-        BoostBall,
-        SpiderBall,
-        PowerSuit,
-        GravitySuit,
-        VariaSuit,
-        PhazonSuit,
-        EnergyTanks,
-        UnknownItem1,
-        HealthRefill,
-        UnknownItem2,
-        Wavebuster,
-        ArtifactOfTruth,
-        ArtifactOfStrength,
-        ArtifactOfElder,
-        ArtifactOfWild,
-        ArtifactOfLifegiver,
-        ArtifactOfWarrior,
-        ArtifactOfChozo,
-        ArtifactOfNature,
-        ArtifactOfSun,
-        ArtifactOfWorld,
-        ArtifactOfSpirit,
-        ArtifactOfNewborn,
+        PowerBeam = 0,
+        IceBeam = 1,
+        WaveBeam = 2,
+        PlasmaBeam = 3,
+        Missiles = 4,
+        ScanVisor = 5,
+        MorphBallBombs = 6,
+        PowerBombs = 7,
+        Flamethrower = 8,
+        ThermalVisor = 9,
+        ChargeBeam = 10,
+        SuperMissile = 11,
+        GrappleBeam = 12,
+        XRayVisor = 13,
+        IceSpreader = 14,
+        SpaceJumpBoots = 15,
+        MorphBall = 16,
+        CombatVisor = 17,
+        BoostBall = 18,
+        SpiderBall = 19,
+        PowerSuit = 20,
+        GravitySuit = 21,
+        VariaSuit = 22,
+        PhazonSuit = 23,
+        EnergyTanks = 24,
+        UnknownItem1 = 25,
+        HealthRefill = 26,
+        UnknownItem2 = 27,
+        Wavebuster = 28,
+        ArtifactOfTruth = 29,
+        ArtifactOfStrength = 30,
+        ArtifactOfElder = 31,
+        ArtifactOfWild = 32,
+        ArtifactOfLifegiver = 33,
+        ArtifactOfWarrior = 34,
+        ArtifactOfChozo = 35,
+        ArtifactOfNature = 36,
+        ArtifactOfSun = 37,
+        ArtifactOfWorld = 38,
+        ArtifactOfSpirit = 39,
+        ArtifactOfNewborn = 40,

        /* This must remain at the end of the list */
        Max