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 StackEmptyWeapons from ddraw.ini (always enabled)

Browse Source
This commit is contained in:
NovaRain
2023-02-02 12:39:06 +08:00
parent 9db5f45545
commit 465bc649be
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/ddraw.ini
-3
View File
@@ -640,9 +640,6 @@ ControlCombat=0
;If you want to control only specific critters, uncomment the ControlCombatPIDList line and set a comma delimited list of PIDs ;If you want to control only specific critters, uncomment the ControlCombatPIDList line and set a comma delimited list of PIDs
;ControlCombatPIDList=62,89,97,107,160,161 ;ControlCombatPIDList=62,89,97,107,160,161
;Set to 1 to stack empty identical weapons, no matter what type of ammo was loaded before
StackEmptyWeapons=0
;Changes the way weapon reloading works when you drag ammo onto a weapon in the inventory ;Changes the way weapon reloading works when you drag ammo onto a weapon in the inventory
;Set to -1 to disable (vanilla behavior with the 'Move Items' window) ;Set to -1 to disable (vanilla behavior with the 'Move Items' window)
;Set to 0 to use all the ammo boxes to reload ;Set to 0 to use all the ammo boxes to reload
sfall/Modules/Credits.cpp
+1 -1
View File
@@ -70,7 +70,7 @@ static const char* ExtraLines[] = {
"Rain man", "Rain man",
"Continuum", "Continuum",
"Drobovik", "Drobovik",
"Burn", "burn",
"Lexx", "Lexx",
"Anyone who has used sfall in their own mods", "Anyone who has used sfall in their own mods",
"The bug reporters and feature requesters", "The bug reporters and feature requesters",
sfall/Modules/Inventory.cpp
+4 -3
View File
@@ -359,7 +359,7 @@ static void __declspec(naked) SetDefaultAmmo() {
call fo::funcoffs::proto_ptr_; call fo::funcoffs::proto_ptr_;
mov edx, [esp]; mov edx, [esp];
mov eax, [edx + 0x5C]; // eax = default ammo pid mov eax, [edx + 0x5C]; // eax = default ammo pid
mov [ecx + ammoPid], eax; // set current ammo proto mov [ecx + ammoPid], eax; // set current ammo pid
add esp, 4; add esp, 4;
end: end:
pop ecx; pop ecx;
@@ -697,10 +697,11 @@ void Inventory::init() {
ApplyInvenApCostPatch(); ApplyInvenApCostPatch();
} }
if (IniReader::GetConfigInt("Misc", "StackEmptyWeapons", 0)) { // Set default ammo pid for empty weapons to make them stack regardless of previously loaded ammo
//if (IniReader::GetConfigInt("Misc", "StackEmptyWeapons", 1)) {
MakeCall(0x4736C6, inven_action_cursor_hack); MakeCall(0x4736C6, inven_action_cursor_hack);
HookCall(0x4772AA, item_add_mult_hook); HookCall(0x4772AA, item_add_mult_hook);
} //}
// Do not call the 'Move Items' window when using drag and drop to reload weapons in the inventory // Do not call the 'Move Items' window when using drag and drop to reload weapons in the inventory
int ReloadReserve = IniReader::GetConfigInt("Misc", "ReloadReserve", -1); int ReloadReserve = IniReader::GetConfigInt("Misc", "ReloadReserve", -1);