From c05babeda70116434c67e32157174bef1d1fef12 Mon Sep 17 00:00:00 2001 From: NovaRain Date: Wed, 17 Oct 2018 09:34:14 +0800 Subject: [PATCH] Added DisplayNPCExtraInfo option to ddraw.ini for previous commit. --- artifacts/ddraw.ini | 3 +++ sfall/PartyControl.cpp | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/artifacts/ddraw.ini b/artifacts/ddraw.ini index 3e85ce1a..8c5019ed 100644 --- a/artifacts/ddraw.ini +++ b/artifacts/ddraw.ini @@ -629,6 +629,9 @@ NumbersInDialogue=0 ;Set to 1 to use Fallout's normal text font instead of DOS-like font on the world map WorldMapFontPatch=0 +;Set to 1 to display party member's current level/AC/addict flag on the combat control panel +DisplayNPCExtraInfo=0 + ;Set to 1 to prevent the inventory/loot/automap interfaces from being placed on top of other script-created windows InterfaceDontMoveOnTop=0 diff --git a/sfall/PartyControl.cpp b/sfall/PartyControl.cpp index 844301d5..c75b2f38 100644 --- a/sfall/PartyControl.cpp +++ b/sfall/PartyControl.cpp @@ -421,10 +421,14 @@ void PartyControlInit() { dlogr(" Disabled.", DL_INIT); // display party member's current level & AC & addict flag - HookCall(0x44926F, gdControlUpdateInfo_hook); - GetPrivateProfileString("sfall", "PartyLvlMsg", "Lvl:", levelMsg, 12, translationIni); - GetPrivateProfileString("sfall", "PartyACMsg", "AC:", armorClassMsg, 12, translationIni); - GetPrivateProfileString("sfall", "PartyAddictMsg", "Addict", addictMsg, 16, translationIni); + if (GetPrivateProfileIntA("Misc", "DisplayNPCExtraInfo", 0, ini)) { + dlog("Applying display NPC extra info patch.", DL_INIT); + HookCall(0x44926F, gdControlUpdateInfo_hook); + GetPrivateProfileString("sfall", "PartyLvlMsg", "Lvl:", levelMsg, 12, translationIni); + GetPrivateProfileString("sfall", "PartyACMsg", "AC:", armorClassMsg, 12, translationIni); + GetPrivateProfileString("sfall", "PartyAddictMsg", "Addict", addictMsg, 16, translationIni); + dlogr(" Done", DL_INIT); + } } void __stdcall PartyControlReset() {