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

Fixed "loot_obj" script function

Browse Source
This commit is contained in:
NovaRain
2020-04-18 09:03:16 +08:00
parent f0f00a77ea
commit 1b61bca702
5 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/FalloutEngine.cpp
+2 -2
View File
@@ -203,8 +203,8 @@ DWORD* ptr_Tag_ = reinterpret_cast<DWORD*>(_Tag_);
DWORD* ptr_tag_skill = reinterpret_cast<DWORD*>(_tag_skill);
DWORD* ptr_target_curr_stack = reinterpret_cast<DWORD*>(_target_curr_stack);
DWORD** ptr_target_pud = reinterpret_cast<DWORD**>(_target_pud);
DWORD* ptr_target_stack = reinterpret_cast<DWORD*>(_target_stack);
DWORD* ptr_target_stack_offset = reinterpret_cast<DWORD*>(_target_stack_offset);
DWORD* ptr_target_stack = reinterpret_cast<DWORD*>(_target_stack); // array of 10 DWORD
DWORD* ptr_target_stack_offset = reinterpret_cast<DWORD*>(_target_stack_offset); // array of 10 DWORD
DWORD* ptr_target_str = reinterpret_cast<DWORD*>(_target_str);
DWORD* ptr_target_xpos = reinterpret_cast<DWORD*>(_target_xpos);
DWORD* ptr_target_ypos = reinterpret_cast<DWORD*>(_target_ypos);
sfall/FalloutEngine.h
+2 -2
View File
@@ -482,8 +482,8 @@ extern DWORD* ptr_Tag_;
extern DWORD* ptr_tag_skill;
extern DWORD* ptr_target_curr_stack;
extern DWORD** ptr_target_pud;
extern DWORD* ptr_target_stack;
extern DWORD* ptr_target_stack_offset;
extern DWORD* ptr_target_stack; // array of 10 DWORD
extern DWORD* ptr_target_stack_offset; // array of 10 DWORD
extern DWORD* ptr_target_str;
extern DWORD* ptr_target_xpos;
extern DWORD* ptr_target_ypos;
sfall/LoadGameHook.cpp
-3
View File
@@ -51,8 +51,6 @@
#define MAX_GLOBAL_SIZE (MaxGlobalVars * 12 + 4)
DWORD LoadGameHook_LootTarget = 0;
static DWORD inLoop = 0;
static DWORD saveInCombatFix;
static bool gameLoaded = false;
@@ -546,7 +544,6 @@ static void __declspec(naked) UseInventoryOnHook_End() {
static void __declspec(naked) LootContainerHook_Start() {
__asm {
mov LoadGameHook_LootTarget, ebp; // _target_stack
or inLoop, INTFACELOOT;
xor eax, eax;
jmp inven_set_mouse_;
sfall/LoadGameHook.h
-2
View File
@@ -18,8 +18,6 @@
#pragma once
extern DWORD LoadGameHook_LootTarget;
void LoadGameHookInit();
// True if game was started, false when on the main menu
sfall/ScriptOps/ObjectsOps.hpp
+1 -1
View File
@@ -563,7 +563,7 @@ static void sf_obj_under_cursor() {
}
static void sf_get_loot_object() {
opHandler.setReturn((GetLoopFlags() & INTFACELOOT) ? LoadGameHook_LootTarget : 0);
opHandler.setReturn((GetLoopFlags() & INTFACELOOT) ? ptr_target_stack[*ptr_target_curr_stack] : 0);
}
static const char* failedLoad = "%s() - failed to load a prototype ID: %d";