Fix SkirmishUnlimitedColors always being in effect if Ares is not active

Author: Starkku

Phobos.vcxproj

@@ -189,7 +189,6 @@
     <ClCompile Include="src\Misc\Hooks.LaserDraw.cpp" />
     <ClCompile Include="src\Misc\Hooks.Timers.cpp" />
     <ClCompile Include="src\Misc\Hooks.INIInheritance.cpp" />
-    <ClCompile Include="src\Misc\Hooks.SkirmishColors.cpp" />
     <ClCompile Include="src\Misc\Hooks.Overlay.cpp" />
     <ClCompile Include="src\Misc\Hooks.Message.cpp" />
     <ClCompile Include="src\New\Type\Affiliated\TypeConvertGroup.cpp" />

src/Misc/Hooks.SkirmishColors.cpp

@@ -400,3 +400,31 @@ DEFINE_FUNCTION_JUMP(CALL, 0x63B100, Fake_HouseIsAlliedWith);
 DEFINE_FUNCTION_JUMP(CALL, 0x63B17F, Fake_HouseIsAlliedWith);
 DEFINE_FUNCTION_JUMP(CALL, 0x63B1BA, Fake_HouseIsAlliedWith);
 DEFINE_FUNCTION_JUMP(CALL, 0x63B2CE, Fake_HouseIsAlliedWith);
+
+DEFINE_HOOK(0x69A317, SessionClass_PlayerColorIndexToColorSchemeIndex, 0x0)
+{
+	GET_STACK(int, index, 0x4);
+
+	bool isRandom = index == PlayerColorSlot::Random;
+
+	if (Phobos::Config::SkirmishUnlimitedColors)
+	{
+		// Allow player color indices to map directly to color scheme indices.
+		if (isRandom)
+			index = ColorScheme::FindIndex("LightGrey", 53);
+		else
+			index = index * 2 + 1;
+	}
+	else
+	{
+		// Vanilla behaviour.
+		if (isRandom)
+			index = ColorScheme::PlayerColorToColorSchemeLUT[PlayerColorSlot::White];
+		else
+			index = ColorScheme::PlayerColorToColorSchemeLUT[index];
+	}
+
+	R->EAX(index);
+
+	return 0x69A325;
+}