diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index 1fcbfc80..c74af50a 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -18625,5 +18625,5 @@ BOOLEAN DecideAltAnimForBigMerc( SOLDIERTYPE * pSoldier ) BOOLEAN TwoStagedTrait( UINT8 uiSkillTraitNumber ) { - return( uiSkillTraitNumber > 0 && (uiSkillTraitNumber <= NUM_MAJOR_TRAITS || uiSkillTraitNumber == COVERT_NT) ); + return( uiSkillTraitNumber > 0 && (uiSkillTraitNumber <= NUM_ORIGINAL_MAJOR_TRAITS || uiSkillTraitNumber == COVERT_NT) ); } \ No newline at end of file diff --git a/Tactical/soldier profile type.h b/Tactical/soldier profile type.h index 6f961a26..8bfc518c 100644 --- a/Tactical/soldier profile type.h +++ b/Tactical/soldier profile type.h @@ -167,6 +167,8 @@ typedef enum #define NUM_MAJOR_TRAITS 10 #define NUM_MINOR_TRAITS 10 +#define NUM_ORIGINAL_MAJOR_TRAITS 9 + // Flugente: I've had it with this hardcoding madness. Without this, adding or removing a new trait would crash anything related to a bubblehelp display of traits // always check every use of these enums and every use of the skill-strings if you add a new trait #define NEWTRAIT_MERCSKILL_EXPERTOFFSET NUM_MAJOR_TRAITS + NUM_MINOR_TRAITS