Added a new value to the 'mark_state' arg of mark_area_known function

* 3 - uncovers locations without highlighting their sub-tiles.
(Fallout 1 behavior)

sfall/Modules/BugFixes.cpp

@@ -4,6 +4,7 @@
 #include "Drugs.h"
 #include "LoadGameHook.h"
 #include "ScriptExtender.h"
+#include "Worldmap.h"
 
 #include "BugFixes.h"
 
@@ -2269,27 +2270,30 @@ static void __declspec(naked) action_climb_ladder_hack() {
 	}
 }
 
-//static const DWORD wmAreaMarkVisitedState_Error = 0x4C4698;
-static const DWORD wmAreaMarkVisitedState_Ret = 0x4C46A2;
 static void __declspec(naked) wmAreaMarkVisitedState_hack() {
+	static const DWORD wmAreaMarkVisitedState_Ret = 0x4C46A2;
+	//static const DWORD wmAreaMarkVisitedState_Error = 0x4C4698;
+	static long isNoRadius;
+
+	isNoRadius = Worldmap::AreaMarkStateIsNoRadius(); // F1 behavior radius
 	__asm {
 		mov  [ecx + 0x40], esi; // wmAreaInfoList.visited
 		test esi, esi;          // mark "unknown" state
-		jz   skip;
+		jz   noRadius;
 		mov  eax, [ecx + 0x2C]; // wmAreaInfoList.world_posx
 		mov  edx, [ecx + 0x30]; // wmAreaInfoList.world_posy
 		// fix loc coordinates
 		cmp  [ecx + 0x34], 1; // wmAreaInfoList.size
 		jg   largeLoc;
 		je   mediumLoc;
 //smallLoc:
-		sub eax, 5;
-		lea edx, [edx - 5];
+		sub  eax, 5;
+		lea  edx, [edx - 5];
 mediumLoc:
-		sub eax, 10;
-		lea edx, [edx - 10];
+		sub  eax, 10;
+		lea  edx, [edx - 10];
 largeLoc:
-		mov  ebx, esp; // ppSubTile out
+		lea  ebx, [esp]; // ppSubTile out
 		push edx;
 		push eax;
 		call fo::funcoffs::wmFindCurSubTileFromPos_;
@@ -2298,19 +2302,23 @@ static void __declspec(naked) wmAreaMarkVisitedState_hack() {
 		pop  eax;
 		pop  edx;
 		mov  ebx, [esp];
-		mov  ebx, [ebx + 0x18]; // sub-tile state
+		mov  ebx, [ebx + 0x18]; // sub-tile state: 0 - black, 1 - uncovered, 2 - visited
 		test ebx, ebx;
 		jnz  skip;
-		inc  ebx; // 1
+		inc  ebx; // set 1
 skip:
-		cmp  [ecx + 0x38], 1;   // wmAreaInfoList.start_state
-		jne  hideLoc;
-		cmp  esi, 2; // mark visited state
-		jne  fix;
+		///////// check F1 behavior radius result /////////
+		cmp isNoRadius, 1;
+		je  noRadius;
+		///////////////////////////////////////////////////
+		cmp  [ecx + 0x38], 1; // wmAreaInfoList.start_state
+		jne  noRadius;        // hidden location
+		cmp  esi, 2;          // mark visited state
+		jne  fixRadius;
 		call fo::funcoffs::wmMarkSubTileRadiusVisited_;
-hideLoc:
+noRadius:
 		jmp  wmAreaMarkVisitedState_Ret;
-fix:
+fixRadius:
 		push ebx;
 		mov  ebx, 1; // radius (fix w/o PERK_scout)
 		call fo::funcoffs::wmSubTileMarkRadiusVisited_;
@@ -2359,8 +2367,8 @@ static void __declspec(naked) wmTownMapFunc_hack() {
 	}
 }
 
-static const DWORD combat_should_end_break = 0x422D00;
 static void __declspec(naked) combat_should_end_hack() {
+	static const DWORD combat_should_end_break = 0x422D00;
 	__asm { // ecx = dude.team_num
 		cmp  ecx, [ebp + 0x50]; // npc who_hit_me.team_num
 		je   break;
@@ -2596,8 +2604,8 @@ static void __declspec(naked) combat_ai_hook() {
 	}
 }
 
-static const DWORD wmSubTileMarkRadiusVisited_Ret = 0x4C3730;
 static void __declspec(naked) wmSubTileMarkRadiusVisited_hack() {
+	static const DWORD wmSubTileMarkRadiusVisited_Ret = 0x4C3730;
 	__asm {
 		call fo::funcoffs::wmMarkSubTileOffsetVisitedFunc_;
 		cmp  ebp, 7; // count of horizontal sub-tiles

sfall/Modules/Worldmap.cpp

@@ -319,6 +319,20 @@ static void __declspec(naked) wmRndEncounterOccurred_hook() {
 	}
 }
 
+// Fallout 1 behavior: No radius for uncovered locations on the world map
+// for the mark_area_known script function when the mark_state argument of the function is set to 3
+long __declspec(naked) Worldmap::AreaMarkStateIsNoRadius() {
+	__asm {
+		xor  eax, eax;
+		cmp  esi, 3; // esi - mark_state value
+		jne  skip;
+		mov  esi, 1; // revert value to town known state
+skip:
+		cmove eax, esi; // eax: 1 for Fallout 1 behavior
+		retn;
+	}
+}
+
 static void RestRestore() {
 	if (!restMode) return;
 	restMode = false;

sfall/Modules/Worldmap.h

@@ -50,6 +50,8 @@ class Worldmap : public Module {
 	static bool AreaTitlesIsEmpty();
 	static const char* GetCustomAreaTitle(long areaId);
 	static void SetCustomAreaTitle(long areaId, const char* msg);
+
+	static long AreaMarkStateIsNoRadius();
 };
 
 void _stdcall SetMapMulti(float value);