Minor code fixes in AI.cpp:

* Fixed NPCs being unable to select a burst attack mode if the line of
fire was blocked.

* Changed the return point of combat_ai_hook_FleeFix to run
ai_check_drugs_ first.

Changed the debug message about missing art file for critters to be
displayed in game only when in sfall debugging mode.

sfall/FalloutEngine/EngineUtils.cpp

@@ -166,7 +166,7 @@ void ToggleNpcFlag(fo::GameObject* npc, long flag, bool set) {
 	}
 }
 
-// Returns the number of party members in the existing table (begins from 1)
+// Returns the position of party member in the existing table (begins from 1)
 long IsPartyMemberByPid(long pid) {
 	size_t patryCount = fo::var::partyMemberMaxCount;
 	if (patryCount) {
@@ -178,6 +178,7 @@ long IsPartyMemberByPid(long pid) {
 	return 0;
 }
 
+// Returns True if the NPC belongs to the player's potential (set in party.txt) party members (analog of broken isPotentialPartyMember_)
 bool IsPartyMember(fo::GameObject* critter) {
 	if (critter->id < PLAYER_ID) return false;
 	return (IsPartyMemberByPid(critter->protoId) > 0);

sfall/FalloutEngine/EngineUtils.h

@@ -72,9 +72,10 @@ long __fastcall IsRadInfluence();
 
 void ToggleNpcFlag(fo::GameObject* npc, long flag, bool set);
 
-// Returns the number of party members in the existing table (begins from 1)
+// Returns the position of party member in the existing table (begins from 1)
 long IsPartyMemberByPid(long pid);
 
+// Returns True if the NPC belongs to the player's potential (set in party.txt) party members (analog of broken isPotentialPartyMember_)
 bool IsPartyMember(fo::GameObject* critter);
 
 // Returns the number of local variables of the object script

sfall/Modules/AI.cpp

@@ -48,7 +48,8 @@ fo::GameObject* AI::sf_check_critters_in_lof(fo::GameObject* object, DWORD check
 fo::GameObject* AI::CheckFriendlyFire(fo::GameObject* target, fo::GameObject* attacker) {
 	fo::GameObject* object = nullptr;
 	fo::func::make_straight_path_func(attacker, attacker->tile, target->tile, 0, (DWORD*)&object, 32, (void*)fo::funcoffs::obj_shoot_blocking_at_);
-	return sf_check_critters_in_lof(object, target->tile, attacker->critter.teamNum); // 0 if there are no friendly critters
+	object = sf_check_critters_in_lof(object, target->tile, attacker->critter.teamNum);
+	return (!object || object->TypeFid() == fo::ObjType::OBJ_TYPE_CRITTER) ? object : nullptr; // 0 if there are no friendly critters
 }
 
 static void __declspec(naked) ai_try_attack_hook_FleeFix() {
@@ -59,7 +60,7 @@ static void __declspec(naked) ai_try_attack_hook_FleeFix() {
 }
 
 static void __declspec(naked) combat_ai_hook_FleeFix() {
-	static const DWORD combat_ai_hook_flee_Ret = 0x42B22F;
+	static const DWORD combat_ai_hook_flee_Ret = 0x42B206;
 	__asm {
 		test byte ptr [ebp], 8; // 'ReTarget' flag (critter.combat_state)
 		jnz  reTarget;

sfall/Modules/DebugEditor.cpp

@@ -322,6 +322,11 @@ static void __declspec(naked) art_data_size_hook() {
 		push edx;
 		push artDbgMsg;
 		call fo::funcoffs::debug_printf_;
+		cmp  isDebug, 0;
+		jne  display;
+		add  esp, 8;
+		retn;
+display:
 		push edx; // filename
 		push artDbgMsg;
 		lea  eax, [esp + 0x124 - 0x124 + 20]; // buf
@@ -379,7 +384,7 @@ static void DebugModePatch() {
 		if (iniGetInt("Debugging", "HideObjIsNullMsg", 0, ::sfall::ddrawIni)) {
 			MakeJump(0x453FD2, dbg_error_hack);
 		}
-		// prints a debug message about missing art file for critters to both debug.log and the message window
+		// prints a debug message about missing art file for critters to both debug.log and the message window in sfall debugging mode
 		HookCall(0x419B65, art_data_size_hook);
 
 		// Fix to prevent crashes when there is a '%' character in the printed message

sfall/version.h

@@ -25,6 +25,6 @@
 #define VERSION_MAJOR 4
 #define VERSION_MINOR 2
 #define VERSION_BUILD 5
-#define VERSION_REV 0
+#define VERSION_REV 1
 
-#define VERSION_STRING "4.2.5"
+#define VERSION_STRING "4.2.5.1"