Removed highlight color customization settings for items.

Reverted highlight color for mouseovering items on the ground back to yellow as in vanilla (was changed to purple by Crafty)
Prepare to remove highlight color customization for containers as well. Reason: very limited color selection, no point in adding separated settings for it.

artifacts/ddraw.ini

@@ -133,10 +133,15 @@ ToggleItemHighlightsKey=42
 ;Set to 1 to also highlight containers as well as items
 HighlightContainers=0
 
-;Change the highlight colors - NR: should reduce to only items and containers.
-HighlightColorItems=0x10
-HighlightColorMouseOver=0x10
-HighlightColorContainers=0x4
+;Changes the highlight color for containers - NR: may ditch this later.
+;0x01 - animated red (same as hostile critters in combat)
+;0x02 - red
+;0x04 - light gray
+;0x08 - animated green (same as friendly critters in combat)
+;0x10 - yellow (same as vanilla mouse over for items on the ground)
+;0x20 - yellow (same as out-of-LOS critters in combat)
+;0x40 & all other numbers - purple (placeholder for 'out of range' numbers?)
+HighlightContainersColor=0x4
 
 ;A key to press to reload your currently equipped weapon
 ReloadWeaponKey=0

sfall/ScriptExtender.cpp

@@ -123,9 +123,7 @@ static DWORD highlightingToggled=0;
 static DWORD MotionSensorMode;
 static BYTE toggleHighlightsKey;
 static DWORD HighlightContainers = 0;
-static DWORD Color_Items = 0x10; // yellow
-static DWORD Color_MouseOver = 0x10; // yellow
-static DWORD Color_Containers = 0x4; // light gray
+static DWORD Color_Containers = 0;
 static int idle;
 static char HighlightFail1[128];
 static char HighlightFail2[128];
@@ -889,12 +887,12 @@ loopObject:
 		jnz  nextObject                           // Yes
 		test dword ptr [ecx+0x74], eax            // Already outlined?
 		jnz  nextObject                           // Yes
-		mov  edx, Color_Items                     // yellow
+		mov  edx, 0x10                            // yellow
 		test byte ptr [ecx+0x25], dl              // NoHighlight_ flag is set (is this a container)?
 		jz   NoHighlight                          // No
 		cmp  HighlightContainers, eax             // Highlight containers?
 		je   nextObject                           // No
-		mov  edx, Color_Containers                // light gray
+		mov  edx, Color_Containers                // NR: should be set to yellow or purple later
 NoHighlight:
 		mov  [ecx+0x74], edx
 nextObject:
@@ -938,7 +936,7 @@ end:
 	}
 }
 
-static void __declspec(naked) gmouse_bk_process_hook() {
+/*static void __declspec(naked) gmouse_bk_process_hook() {  // NR: for changing mouse over highlight color. do we really need such fancy stuff?
 	__asm {
 		test eax, eax
 		jz   end
@@ -946,10 +944,10 @@ static void __declspec(naked) gmouse_bk_process_hook() {
 		jnz  end
 		mov  dword ptr [eax+0x74], 0
 end:
-		mov  edx, Color_MouseOver
+		mov  edx, 0x40
 		jmp  obj_outline_object_
 	}
-}
+}*/
 
 static void __declspec(naked) obj_remove_outline_hook() {
 	__asm {
@@ -972,14 +970,10 @@ void ScriptExtenderSetup() {
 	const bool AllowUnsafeScripting=false;
 #endif
 	toggleHighlightsKey = GetPrivateProfileIntA("Input", "ToggleItemHighlightsKey", 0, ini);
-
-	Color_Items = GetPrivateProfileIntA("Input", "HighlightColorItems", 0x10, ini);
-	Color_MouseOver = GetPrivateProfileIntA("Input", "HighlightColorMouseOver", 0x10, ini);
-	Color_Containers = GetPrivateProfileIntA("Input", "HighlightColorContainers", 0x4, ini);
-
+	Color_Containers = GetPrivateProfileIntA("Input", "HighlightContainersColor", 0x4, ini);
 	if (toggleHighlightsKey) {
 		MotionSensorMode = GetPrivateProfileIntA("Misc", "MotionScannerFlags", 1, ini);
-		HookCall(0x44B9BA, &gmouse_bk_process_hook);
+		//HookCall(0x44B9BA, &gmouse_bk_process_hook);
 		HookCall(0x44BD1C, &obj_remove_outline_hook);
 		HookCall(0x44E559, &obj_remove_outline_hook);
 		HighlightContainers = GetPrivateProfileIntA("Input", "HighlightContainers", 0, ini);

sfall/version.h

@@ -23,7 +23,7 @@
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 6
 #define VERSION_BUILD 999
-#define VERSION_REV 5
+#define VERSION_REV 6
 #ifdef WIN2K
 #define VERSION_STRING "3.7 pre win2k"
 #else