- Fix RGB defines

- Just store the colour and parse RGBA values when modifying.

port/src/main.c

@@ -166,7 +166,6 @@ PD_CONSTRUCTOR static void gameConfigInit(void)
 		configRegisterFloat(strFmt("Game.Player%d.CrosshairSway", i), &g_PlayerExtCfg[j].crosshairsway, 0.f, 10.f);
 		configRegisterInt(strFmt("Game.Player%d.CrouchMode", i), &g_PlayerExtCfg[j].crouchmode, 0, CROUCHMODE_TOGGLE_ANALOG);
 		configRegisterInt(strFmt("Game.Player%d.ExtendedControls", i), &g_PlayerExtCfg[j].extcontrols, 0, 1);
-		configRegisterInt(strFmt("Game.Player%d.CrosshairAlpha", i), &g_PlayerExtCfg[j].crosshairalpha, 0, 255);
-
+		configRegisterInt(strFmt("Game.Player%d.CrosshairColour", i), &g_PlayerExtCfg[j].crosshaircolour, 0, 0xFFFFFFFF);
 	}
 }

port/src/optionsmenu.c

@@ -903,9 +903,10 @@ static MenuItemHandlerResult menuhandlerCrosshairSway(s32 operation, struct menu
 	return 0;
 }
 
-#define SIGHT_COLOUR_R 0;
-#define SIGHT_COLOUR_G 255;
-#define SIGHT_COLOUR_B 0;
+// Stock sight RGB.
+#define SIGHT_COLOUR_R 0
+#define SIGHT_COLOUR_G 255
+#define SIGHT_COLOUR_B 0
 
 static u32 RGBAToINT(u32 r, u32 g, u32 b, u32 a)
 {
@@ -916,12 +917,11 @@ static MenuItemHandlerResult menuhandlerCrosshairAlpha(s32 operation, struct men
 {
 	switch (operation) {
 	case MENUOP_GETSLIDER:
-		data->slider.value = g_PlayerExtCfg[g_ExtMenuPlayer].crosshairalpha;
+		data->slider.value = g_PlayerExtCfg[g_ExtMenuPlayer].crosshaircolour & 0xFF;
 		break;
 	case MENUOP_SET:
-		g_PlayerExtCfg[g_ExtMenuPlayer].crosshairalpha = data->slider.value;
 		
-		g_PlayerExtCfg[g_ExtMenuPlayer].crosshaircolour = RGBAToINT(SIGHT_COLOUR_R, SIGHT_COLOUR_G, SIGHT_COLOUR_B, g_PlayerExtCfg[g_ExtMenuPlayer].crosshairalpha);
+		g_PlayerExtCfg[g_ExtMenuPlayer].crosshaircolour = RGBAToINT(SIGHT_COLOUR_R, SIGHT_COLOUR_G, SIGHT_COLOUR_B, data->slider.value);
 		
 		break;
 	}

src/game/mplayer/mplayer.c

@@ -121,7 +121,6 @@ struct mpweapon g_MpWeapons[NUM_MPWEAPONS] = {
 	.radialmenuspeed = 4.f, \
 	.crosshairsway = 1.f, \
 	.crouchmode = CROUCHMODE_TOGGLE_ANALOG, \
-	.crosshairalpha = 40, \
 	.crosshaircolour = 0x00ff0028, \
 }
 

src/include/types.h

@@ -6139,7 +6139,6 @@ struct extplayerconfig {
 	f32 radialmenuspeed;
 	f32 crosshairsway;
 	s32 extcontrols;
-	u32 crosshairalpha;
 	u32 crosshaircolour;
 };