From 3579d96999d82fc1985b22f9d644f6c1d01a294d Mon Sep 17 00:00:00 2001
From: Sevenfm <Sevenfm@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 5 May 2021 15:54:31 +0000
Subject: [PATCH] Fixes some old traits not having any popup text or showing
 "No bonuses" during IMP character creation (by Shadooow).

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

diff --git a/Laptop/IMP Skill Trait.cpp b/Laptop/IMP Skill Trait.cpp
index 56b1f6e1..080f23e3 100644
--- a/Laptop/IMP Skill Trait.cpp	
+++ b/Laptop/IMP Skill Trait.cpp	
@@ -79,6 +79,25 @@ UINT8 gusNewMajorTraitRemap[IMP_SKILL_TRAITS_NEW_NUMBER_MAJOR_SKILLS] =
 	NO_SKILLTRAIT_NT,	// IMP_SKILL_TRAITS_NEW_MAJOR_NONE
 };
 
+//shadooow: same as above but for old skill traits
+UINT8 gusOldMajorTraitRemap[IMP_SKILL_TRAITS__NUMBER_SKILLS] =
+{
+	LOCKPICKING_OT,
+	HANDTOHAND_OT,
+	ELECTRONICS_OT,
+	NIGHTOPS_OT,
+	THROWING_OT,
+	TEACHING_OT,
+	HEAVY_WEAPS_OT,
+	AUTO_WEAPS_OT,
+	STEALTHY_OT,
+	AMBIDEXT_OT,
+	KNIFING_OT,
+	PROF_SNIPER_OT,
+	CAMOUFLAGED_OT,
+	MARTIALARTS_OT,
+	NO_SKILLTRAIT_OT,
+};
 
 //*******************************************************************
 //
@@ -884,7 +903,7 @@ void IMPSkillTraitDisplaySkills()
 		// assign help texts
 		CHAR16	apStr[5000];
 		swprintf( apStr, L"" );
-		AssignPersonnelSkillTraitHelpText( gusNewMajorTraitRemap[uiCnt], ((gfSkillTraitQuestions[uiCnt] && gfSkillTraitQuestions2[uiCnt]) ? TRUE : FALSE), fCharacterIsMale && !bBigBodySelected( ), apStr );
+		AssignPersonnelSkillTraitHelpText(gGameOptions.fNewTraitSystem ? gusNewMajorTraitRemap[uiCnt] : gusOldMajorTraitRemap[uiCnt], ((gfSkillTraitQuestions[uiCnt] && gfSkillTraitQuestions2[uiCnt]) ? TRUE : FALSE), fCharacterIsMale && !bBigBodySelected( ), apStr );
 
 		// Set region help text
 		SetRegionFastHelpText( &(gMR_SkillTraitHelpTextRegions[uiCnt]), apStr );