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

Browse Source 
Minor edits to some code and documents.
This commit is contained in:
NovaRain
2020-01-23 20:35:18 +08:00
parent 36b3b6a2c7
commit e733954e65
6 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/ddraw.ini
+1 -4
View File
@@ -374,7 +374,7 @@ CorpseDeleteTime=6
;Set a number of milliseconds to idle each input loop ;Set a number of milliseconds to idle each input loop
;Set to -1 to disable ;Set to -1 to disable
;Set to 0 to idle only if other processes are waiting for processor time ;Set to 0 to idle only if other processes of equal priority are waiting for processor time
;Set to 1 (or some higher number if needed, the maximum is 127) to prevent 100% CPU use ;Set to 1 (or some higher number if needed, the maximum is 127) to prevent 100% CPU use
ProcessorIdle=-1 ProcessorIdle=-1
@@ -484,9 +484,6 @@ BonusHtHDamageFix=1
;Set to 1 to display additional points of damage from Bonus HtH/Ranged Damage perks in the inventory ;Set to 1 to display additional points of damage from Bonus HtH/Ranged Damage perks in the inventory
DisplayBonusDamage=0 DisplayBonusDamage=0
;Set to 1 to display the range of the second attack mode in the inventory when you switch weapon modes in active item slots
DisplaySecondWeaponRange=1
;Modify the maximum number of animations allowed to run on a map. (Default is 32, and the maximum is 127) ;Modify the maximum number of animations allowed to run on a map. (Default is 32, and the maximum is 127)
AnimationsAtOnceLimit=120 AnimationsAtOnceLimit=120
artifacts/scripting/headers/sfall.h
+3 -3
View File
@@ -70,7 +70,7 @@
#define WINTYPE_DIALOG (1) #define WINTYPE_DIALOG (1)
#define WINTYPE_PIPBOY (2) #define WINTYPE_PIPBOY (2)
#define WINTYPE_WORLDMAP (3) #define WINTYPE_WORLDMAP (3)
#define WINTYPE_MAINIFACE (4) // the interface bar #define WINTYPE_IFACEBAR (4) // the interface bar
#define WINTYPE_CHARACTER (5) #define WINTYPE_CHARACTER (5)
#define WINTYPE_SKILLDEX (6) #define WINTYPE_SKILLDEX (6)
#define WINTYPE_ESCMENU (7) // escape menu #define WINTYPE_ESCMENU (7) // escape menu
@@ -253,8 +253,8 @@
#define get_current_inven_size(obj) sfall_func1("get_current_inven_size", obj) #define get_current_inven_size(obj) sfall_func1("get_current_inven_size", obj)
#define get_cursor_mode sfall_func0("get_cursor_mode") #define get_cursor_mode sfall_func0("get_cursor_mode")
#define get_flags(obj) sfall_func1("get_flags", obj) #define get_flags(obj) sfall_func1("get_flags", obj)
#define get_interface_xpos(winType) sfall_func2("get_window_attribute", winType, 0) #define get_interface_x(winType) sfall_func2("get_window_attribute", winType, 0)
#define get_interface_ypos(winType) sfall_func2("get_window_attribute", winType, 1) #define get_interface_y(winType) sfall_func2("get_window_attribute", winType, 1)
#define get_inven_ap_cost sfall_func0("get_inven_ap_cost") #define get_inven_ap_cost sfall_func0("get_inven_ap_cost")
#define get_map_enter_position sfall_func0("get_map_enter_position") #define get_map_enter_position sfall_func0("get_map_enter_position")
#define get_metarule_table sfall_func0("get_metarule_table") #define get_metarule_table sfall_func0("get_metarule_table")
sfall/BugFixes.cpp
+2 -2
View File
@@ -101,7 +101,7 @@ isFloat:
} }
static const DWORD UnarmedAttacksFixEnd = 0x423A0D; static const DWORD UnarmedAttacksFixEnd = 0x423A0D;
static void __declspec(naked) UnarmedAttacksFix() { static void __declspec(naked) compute_attack_hack() {
__asm { __asm {
mov ecx, 5; // 5% chance of critical hit mov ecx, 5; // 5% chance of critical hit
cmp edx, ATKTYPE_POWERKICK; // Power Kick cmp edx, ATKTYPE_POWERKICK; // Power Kick
@@ -2473,7 +2473,7 @@ void BugFixesInit()
//if (GetConfigInt("Misc", "SpecialUnarmedAttacksFix", 1)) { //if (GetConfigInt("Misc", "SpecialUnarmedAttacksFix", 1)) {
dlog("Applying Special Unarmed Attacks fix.", DL_INIT); dlog("Applying Special Unarmed Attacks fix.", DL_INIT);
MakeJump(0x42394D, UnarmedAttacksFix); MakeJump(0x42394D, compute_attack_hack);
dlogr(" Done", DL_INIT); dlogr(" Done", DL_INIT);
//} //}
sfall/FalloutEngine.cpp
+2 -2
View File
@@ -1452,7 +1452,7 @@ enum WinNameType {
WINTYPE_Dialog = 1, WINTYPE_Dialog = 1,
WINTYPE_PipBoy = 2, WINTYPE_PipBoy = 2,
WINTYPE_WorldMap = 3, WINTYPE_WorldMap = 3,
WINTYPE_MainIface = 4, // the interface bar WINTYPE_IfaceBar = 4, // the interface bar
WINTYPE_Character = 5, WINTYPE_Character = 5,
WINTYPE_Skilldex = 6, WINTYPE_Skilldex = 6,
WINTYPE_EscMenu = 7, // escape menu WINTYPE_EscMenu = 7, // escape menu
@@ -1473,7 +1473,7 @@ WINinfo* GetUIWindow(long winType) {
case WINTYPE_WorldMap: case WINTYPE_WorldMap:
winID = *(DWORD*)_wmBkWin; winID = *(DWORD*)_wmBkWin;
break; break;
case WINTYPE_MainIface: case WINTYPE_IfaceBar:
winID = *ptr_interfaceWindow; winID = *ptr_interfaceWindow;
break; break;
case WINTYPE_Character: case WINTYPE_Character:
sfall/ScriptOps/InterfaceOp.hpp
+2 -2
View File
@@ -723,10 +723,10 @@ void sf_get_window_attribute() {
} }
long pos = 0; long pos = 0;
switch (attrArg.rawValue()) { switch (attrArg.rawValue()) {
case 0 : // x case 0: // x
pos = win->wRect.left; pos = win->wRect.left;
break; break;
case 1 : // y case 1: // y
pos = win->wRect.top; pos = win->wRect.top;
break; break;
} }
sfall/main.cpp
+3 -2
View File
@@ -701,11 +701,12 @@ static void DllMain2() {
dlogr(" Done", DL_INIT); dlogr(" Done", DL_INIT);
} }
if (GetConfigInt("Misc", "DisplaySecondWeaponRange", 1)) { // Display the range of the second attack mode in the inventory when you switch weapon modes in active item slots
//if (GetConfigInt("Misc", "DisplaySecondWeaponRange", 1)) {
dlog("Applying display second weapon range patch.", DL_INIT); dlog("Applying display second weapon range patch.", DL_INIT);
HookCall(0x472201, display_stats_hook); HookCall(0x472201, display_stats_hook);
dlogr(" Done", DL_INIT); dlogr(" Done", DL_INIT);
} //}
if (GetConfigInt("Misc", "InterfaceDontMoveOnTop", 0)) { if (GetConfigInt("Misc", "InterfaceDontMoveOnTop", 0)) {
dlog("Applying InterfaceDontMoveOnTop patch.", DL_INIT); dlog("Applying InterfaceDontMoveOnTop patch.", DL_INIT);