Skip to content

Commit

Permalink
Removed NPCStage6Fix from ddraw.ini (always enabled)
Browse files Browse the repository at this point in the history 
Moved the code of NPCStage6Fix to BugFixes.cpp.
(to its original relative location, right above MultiHexPathingFix)

Reorganized some code in BugFixes.cpp.

Tweaked the error printing for ResizeArray in Arrays.cpp.
  • Loading branch information
@NovaRain
NovaRain committed Sep 27, 2019
1 parent 552a2a1 commit e6a51f9
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 94 deletions.
3 changes: 0 additions & 3 deletions artifacts/ddraw.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,9 +483,6 @@ AnimationsAtOnceLimit=120
;Set to 1 to remove the limits that stop the player rolling critical successes/misses in the first few days of game time
RemoveCriticalTimelimits=0

;Set to 1 to enable party members with level 6 protos to reach level 6
NPCStage6Fix=0

;Change the colour of the font used on the main menu for the Fallout/sfall version number and copyright text
;It's the last byte ('3C' by default) that picks the colour used. The first byte supplies additional flags for this option
;MainMenuFontColour=0x00003C
Expand Down
16 changes: 6 additions & 10 deletions sfall/Arrays.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -639,8 +639,6 @@ static void MapSort(sArrayVar& arr, int type) {
}
}

static const char* errorResize = "\nOPCODE ERROR: resize_array() - array sorting error.";

void _stdcall ResizeArray(DWORD id, int newlen) {
if (newlen == -1 || arrays.find(id) == arrays.end()) return;

Expand All @@ -664,10 +662,7 @@ void _stdcall ResizeArray(DWORD id, int newlen) {
arr.clearRange(actualLen);
arr.val.resize(actualLen);
} else if (newlen < 0) {
if (newlen < (ARRAY_ACTION_SHUFFLE - 2)) {
DebugPrintf(errorResize);
return;
}
if (newlen < (ARRAY_ACTION_SHUFFLE - 2)) goto errorResize;
MapSort(arr, newlen);
}
return;
Expand All @@ -681,12 +676,13 @@ void _stdcall ResizeArray(DWORD id, int newlen) {
}
arr.val.resize(newlen);
} else { // special functions for lists...
if (newlen < ARRAY_ACTION_SHUFFLE) {
DebugPrintf(errorResize);
return;
}
if (newlen < ARRAY_ACTION_SHUFFLE) goto errorResize;
ListSort(arr.val, newlen);
}
return;

errorResize:
DebugPrintf("\nOPCODE ERROR: resize_array() - array sorting error.");
}

void _stdcall FixArray(DWORD id) {
Expand Down
128 changes: 77 additions & 51 deletions sfall/BugFixes.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -807,51 +807,70 @@ static void __declspec(naked) op_wield_obj_critter_adjust_ac_hook() {
}
}

static const DWORD NPCStage6Fix1End = 0x493D16;
static void __declspec(naked) NPCStage6Fix1() {
__asm {
imul eax, edx, 204; // necessary memory = number of NPC records in party.txt * record size
mov ebx, eax; // copy total record size for later memset
call mem_malloc_; // malloc the necessary memory
jmp NPCStage6Fix1End; // call memset to set all malloc'ed memory to 0
}
}

static const DWORD NPCStage6Fix2End = 0x49423A;
static void __declspec(naked) NPCStage6Fix2() {
__asm {
imul edx, edx, 204; // NPC number as listed in party.txt * record size
mov eax, ds:[_partyMemberAIOptions]; // get starting offset of internal NPC table
jmp NPCStage6Fix2End; // eax+edx = offset of specific NPC record
}
}

// Haenlomal: Check path to critter for attack
static void __declspec(naked) MultiHexFix() {
__asm {
xor ecx, ecx; // argument value for make_path_func: ecx=0 (rotation data arg)
test byte ptr ds:[ebx+0x25], 0x08; // is target multihex?
mov ebx, dword ptr ds:[ebx+0x4]; // argument value for make_path_func: target's tilenum (end_tile)
test [ebx + 0x25], 0x08; // is target multihex?
mov ebx, [ebx + 0x4]; // argument value for make_path_func: target's tilenum (end_tile)
je end; // skip if not multihex
inc ebx; // otherwise, increase tilenum by 1
end:
retn; // call make_path_func (at 0x429024, 0x429175)
}
}

static const DWORD ai_move_steps_closer_run_object_ret = 0x42A169;
static void __declspec(naked) MultiHexCombatRunFix() {
static const DWORD ai_move_steps_closer_move_object_ret = 0x42A192;
static void __declspec(naked) MultiHexCombatMoveFix() {
__asm {
test byte ptr ds:[edi + 0x25], 0x08; // is target multihex?
test [edi + 0x25], 0x08; // is target multihex?
jnz multiHex;
test byte ptr ds:[esi + 0x25], 0x08; // is source multihex?
jz runTile;
test [esi + 0x25], 0x08; // is source multihex?
jz moveTile;
multiHex:
mov edx, dword ptr ds:[esp + 0x4]; // source's destination tilenum
cmp dword ptr ds:[edi + 0x4], edx; // target's tilenum
jnz runTile;
mov edx, [esp + 4]; // source's destination tilenum
cmp [edi + 0x4], edx; // target's tilenum
jnz moveTile;
add esp, 4;
jmp ai_move_steps_closer_run_object_ret;
runTile:
jmp ai_move_steps_closer_move_object_ret;
moveTile:
retn;
}
}

static const DWORD ai_move_steps_closer_move_object_ret = 0x42A192;
static void __declspec(naked) MultiHexCombatMoveFix() {
static const DWORD ai_move_steps_closer_run_object_ret = 0x42A169;
static void __declspec(naked) MultiHexCombatRunFix() {
__asm {
test byte ptr ds:[edi + 0x25], 0x08; // is target multihex?
test [edi + 0x25], 0x08; // is target multihex?
jnz multiHex;
test byte ptr ds:[esi + 0x25], 0x08; // is source multihex?
jz moveTile;
test [esi + 0x25], 0x08; // is source multihex?
jz runTile;
multiHex:
mov edx, dword ptr ds:[esp + 0x4]; // source's destination tilenum
cmp dword ptr ds:[edi + 0x4], edx; // target's tilenum
jnz moveTile;
mov edx, [esp + 4]; // source's destination tilenum
cmp [edi + 0x4], edx; // target's tilenum
jnz runTile;
add esp, 4;
jmp ai_move_steps_closer_move_object_ret;
moveTile:
jmp ai_move_steps_closer_run_object_ret;
runTile:
retn;
}
}
Expand Down Expand Up @@ -1277,30 +1296,28 @@ static void __declspec(naked) use_inventory_on_hack() {
}
}

static int __stdcall ItemCountFixStdcall(TGameObj* who, TGameObj* item) {
static int __stdcall ItemCountFix(TGameObj* who, TGameObj* item) {
int count = 0;
for (int i = 0; i < who->invenCount; i++) {
TInvenRec* tableItem = &who->invenTablePtr[i];
if (tableItem->object == item) {
count += tableItem->count;
} else if (ItemGetType(tableItem->object) == item_type_container) {
count += ItemCountFixStdcall(tableItem->object, item);
count += ItemCountFix(tableItem->object, item);
}
}
return count;
}

static void __declspec(naked) ItemCountFix() {
static void __declspec(naked) item_count_hack() {
__asm {
push ebx;
push ecx;
push edx; // save state
push edx; // item
push eax; // container-object
call ItemCountFixStdcall;
pop edx;
pop ecx;
pop ebx; // restore
call ItemCountFix;
pop edx;
pop ecx; // restore
retn;
}
}
Expand Down Expand Up @@ -1859,6 +1876,14 @@ static void __declspec(naked) db_freadInt_hook() {
}
}

static void __declspec(naked) op_attack_hook() {
__asm {
mov esi, dword ptr [esp + 0x3C + 4]; // free_move
mov ebx, dword ptr [esp + 0x40 + 4]; // add amount damage to target
jmp gdialogActive_;
}
}

static void __declspec(naked) combat_attack_hack() {
__asm {
mov ebx, ds:[_main_ctd + 0x2C]; // amountTarget
Expand All @@ -1872,14 +1897,6 @@ static void __declspec(naked) combat_attack_hack() {
}
}

static void __declspec(naked) op_attack_hook() {
__asm {
mov esi, dword ptr [esp + 0x3C + 4]; // free_move
mov ebx, dword ptr [esp + 0x40 + 4]; // add amount damage to target
jmp gdialogActive_;
}
}

static void __declspec(naked) op_use_obj_on_obj_hack() {
__asm {
test eax, eax; // source
Expand Down Expand Up @@ -2257,14 +2274,14 @@ static void __declspec(naked) wmInterfaceInit_hack() {

static long __fastcall GetFreeTilePlacement(long elev, long tile) {
long count = 0, dist = 1;
long freeTile = tile;
long checkTile = tile;
long rotation = *ptr_rotation;
while (ObjBlockingAt(0, freeTile, elev)) {
freeTile = TileNumInDirection(freeTile, rotation, dist);
while (ObjBlockingAt(0, checkTile, elev)) {
checkTile = TileNumInDirection(checkTile, rotation, dist);
if (++count > 5 && ++dist > 5) return tile;
if (++rotation > 5) rotation = 0;
}
return freeTile;
return checkTile; // free tile
}

static void __declspec(naked) map_check_state_hook() {
Expand Down Expand Up @@ -2482,6 +2499,15 @@ void BugFixesInit()
dlogr(" Done", DL_INIT);
//}

//if (GetPrivateProfileIntA("Misc", "NPCStage6Fix", 1, ini)) {
dlog("Applying NPC Stage 6 Fix.", DL_INIT);
MakeJump(0x493CE9, NPCStage6Fix1);
SafeWrite8(0x494063, 6); // loop should look for a potential 6th stage
SafeWrite8(0x4940BB, 204); // move pointer by 204 bytes instead of 200
MakeJump(0x494224, NPCStage6Fix2);
dlogr(" Done", DL_INIT);
//}

//if (GetPrivateProfileIntA("Misc", "MultiHexPathingFix", 1, ini)) {
dlog("Applying MultiHex Pathing Fix.", DL_INIT);
MakeCall(0x42901F, MultiHexFix);
Expand Down Expand Up @@ -2588,7 +2614,7 @@ void BugFixesInit()
MakeCall(0x471A94, use_inventory_on_hack);

// Fix item_count function returning incorrect value when there is a container-item inside
MakeJump(0x47808C, ItemCountFix); // replacing item_count_ function
MakeJump(0x47808C, item_count_hack); // replacing item_count_ function

// Fix for Sequence stat value not being printed correctly when using "print to file" option
MakeCall(0x4396F5, Save_as_ASCII_hack, 2);
Expand Down Expand Up @@ -2753,14 +2779,6 @@ void BugFixesInit()
// Fix returned result value when the file is missing
HookCall(0x4C6162, db_freadInt_hook);

// Fix for attack_complex still causing minimum damage to the target when the attacker misses
MakeCall(0x422FE5, combat_attack_hack, 1);

// Fix for critter_mod_skill taking a negative amount value as a positive
dlog("Applying critter_mod_skill fix.", DL_INIT);
SafeWrite8(0x45B910, 0x7E); // jbe > jle
dlogr(" Done", DL_INIT);

// Fix and repurpose the unused called_shot/num_attack arguments of attack_complex function
// also change the behavior of the result flags arguments
// called_shot - additional damage, when the damage received by the target is above the specified minimum
Expand All @@ -2775,6 +2793,14 @@ void BugFixesInit()
dlogr(" Done", DL_INIT);
}

// Fix for attack_complex still causing minimum damage to the target when the attacker misses
MakeCall(0x422FE5, combat_attack_hack, 1);

// Fix for critter_mod_skill taking a negative amount value as a positive
dlog("Applying critter_mod_skill fix.", DL_INIT);
SafeWrite8(0x45B910, 0x7E); // jbe > jle
dlogr(" Done", DL_INIT);

// Fix crash when calling use_obj/use_obj_on_obj without using set_self in global scripts
// also change the behavior of use_obj_on_obj function
// if the object uses the item on itself, then another function is called (not a bug fix)
Expand Down
30 changes: 0 additions & 30 deletions sfall/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -507,27 +507,6 @@ static void __declspec(naked) ScienceCritterCheckHook() {
}
}

static const DWORD NPCStage6Fix1End = 0x493D16;
static void __declspec(naked) NPCStage6Fix1() {
__asm {
mov eax, 204; // set record size to 204 bytes
imul eax, edx; // multiply by number of NPC records in party.txt
mov ebx, eax; // copy total record size for later memset
call mem_malloc_; // malloc the necessary memory
jmp NPCStage6Fix1End; // call memset to set all malloc'ed memory to 0
}
}

static const DWORD NPCStage6Fix2End = 0x49423A;
static void __declspec(naked) NPCStage6Fix2() {
__asm {
mov eax, 204; // record size is 204 bytes
imul edx, eax; // multiply by NPC number as listed in party.txt
mov eax, dword ptr ds:[_partyMemberAIOptions]; // get starting offset of internal NPC table
jmp NPCStage6Fix2End; // eax+edx = offset of specific NPC record
}
}

static const DWORD ScannerHookRet = 0x41BC1D;
static const DWORD ScannerHookFail = 0x41BC65;
static void __declspec(naked) ScannerAutomapHook() {
Expand Down Expand Up @@ -949,15 +928,6 @@ static void DllMain2() {
}
}

if (GetPrivateProfileIntA("Misc", "NPCStage6Fix", 1, ini)) {
dlog("Applying NPC Stage 6 Fix.", DL_INIT);
MakeJump(0x493CE9, NPCStage6Fix1);
SafeWrite8(0x494063, 6); // loop should look for a potential 6th stage
SafeWrite8(0x4940BB, 204); // move pointer by 204 bytes instead of 200
MakeJump(0x494224, NPCStage6Fix2);
dlogr(" Done", DL_INIT);
}

if (GetPrivateProfileIntA("Misc", "BoostScriptDialogLimit", 0, ini)) {
const int scriptDialogCount = 10000;
dlog("Applying script dialog limit patch.", DL_INIT);
Expand Down

0 comments on commit e6a51f9

Please sign in to comment.