diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b292bfc06c21f5ef02d6bb155ae4ab5e4ee6533c..c61e181a5fd9680d3f2d77758917b1bc7bcf4cc9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -345,7 +345,7 @@ Debian stable:arm64:
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 ERRORMODE=1 NONX86=1C || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1 ARM64=1
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -419,6 +419,43 @@ Debian stable Clang:
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+Debian stable musl:
+ stage: build
+
+ allow_failure: true
+
+ artifacts:
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-musl"
+
+ variables:
+ CC: musl-gcc
+ LDD: musl-ldd
+
+ script:
+ - - |
+ # apt_toolchain
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ - apt-get install gcc
+ - |
+ # apt_toolchain
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+ - - |
+ # apt_development
+ echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+ - apt-get install musl-tools
+ - |
+ # apt_development
+ echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
+ - - |
+ # make
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 SDL=0 NOHW=1 NOZLIB=1 NOCURL=1 NOGME=1 NOOPENMPT=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 SDL=0 NOHW=1 NOZLIB=1 NOCURL=1 NOGME=1 NOOPENMPT=1
+ - |
+ # make
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
Debian testing Clang:
extends: Debian stable Clang
@@ -432,3 +469,16 @@ Debian testing Clang:
WFLAGS: -Wno-cast-align -Wno-deprecated-non-prototype
CFLAGS: -Wno-cast-align -Wno-deprecated-non-prototype
LDFLAGS: -Wl,-fuse-ld=gold
+
+Debian testing musl:
+ extends: Debian stable musl
+
+ image: debian:testing-slim
+
+ artifacts:
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-musl"
+
+ variables:
+ CC: musl-gcc
+ LDD: musl-ldd
+ LDFLAGS: -Wl,-fuse-ld=gold
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index dfb80e5021ff46bc68a638bff7e48df5145fc604..2d7c99861f952adea460aab8d04c9a90a678b39f 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -229,6 +229,8 @@ void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *col
// Clamp the light level, since it can sometimes go out of the 0-255 range from animations
light_level = min(max(light_level, 0), 255);
+ V_CubeApply(&tint_color.s.red, &tint_color.s.green, &tint_color.s.blue);
+ V_CubeApply(&fade_color.s.red, &fade_color.s.green, &fade_color.s.blue);
Surface->PolyColor.rgba = poly_color.rgba;
Surface->TintColor.rgba = tint_color.rgba;
Surface->FadeColor.rgba = fade_color.rgba;
diff --git a/src/netcode/d_netcmd.c b/src/netcode/d_netcmd.c
index 5afa955610a6aee452790fe0ca74b13fc7007d86..52df53b5a06cedd0f5be26cbe0b1a2ef2d0f4351 100644
--- a/src/netcode/d_netcmd.c
+++ b/src/netcode/d_netcmd.c
@@ -1241,7 +1241,7 @@ static void SetColorLocal(INT32 playernum, UINT16 color)
//
static void SendNameAndColor(void)
{
- char buf[MAXPLAYERNAME+6];
+ char buf[MAXPLAYERNAME+7];
char *p;
p = buf;
diff --git a/src/p_saveg.c b/src/p_saveg.c
index faecd13770b3d81b992017af51b4b663487aa50d..4aa2318fd2902d172c7a35a82a1c9d54dcf113ad 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -175,7 +175,7 @@ static void P_NetArchivePlayers(void)
WRITEUINT16(save_p, players[i].flashpal);
WRITEUINT16(save_p, players[i].flashcount);
- WRITEUINT8(save_p, players[i].skincolor);
+ WRITEUINT16(save_p, players[i].skincolor);
WRITEINT32(save_p, players[i].skin);
WRITEUINT32(save_p, players[i].availabilities);
WRITEUINT32(save_p, players[i].score);
@@ -404,7 +404,7 @@ static void P_NetUnArchivePlayers(void)
players[i].flashpal = READUINT16(save_p);
players[i].flashcount = READUINT16(save_p);
- players[i].skincolor = READUINT8(save_p);
+ players[i].skincolor = READUINT16(save_p);
players[i].skin = READINT32(save_p);
players[i].availabilities = READUINT32(save_p);
players[i].score = READUINT32(save_p);
diff --git a/src/v_video.c b/src/v_video.c
index 3f958b286cdfdcc275a23c5822605812d218c242..25da6af40bf69cee245d60817f79a655e4acf506 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -1336,32 +1336,33 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
// This is now a function since it's otherwise repeated 2 times and honestly looks retarded:
static UINT32 V_GetHWConsBackColor(void)
{
- UINT32 hwcolor;
+ UINT8 r, g, b;
switch (cons_backcolor.value)
{
- case 0: hwcolor = 0xffffff00; break; // White
- case 1: hwcolor = 0x80808000; break; // Black
- case 2: hwcolor = 0xdeb88700; break; // Sepia
- case 3: hwcolor = 0x40201000; break; // Brown
- case 4: hwcolor = 0xfa807200; break; // Pink
- case 5: hwcolor = 0xff69b400; break; // Raspberry
- case 6: hwcolor = 0xff000000; break; // Red
- case 7: hwcolor = 0xffd68300; break; // Creamsicle
- case 8: hwcolor = 0xff800000; break; // Orange
- case 9: hwcolor = 0xdaa52000; break; // Gold
- case 10: hwcolor = 0x80800000; break; // Yellow
- case 11: hwcolor = 0x00ff0000; break; // Emerald
- case 12: hwcolor = 0x00800000; break; // Green
- case 13: hwcolor = 0x4080ff00; break; // Cyan
- case 14: hwcolor = 0x4682b400; break; // Steel
- case 15: hwcolor = 0x1e90ff00; break; // Periwinkle
- case 16: hwcolor = 0x0000ff00; break; // Blue
- case 17: hwcolor = 0xff00ff00; break; // Purple
- case 18: hwcolor = 0xee82ee00; break; // Lavender
+ case 0: r = 0xff; g = 0xff; b = 0xff; break; // White
+ case 1: r = 0x80; g = 0x80; b = 0x80; break; // Black
+ case 2: r = 0xde; g = 0xb8; b = 0x87; break; // Sepia
+ case 3: r = 0x40; g = 0x20; b = 0x10; break; // Brown
+ case 4: r = 0xfa; g = 0x80; b = 0x72; break; // Pink
+ case 5: r = 0xff; g = 0x69; b = 0xb4; break; // Raspberry
+ case 6: r = 0xff; g = 0x00; b = 0x00; break; // Red
+ case 7: r = 0xff; g = 0xd6; b = 0x83; break; // Creamsicle
+ case 8: r = 0xff; g = 0x80; b = 0x00; break; // Orange
+ case 9: r = 0xda; g = 0xa5; b = 0x20; break; // Gold
+ case 10: r = 0x80; g = 0x80; b = 0x00; break; // Yellow
+ case 11: r = 0x00; g = 0xff; b = 0x00; break; // Emerald
+ case 12: r = 0x00; g = 0x80; b = 0x00; break; // Green
+ case 13: r = 0x40; g = 0x80; b = 0xff; break; // Cyan
+ case 14: r = 0x46; g = 0x82; b = 0xb4; break; // Steel
+ case 15: r = 0x1e; g = 0x90; b = 0xff; break; // Periwinkle
+ case 16: r = 0x00; g = 0x00; b = 0xff; break; // Blue
+ case 17: r = 0xff; g = 0x00; b = 0xff; break; // Purple
+ case 18: r = 0xee; g = 0x82; b = 0xee; break; // Lavender
// Default green
- default: hwcolor = 0x00800000; break;
+ default: r = 0x00; g = 0x80; b = 0x00; break;
}
- return hwcolor;
+ V_CubeApply(&r, &g, &b);
+ return (r << 24) | (g << 16) | (b << 8);
}
#endif