Defines per Sal request

This commit is contained in:
toaster 2022-01-04 23:02:09 +00:00
parent a749160c6b
commit 60f08f2380
3 changed files with 6 additions and 4 deletions

View file

@ -776,10 +776,10 @@ void D_RegisterClientCommands(void)
Followercolor_cons_t[i].strvalue = skincolors[i-2].name;
}
Followercolor_cons_t[1].value = UINT16_MAX;
Followercolor_cons_t[1].value = FOLLOWERCOLOR_MATCH;
Followercolor_cons_t[1].strvalue = "Match"; // Add "Match" option, which will make the follower color match the player's
Followercolor_cons_t[0].value = UINT16_MAX-1;
Followercolor_cons_t[0].value = FOLLOWERCOLOR_OPPOSITE;
Followercolor_cons_t[0].strvalue = "Opposite"; // Add "Opposite" option, ...which is like "Match", but for coloropposite.
Color_cons_t[MAXSKINCOLORS].value = Followercolor_cons_t[MAXSKINCOLORS+2].value = 0;

View file

@ -3968,10 +3968,10 @@ static void P_HandleFollower(player_t *player)
// Set follower colour
switch (player->followercolor)
{
case UINT16_MAX: // "Match"
case FOLLOWERCOLOR_MATCH: // "Match"
color = player->skincolor;
break;
case UINT16_MAX-1: // "Opposite"
case FOLLOWERCOLOR_OPPOSITE: // "Opposite"
color = skincolors[player->skincolor].invcolor;
break;
default:

View file

@ -41,6 +41,8 @@ extern INT16 *hicolormaps; // remap high colors to high colors..
extern CV_PossibleValue_t Color_cons_t[];
extern CV_PossibleValue_t Followercolor_cons_t[]; // follower colours table, not a duplicate because of the "Match" option.
#define FOLLOWERCOLOR_MATCH UINT16_MAX
#define FOLLOWERCOLOR_OPPOSITE (UINT16_MAX-1)
// I/O, setting up the stuff.
void R_InitTextureData(void);