Skip to content
This repository has been archived by the owner on Jun 23, 2023. It is now read-only.

Fix color translation tables to not rely on player map arrow colors. #527

Merged
merged 2 commits into from
Sep 6, 2022
Merged

Fix color translation tables to not rely on player map arrow colors. #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00d5504
Fix color translation tables to not rely on player map arrow colors.
JadingTsunami Sep 5, 2022
7de4f5b
Change player arrow colors to match the original game.
JadingTsunami Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion prboom2/src/am_map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ int mapcolor_frnd; // friendly sprite color
int mapcolor_enemy; // enemy sprite color
int mapcolor_hair; // crosshair color
int mapcolor_sngl; // single player arrow color
int mapcolor_plyr[4] = { 112, 88, 64, 32 }; // colors for player arrows in multiplayer
int mapcolor_plyr[4] = { 112, 96, 64, 176 }; // colors for player arrows in multiplayer

//jff 3/9/98 add option to not show secret sectors until entered
int map_secret_after;
Expand Down
3 changes: 2 additions & 1 deletion prboom2/src/r_draw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,7 @@ void R_InitTranslationTables (void)
int i, j;
#define MAXTRANS 3
byte transtocolour[MAXTRANS];
byte player_colors[] = {0x70, 0x60, 0x40, 0x20};

// killough 5/2/98:
// Remove dependency of colormaps aligned on 256-byte boundary
Expand All @@ -714,7 +715,7 @@ void R_InitTranslationTables (void)
for (i=0; i<MAXTRANS; i++) transtocolour[i] = 255;

for (i=0; i<MAXPLAYERS; i++) {
byte wantcolour = mapcolor_plyr[i];
byte wantcolour = player_colors[i];
playernumtotrans[i] = 0;
if (wantcolour != 0x70) // Not green, would like translation
for (j=0; j<MAXTRANS; j++)
Expand Down