From 1aa8eaa948869b1e74ef8102abb67782da16c54c Mon Sep 17 00:00:00 2001 From: Flugente Date: Sat, 4 Mar 2017 13:30:37 +0000 Subject: [PATCH] Fix: When reading in Skills_Settings.ini, NUMBER_OF_MAJOR_TRAITS_ALLOWED_FOR_IMP is now limited by min(NUMBER_OF_MAJOR_TRAITS_ALLOWED, MAX_NUMBER_OF_TRAITS_FOR_IMP - 1). git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8391 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 4ffe5e015..b24c4024c 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -2371,7 +2371,7 @@ void LoadSkillTraitsExternalSettings() gSkillTraitValues.ubNumberOfMajorTraitsAllowed = iniReader.ReadInteger( "Generic Traits Settings", "NUMBER_OF_MAJOR_TRAITS_ALLOWED", 3, 2, gSkillTraitValues.ubMaxNumberOfTraits - 1); gSkillTraitValues.ubMaxNumberOfTraitsForIMP = iniReader.ReadInteger("Generic Traits Settings","MAX_NUMBER_OF_TRAITS_FOR_IMP", 3, 2, 30); - gSkillTraitValues.ubNumberOfMajorTraitsAllowedForIMP = iniReader.ReadInteger( "Generic Traits Settings", "NUMBER_OF_MAJOR_TRAITS_ALLOWED_FOR_IMP", 2, 2, gSkillTraitValues.ubMaxNumberOfTraitsForIMP - 1 ); + gSkillTraitValues.ubNumberOfMajorTraitsAllowedForIMP = iniReader.ReadInteger( "Generic Traits Settings", "NUMBER_OF_MAJOR_TRAITS_ALLOWED_FOR_IMP", 2, 2, min( gSkillTraitValues.ubNumberOfMajorTraitsAllowed, gSkillTraitValues.ubMaxNumberOfTraitsForIMP - 1 ) ); // Allow an exception in number of traits for Special Merc? //gSkillTraitValues.fAllowSpecialMercTraitsException = iniReader.ReadBoolean("Generic Traits Settings","ALLOW_EXCEPTION_FOR_SPECIAL_MERC", TRUE);