fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Removed SpeedInterfaceCounterAnims=3 (now default behavior)

Browse Source
This commit is contained in:
NovaRain
2024-04-01 17:21:34 +08:00
parent b50dcaa151
commit fc1d9dbfc2
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/ddraw.ini
-1
View File
@@ -520,7 +520,6 @@ AutoQuickSavePage=1
;Set to 1 to speed up the HP/AC counter animations ;Set to 1 to speed up the HP/AC counter animations
;Set to 2 to update the HP/AC counters instantly ;Set to 2 to update the HP/AC counters instantly
;Set to 3 to update the AC counter instantly when switching to other controlled critters in combat
SpeedInterfaceCounterAnims=0 SpeedInterfaceCounterAnims=0
;These lines allow you to control the karma FRMs displayed on the character screen ;These lines allow you to control the karma FRMs displayed on the character screen
sfall/Modules/PartyControl.cpp
+9 -11
View File
@@ -32,7 +32,7 @@ bool npcAutoLevelEnabled;
bool npcEngineLevelUp = true; bool npcEngineLevelUp = true;
static bool isControllingNPC = false; static bool isControllingNPC = false;
static char skipCounterAnim; static bool skipCounterAnim = false;
static int delayedExperience; static int delayedExperience;
@@ -94,8 +94,8 @@ static void SaveRealDudeState() {
realDude.isSaved = true; realDude.isSaved = true;
if (skipCounterAnim == 1) { if (!skipCounterAnim) {
skipCounterAnim++; skipCounterAnim = true;
SafeWrite8(0x422BDE, 0); // no animate SafeWrite8(0x422BDE, 0); // no animate
} }
if (isDebug) fo::func::debug_printf("\n[SFALL] Save dude state."); if (isDebug) fo::func::debug_printf("\n[SFALL] Save dude state.");
@@ -226,8 +226,8 @@ static void RestoreRealDudeState(bool redraw = true) {
(*fo::ptr::game_global_vars)[fo::ptr::drugInfoList[8].addictGvar] = realDude.addictGvar[7]; (*fo::ptr::game_global_vars)[fo::ptr::drugInfoList[8].addictGvar] = realDude.addictGvar[7];
if (redraw) { if (redraw) {
if (skipCounterAnim == 2) { if (skipCounterAnim) {
skipCounterAnim--; skipCounterAnim = false;
SafeWrite8(0x422BDE, 1); // restore SafeWrite8(0x422BDE, 1); // restore
} }
fo::func::intface_redraw(); fo::func::intface_redraw();
@@ -354,8 +354,8 @@ pcName:
static void PartyControlReset() { static void PartyControlReset() {
if (realDude.obj_dude != nullptr && isControllingNPC) { if (realDude.obj_dude != nullptr && isControllingNPC) {
RestoreRealDudeState(false); RestoreRealDudeState(false);
if (skipCounterAnim == 2) { if (skipCounterAnim) {
skipCounterAnim = 1; // skipCounterAnim--; skipCounterAnim = false;
SafeWrite8(0x422BDE, 1); // restore SafeWrite8(0x422BDE, 1); // restore
} }
} }
@@ -427,8 +427,8 @@ static void NPCWeaponTweak() {
void PartyControl::SwitchToCritter(fo::GameObject* critter) { void PartyControl::SwitchToCritter(fo::GameObject* critter) {
static bool onlyOnce = false; static bool onlyOnce = false;
if (skipCounterAnim == 2 && critter && critter == realDude.obj_dude) { if (skipCounterAnim && critter && critter == realDude.obj_dude) {
skipCounterAnim--; skipCounterAnim = false;
SafeWrite8(0x422BDE, 1); // restore SafeWrite8(0x422BDE, 1); // restore
} }
@@ -727,8 +727,6 @@ void PartyControl::init() {
NpcAutoLevelPatch(); NpcAutoLevelPatch();
skipCounterAnim = (IniReader::GetConfigInt("Misc", "SpeedInterfaceCounterAnims", 0) == 3) ? 1 : 0;
// Display party member's current level & AC & addict flag // Display party member's current level & AC & addict flag
if (IniReader::GetConfigInt("Misc", "PartyMemberExtraInfo", 0)) { if (IniReader::GetConfigInt("Misc", "PartyMemberExtraInfo", 0)) {
dlogr("Applying display extra info patch for party members.", DL_INIT); dlogr("Applying display extra info patch for party members.", DL_INIT);