diff --git a/port/src/main.c b/port/src/main.c index fbad0859c..3b53d781c 100644 --- a/port/src/main.c +++ b/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); } } diff --git a/port/src/optionsmenu.c b/port/src/optionsmenu.c index 24f353383..34a28e74b 100644 --- a/port/src/optionsmenu.c +++ b/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; } diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index 5dd2584ce..825d62a33 100644 --- a/src/game/mplayer/mplayer.c +++ b/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, \ } diff --git a/src/include/types.h b/src/include/types.h index 4737f178b..81b71ca6d 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -6139,7 +6139,6 @@ struct extplayerconfig { f32 radialmenuspeed; f32 crosshairsway; s32 extcontrols; - u32 crosshairalpha; u32 crosshaircolour; };