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 unnecessary defines.

Browse Source
This commit is contained in:
NovaRain
2015-07-27 11:21:22 +08:00
parent 35380171cf
commit 03ddd2e12e
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Bugs.cpp
+5 -5
View File
@@ -584,10 +584,10 @@ static void __declspec(naked) action_melee_hack() {
mov ebx, [eax+0x20] // objStruct->FID
and ebx, 0x0F000000
sar ebx, 0x18
cmp ebx, ObjType_Critter // check if object FID type flag is set to critter
cmp ebx, OBJ_TYPE_CRITTER // check if object FID type flag is set to critter
jne end // if object not a critter leave jump condition flags
// set to skip dodge animation
test byte ptr [eax+0x44], 0x3 // (original code) DAM_KNOCKED_OUT or DAM_KNOCKED_DOWN
test byte ptr [eax+0x44], 3 // (original code) DAM_KNOCKED_OUT or DAM_KNOCKED_DOWN
jnz end
mov edx, 0x4113FE
end:
@@ -601,10 +601,10 @@ static void __declspec(naked) action_ranged_hack() {
mov ebx, [eax+0x20] // objStruct->FID
and ebx, 0x0F000000
sar ebx, 0x18
cmp ebx, ObjType_Critter // check if object FID type flag is set to critter
cmp ebx, OBJ_TYPE_CRITTER // check if object FID type flag is set to critter
jne end // if object not a critter leave jump condition flags
// set to skip dodge animation
test byte ptr [eax+0x44], 0x3 // (original code) DAM_KNOCKED_OUT or DAM_KNOCKED_DOWN
test byte ptr [eax+0x44], 3 // (original code) DAM_KNOCKED_OUT or DAM_KNOCKED_DOWN
jnz end
mov edx, 0x411BD2
end:
@@ -656,7 +656,7 @@ static void __declspec(naked) obj_load_func_hack() {
jnz end
mov edi, [eax+0x64]
shr edi, 0x18
cmp edi, ObjType_Critter
cmp edi, OBJ_TYPE_CRITTER
jne skip
test byte ptr [eax+0x44], 0x2 // DAM_KNOCKED_DOWN?
jz clear // No
sfall/Define.h
-8
View File
@@ -256,14 +256,6 @@
#define item_type_misc_item (5)
#define item_type_key_item (6)
#define ObjType_Item (0)
#define ObjType_Critter (1)
#define ObjType_Scenery (2)
#define ObjType_Wall (3)
#define ObjType_Tile (4)
#define ObjType_Misc (5)
#define ObjType_Intrface (6)
#define OBJFLAG_CAN_WEAR_ITEMS (0xf000000)
#define OBJFLAG_HELD_IN_RIGHT (0x10000)