From 90b9187563ae4d6bf789837fc47c099efc79e90b Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Mon, 2 Feb 2026 03:04:22 +0100 Subject: [PATCH] Use BR_COLOUR_RGB in gRGB_colours --- src/DETHRACE/common/crush.c | 2 +- src/DETHRACE/common/graphics.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/DETHRACE/common/crush.c b/src/DETHRACE/common/crush.c index 844cbd35..b43c912f 100644 --- a/src/DETHRACE/common/crush.c +++ b/src/DETHRACE/common/crush.c @@ -1176,7 +1176,7 @@ int DoCrashEarnings(tCar_spec* pCar1, tCar_spec* pCar2) { victim->pre_car_col_knackered = 1; credits_squared = sqr(0.7f / victim->car_model_actors[victim->principal_car_actor].crush_data.softness_factor) * gWasted_creds[gProgram_state.skill_level] + 50.0f; credits = 100 * (int)(credits_squared / 100.0f); - if (gNet_mode) { + if (gNet_mode != eNet_mode_none) { message = NetBuildMessage(NETMSGID_WASTED, 0); message->contents.data.wasted.victim = NetPlayerFromCar(victim)->ID; if (NetPlayerFromCar(culprit)) { diff --git a/src/DETHRACE/common/graphics.c b/src/DETHRACE/common/graphics.c index 907dc2fa..440ffe4b 100644 --- a/src/DETHRACE/common/graphics.c +++ b/src/DETHRACE/common/graphics.c @@ -168,15 +168,15 @@ char* gFont_names[21] = { // GLOBAL: CARM95 0x005201a0 br_colour gRGB_colours[9] = { - 0u, - 16777215u, - 16711680u, - 65280u, - 255u, - 16776960u, - 65535u, - 16711935u, - 13649666u + BR_COLOUR_RGB(0x00 ,0x00, 0x00), + BR_COLOUR_RGB(0xff, 0xff, 0xff), + BR_COLOUR_RGB(0xff, 0x00, 0x00), + BR_COLOUR_RGB(0x00, 0xff, 0x00), + BR_COLOUR_RGB(0x00, 0x00, 0xff), + BR_COLOUR_RGB(0xff, 0xff, 0x00), + BR_COLOUR_RGB(0x00, 0xff, 0xff), + BR_COLOUR_RGB(0xff, 0x00, 0xff), + BR_COLOUR_RGB(0xd0, 0x47, 0x02) }; // GLOBAL: CARM95 0x005201c8