From b7612ab64e73e1e839a4edd00c72b3c0aaabdcbd Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sat, 28 Feb 2015 14:13:31 +0000
Subject: [PATCH] Fix: Auto weapons (expert) could not be selected during IMP
 creation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7759 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Laptop/IMP Skill Trait.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Laptop/IMP Skill Trait.cpp b/Laptop/IMP Skill Trait.cpp
index 9c5dca31..56b1f6e1 100644
--- a/Laptop/IMP Skill Trait.cpp	
+++ b/Laptop/IMP Skill Trait.cpp	
@@ -521,7 +521,7 @@ void HandleIMPSkillTraitAnswers( UINT32 uiSkillPressed, BOOLEAN fSecondTrait )
 			}
 		}
 		// if cannot have expert level of skill, don't continue
-		else if ( gfSkillTraitQuestions2[uiSkillPressed] && !TwoStagedTrait( uiSkillPressed ) )
+		else if ( gfSkillTraitQuestions2[uiSkillPressed] && !TwoStagedTrait( gGameOptions.fNewTraitSystem ? gusNewMajorTraitRemap[uiSkillPressed] : uiSkillPressed ) )
 		{
 			//dont need to do anything
 			return;
@@ -635,7 +635,7 @@ void HandleIMPSkillTraitAnswers( UINT32 uiSkillPressed, BOOLEAN fSecondTrait )
 			}
 		}
 		// if cannot have expert level of skill, don't continue
-		else if ( gfSkillTraitQuestions[uiSkillPressed] && !TwoStagedTrait( uiSkillPressed ) )
+		else if ( gfSkillTraitQuestions[uiSkillPressed] && !TwoStagedTrait( gGameOptions.fNewTraitSystem ? gusNewMajorTraitRemap[uiSkillPressed] : uiSkillPressed ) )
 		{
 			//dont need to do anything
 			return;