Added SmallFrameFix option

Code style edit: use !boolean instead of (boolean == false) for some
checks.

artifacts/ddraw.ini

@@ -547,6 +547,9 @@ RemoveCriticalTimelimits=0
 ;3 - Fallout 1 original behavior: -1 AP cost for all weapons; aimed attacks are disabled
 FastShotFix=1
 
+;Set to 1 to fix the carry weight penalty of the Small Frame trait not being applied to bonus Strength points
+SmallFrameFix=0
+
 ;Set to 1 to boost the maximum number of script names from 1450 to 10000
 BoostScriptDialogLimit=0
 

sfall/FalloutEngine/FunctionOffsets.h

@@ -22,7 +22,7 @@
  * HOW TO USE ENGINE FUNCTIONS:
  *
  * in ASM code, call offsets directly, don't call wrappers as they might not be __stdcall
-* in C++ code, use wrappers (add new ones if the don't exist yet, see Wrappers_def.h)
+ * in C++ code, use wrappers (add new ones if the don't exist yet, see Functions_def.h)
  *
  * Note: USE C++! 
  * 1) Place thin __declspec(naked) hooks, only use minimum ASM to pass values to/from C++

sfall/Game/skills.cpp

@@ -18,21 +18,19 @@ namespace sf = sfall;
 
 // TODO: skill_level_, perk_adjust_skill_
 
-static bool CheckTrait(DWORD traitID) {
+static __forceinline bool CheckTrait(DWORD traitID) {
 	return (!sf::Perks::IsTraitDisabled(traitID) && (fo::var::pc_trait[0] == traitID || fo::var::pc_trait[1] == traitID));
 }
 
 int __stdcall Skills::trait_adjust_skill(DWORD skillID) {
 	int result = 0;
-	if (fo::var::pc_trait[0] != -1) {
-		result += sf::Perks::GetTraitSkillBonus(skillID, 0);
-	}
-	if (fo::var::pc_trait[1] != -1) {
-		result += sf::Perks::GetTraitSkillBonus(skillID, 1);
-	}
-	if (CheckTrait(fo::TRAIT_gifted)) {
-		result -= 10;
+	if (sf::Perks::TraitsModEnable()) {
+		if (fo::var::pc_trait[0] != -1) result += sf::Perks::GetTraitSkillBonus(skillID, 0);
+		if (fo::var::pc_trait[1] != -1) result += sf::Perks::GetTraitSkillBonus(skillID, 1);
 	}
+
+	if (CheckTrait(fo::TRAIT_gifted)) result -= 10;
+
 	if (CheckTrait(fo::TRAIT_good_natured)) {
 		if (skillID <= fo::SKILL_THROWING) {
 			result -= 10;

sfall/Game/stats.cpp

@@ -16,11 +16,13 @@ namespace game
 
 namespace sf = sfall;
 
+static bool smallFrameTraitFix = false;
+
 static int DudeGetBaseStat(DWORD statID) {
 	return fo::func::stat_get_base_direct(fo::var::obj_dude, statID);
 }
 
-static bool CheckTrait(DWORD traitID) {
+static __forceinline bool CheckTrait(DWORD traitID) {
 	return (!sf::Perks::IsTraitDisabled(traitID) && (fo::var::pc_trait[0] == traitID || fo::var::pc_trait[1] == traitID));
 }
 
@@ -28,8 +30,10 @@ int __stdcall Stats::trait_adjust_stat(DWORD statID) {
 	if (statID > fo::STAT_max_derived) return 0;
 
 	int result = 0;
+	if (sf::Perks::TraitsModEnable()) {
 		if (fo::var::pc_trait[0] != -1) result += sf::Perks::GetTraitStatBonus(statID, 0);
 		if (fo::var::pc_trait[1] != -1) result += sf::Perks::GetTraitStatBonus(statID, 1);
+	}
 
 	switch (statID) {
 	case fo::STAT_st:
@@ -66,8 +70,13 @@ int __stdcall Stats::trait_adjust_stat(DWORD statID) {
 		break;
 	case fo::STAT_carry_amt:
 		if (CheckTrait(fo::TRAIT_small_frame)) {
-			int str = DudeGetBaseStat(fo::STAT_st);
-			result -= str * 10;
+			int st;
+			if (smallFrameTraitFix) {
+				st = fo::func::stat_level(fo::var::obj_dude, fo::STAT_st);
+			} else {
+				st = DudeGetBaseStat(fo::STAT_st);
+			}
+			result -= st * 10;
 		}
 		break;
 	case fo::STAT_sequence:
@@ -107,6 +116,9 @@ static void __declspec(naked) trait_adjust_stat_hack() {
 void Stats::init() {
 	// Replace functions
 	sf::MakeJump(fo::funcoffs::trait_adjust_stat_, trait_adjust_stat_hack); // 0x4B3C7C
+
+	// Fix the carry weight penalty of the Small Frame trait not being applied to bonus Strength points
+	smallFrameTraitFix = (sf::GetConfigInt("Misc", "SmallFrameFix", 0) != 0);
 }
 
 }

sfall/Modules/HookScripts.cpp

@@ -111,7 +111,7 @@ static HooksInjectInfo injectHooks[] = {
 };
 
 void HookScripts::InjectingHook(int hookId) {
-	if (IsInjectHook(hookId) == false && injectHooks[hookId].id == hookId) {
+	if (!IsInjectHook(hookId) && injectHooks[hookId].id == hookId) {
 		injectHooks[hookId].injectState = 2;
 		injectHooks[hookId].inject();
 		devlog_f("Inject hook ID: %d\n", DL_INIT, hookId);
@@ -123,7 +123,7 @@ bool HookScripts::IsInjectHook(int hookId) {
 }
 
 bool HookScripts::HookHasScript(int hookId) {
-	return (hooks[hookId].empty() == false);
+	return (!hooks[hookId].empty());
 }
 
 void HookScripts::RegisterHook(fo::Program* script, int id, int procNum, bool specReg) {

sfall/Modules/HookScripts/ObjectHs.cpp

@@ -332,7 +332,7 @@ static void __declspec(naked) critter_adjust_poison_hack() {
 }
 
 static DWORD __fastcall AdjustRads_Script(DWORD critter, long amount) {
-	if (HookScripts::HookHasScript(HOOK_ADJUSTRADS) == false) return amount;
+	if (!HookScripts::HookHasScript(HOOK_ADJUSTRADS)) return amount;
 
 	BeginHook();
 	argCount = 2;

sfall/Modules/Interface.cpp

@@ -981,8 +981,8 @@ void Interface::init() {
 	}
 
 	// Corrects the height of the black background for death screen subtitles
-	if (hrpIsEnabled == false) SafeWrite32(0x48134D, 38 - (640 * 3));      // main_death_scene_ (shift y-offset 2px up, w/o HRP)
-	if (hrpIsEnabled == false || hrpVersionValid) SafeWrite8(0x481345, 4); // main_death_scene_
+	if (!hrpIsEnabled) SafeWrite32(0x48134D, 38 - (640 * 3));      // main_death_scene_ (shift y-offset 2px up, w/o HRP)
+	if (!hrpIsEnabled || hrpVersionValid) SafeWrite8(0x481345, 4); // main_death_scene_
 	if (hrpVersionValid) SafeWrite8(HRPAddress(0x10011738), 10);
 
 	// Cosmetic fix for the background image of the character portrait on the player's inventory screen

sfall/Modules/PartyControl.cpp

@@ -555,7 +555,7 @@ void PartyControl::SwitchToCritter(fo::GameObject* critter) {
 		if (critter == nullptr || critter == realDude.obj_dude) RestoreRealDudeState(); // return control to dude
 	}
 	if (critter != nullptr && critter != PartyControl::RealDudeObject()) {
-		if (!isControllingNPC && realDude.isSaved == false) {
+		if (!isControllingNPC && !realDude.isSaved) {
 			SaveRealDudeState();
 		}
 		SetCurrentDude(critter);

sfall/Modules/Perks.cpp

@@ -981,6 +981,10 @@ static void PerkSetup() {
 
 /////////////////////////// TRAIT FUNCTIONS ///////////////////////////////////
 
+int Perks::TraitsModEnable() {
+	return traitsEnable;
+}
+
 bool Perks::IsTraitDisabled(int traitID) {
 	return disableTraits[traitID];
 }

sfall/Modules/Perks.h

@@ -28,6 +28,8 @@ public:
 	const char* name() { return "Perks"; }
 	void init();
 
+	// Enable the modifications for traits by using the perks ini file
+	static int TraitsModEnable();
 	static bool IsTraitDisabled(int traitID);
 	static DWORD GetTraitStatBonus(int statID, int traitIndex);
 	static DWORD GetTraitSkillBonus(int skillID, int traitIndex);

sfall/Modules/ScriptExtender.cpp

@@ -675,7 +675,7 @@ static DWORD HandleTimedEventScripts() {
 
 	bool eventWasRunning = false;
 	for (auto timerIt = timerEventScripts.cbegin(); timerIt != timerEventScripts.cend(); ++timerIt) {
-		if (timerIt->isActive == false) continue;
+		if (!timerIt->isActive) continue;
 		if (currentTime >= timerIt->time) {
 			if (timedEvent) executeTimedEvents.push(timedEvent); // store a pointer to the currently running event
 
@@ -702,7 +702,7 @@ static DWORD HandleTimedEventScripts() {
 		timedEvent = nullptr;
 		// delete all previously executed events
 		for (auto it = timerEventScripts.cbegin(); it != timerEventScripts.cend();) {
-			if (it->isActive == false) {
+			if (!it->isActive) {
 				fo::func::dev_printf("\n[TimedEventScripts] Remove event: %d", it->time);
 				it = timerEventScripts.erase(it);
 			} else {