From 6460c8af733c1ba92af44c5546e12528470f1959 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Sun, 9 Feb 2025 01:36:04 -0800 Subject: [PATCH] rules/counterstrike: move precaches into their dedicated callback --- img/tr.png | Bin 0 -> 5365 bytes src/rules/counterstrike.qc | 17 ++++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 img/tr.png diff --git a/img/tr.png b/img/tr.png new file mode 100644 index 0000000000000000000000000000000000000000..1f56e4ad7c3e6dcc6c028688ce38420fc7dd3e64 GIT binary patch literal 5365 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 RS+Pd}KuuX&sYbyz@_(p&F!=xg literal 0 HcmV?d00001 diff --git a/src/rules/counterstrike.qc b/src/rules/counterstrike.qc index 77fd490..edaf580 100644 --- a/src/rules/counterstrike.qc +++ b/src/rules/counterstrike.qc @@ -737,6 +737,14 @@ CS_PlayerRemovedFromGame(entity targetPlayer) Round_CheckUponDeath(targetPlayer); } +void +CodeCallback_Precache(void) +{ + precache.Entity("player_vip"); + precache.Entity("player_terrorist"); + precache.Entity("player_counterterrorist"); +} + /* Callbacks, functions that are called from Nuclide */ void CodeCallback_StartGameType(void) @@ -744,11 +752,6 @@ CodeCallback_StartGameType(void) string spawnCT; string spawnT; - /* players can buy these any time. so they should be precached for speed. */ - precache.Entity("player_vip"); - precache.Entity("player_terrorist"); - precache.Entity("player_counterterrorist"); - spawnCT = entityDef.GetString("player_counterterrorist", "spawnpoint"); spawnT = entityDef.GetString("player_terrorist", "spawnpoint"); @@ -756,9 +759,9 @@ CodeCallback_StartGameType(void) motd.LoadDefault(); /* the only teams CS will ever need... ? */ - teams.SetUp(TEAM_T, "Terrorist", [153, 204, 255], true); + teams.SetUp(TEAM_T, "Terrorist", [255, 63, 63], true); teams.SetSpawnPoint(TEAM_T, spawnT); - teams.SetUp(TEAM_CT, "Counter-Terrorist", [255, 63, 63], true); + teams.SetUp(TEAM_CT, "Counter-Terrorist", [153, 204, 255], true); teams.SetSpawnPoint(TEAM_CT, spawnCT); /* evaluate our world */