From b8720224ad94f498d889c8ba5f48167f07d56d32 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Thu, 20 May 2021 16:05:00 +0200 Subject: [PATCH] Support for .colormap on players. --- src/server/gamerules_multiplayer.qc | 1 + src/shared/player.qc | 2 +- src/shared/w_aicore.qc | 2 +- src/shared/w_beamgun.qc | 2 +- src/shared/w_chemicalgun.qc | 2 +- src/shared/w_dml.qc | 2 +- src/shared/w_fists.qc | 2 +- src/shared/w_gausspistol.qc | 2 +- src/shared/w_grenade.qc | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/server/gamerules_multiplayer.qc b/src/server/gamerules_multiplayer.qc index 406da12..6016625 100644 --- a/src/server/gamerules_multiplayer.qc +++ b/src/server/gamerules_multiplayer.qc @@ -55,6 +55,7 @@ HLMultiplayerRules::PlayerDeath(base_player pp) corpse.frame = ANIM_DIESIMPLE; corpse.angles = pl.angles; corpse.velocity = pl.velocity; + corpse.colormap = pl.colormap; } void diff --git a/src/shared/player.qc b/src/shared/player.qc index c5831dd..b06ed16 100644 --- a/src/shared/player.qc +++ b/src/shared/player.qc @@ -23,7 +23,7 @@ enumflags PLAYER_ORIGIN_Z, PLAYER_ANGLES_X, PLAYER_ANGLES_Y, - PLAYER_ANGLES_Z, + PLAYER_COLORMAP, PLAYER_VELOCITY, PLAYER_VELOCITY_Z, PLAYER_FLAGS, diff --git a/src/shared/w_aicore.qc b/src/shared/w_aicore.qc index cacb2fe..9130b24 100644 --- a/src/shared/w_aicore.qc +++ b/src/shared/w_aicore.qc @@ -122,7 +122,7 @@ w_aicore_precache(void) weapon_t w_aicore = { .name = "aicore", - .id = ITEM_AICORE, + .id = ITEM_AICORE, .slot = 0, .slot_pos = 1, .draw = w_aicore_draw, diff --git a/src/shared/w_beamgun.qc b/src/shared/w_beamgun.qc index 6cfba1e..1844a77 100644 --- a/src/shared/w_beamgun.qc +++ b/src/shared/w_beamgun.qc @@ -255,7 +255,7 @@ w_beamgun_precache(void) weapon_t w_beamgun = { .name = "beamgun", - .id = ITEM_BEAMGUN, + .id = ITEM_BEAMGUN, .slot = 3, .slot_pos = 0, .draw = w_beamgun_draw, diff --git a/src/shared/w_chemicalgun.qc b/src/shared/w_chemicalgun.qc index 9bd19d2..133a97c 100644 --- a/src/shared/w_chemicalgun.qc +++ b/src/shared/w_chemicalgun.qc @@ -357,7 +357,7 @@ w_chemicalgun_precache(void) weapon_t w_chemicalgun = { .name = "chemicalgun", - .id = ITEM_CHEMICALGUN, + .id = ITEM_CHEMICALGUN, .slot = 4, .slot_pos = 1, .draw = w_chemicalgun_draw, diff --git a/src/shared/w_dml.qc b/src/shared/w_dml.qc index 1cbb10f..5198ac5 100644 --- a/src/shared/w_dml.qc +++ b/src/shared/w_dml.qc @@ -377,7 +377,7 @@ w_dml_precache(void) weapon_t w_dml = { .name = "dml", - .id = ITEM_DML, + .id = ITEM_DML, .slot = 3, .slot_pos = 1, .draw = w_dml_draw, diff --git a/src/shared/w_fists.qc b/src/shared/w_fists.qc index 1b240f0..5f98d9c 100644 --- a/src/shared/w_fists.qc +++ b/src/shared/w_fists.qc @@ -266,7 +266,7 @@ w_fists_precache(void) weapon_t w_fists = { .name = "fists", - .id = ITEM_FISTS, + .id = ITEM_FISTS, .slot = 0, .slot_pos = 0, .draw = w_fists_draw, diff --git a/src/shared/w_gausspistol.qc b/src/shared/w_gausspistol.qc index 43ab9a7..f26ad0c 100644 --- a/src/shared/w_gausspistol.qc +++ b/src/shared/w_gausspistol.qc @@ -365,7 +365,7 @@ w_gausspistol_precache(void) weapon_t w_gausspistol = { .name = "gausspistol", - .id = ITEM_GAUSSPISTOL, + .id = ITEM_GAUSSPISTOL, .slot = 1, .slot_pos = 0, .draw = w_gausspistol_draw, diff --git a/src/shared/w_grenade.qc b/src/shared/w_grenade.qc index 7cf182f..b678c71 100644 --- a/src/shared/w_grenade.qc +++ b/src/shared/w_grenade.qc @@ -219,7 +219,7 @@ w_grenade_precache(void) weapon_t w_grenade = { .name = "grenade", - .id = ITEM_GRENADE, + .id = ITEM_GRENADE, .slot = 4, .slot_pos = 0, .draw = w_grenade_draw,