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

Added a check for OutlineColor in gl_highlighting, in case player set it to negative values.

Browse Source 
Split the push/pop instructions in ItemCountFix() into individual lines.
This commit is contained in:
NovaRain
2017-05-07 21:20:17 +08:00
parent 0486192c3c
commit 475503d632
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/mods/gl_highlighting.int
BIN
View File
Binary file not shown.
artifacts/mods/gl_highlighting.ssl
+1
View File
@@ -103,6 +103,7 @@ procedure start begin
alsoCorpse := GetConfig(configSection, "Corpses", 0); alsoCorpse := GetConfig(configSection, "Corpses", 0);
checkLOS := GetConfig(configSection, "CheckLOS", 0); checkLOS := GetConfig(configSection, "CheckLOS", 0);
outlineColor := GetConfig(configSection, "OutlineColor", 16); outlineColor := GetConfig(configSection, "OutlineColor", 16);
if (outlineColor < 1) then outlineColor := 64;
motionScanner := GetConfig(configSection, "MotionScanner", 0); motionScanner := GetConfig(configSection, "MotionScanner", 0);
highlightFailMsg1 := Translate("HighlightFail1", "You aren't carrying a motion sensor."); highlightFailMsg1 := Translate("HighlightFail1", "You aren't carrying a motion sensor.");
sfall/Modules/Inventory.cpp
+6 -2
View File
@@ -600,11 +600,15 @@ int __stdcall ItemCountFixStdcall(fo::GameObject* who, fo::GameObject* item) {
void __declspec(naked) ItemCountFix() { void __declspec(naked) ItemCountFix() {
__asm { __asm {
push ebx; push ecx; push edx; // save state push ebx;
push ecx;
push edx; // save state
push edx; // item push edx; // item
push eax; // container-object push eax; // container-object
call ItemCountFixStdcall; call ItemCountFixStdcall;
pop edx; pop ecx; pop ebx; // restore pop edx;
pop ecx;
pop ebx; // restore
retn; retn;
} }
} }