From a2a3d8fd8d3e04e15db4b8330718c432eef4ed7a Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Tue, 14 Jan 2025 03:32:08 -0800 Subject: [PATCH] Uninclude fx_blood.qc and fix compat. --- src/client/game_event.qc | 14 -------------- src/client/init.qc | 1 - src/rules/counterstrike.qc | 6 +++--- src/shared/include.src | 1 - src/shared/player.h | 2 +- 5 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/client/game_event.qc b/src/client/game_event.qc index ac516cb..c047095 100644 --- a/src/client/game_event.qc +++ b/src/client/game_event.qc @@ -21,20 +21,6 @@ switch (fHeader) { case EV_OBITUARY: Obituary_Parse(); break; - case EV_BLOOD: - vector vBloodPos; - vector vBloodColor; - - vBloodPos[0] = readcoord(); - vBloodPos[1] = readcoord(); - vBloodPos[2] = readcoord(); - - vBloodColor[0] = readbyte() / 255; - vBloodColor[1] = readbyte() / 255; - vBloodColor[2] = readbyte() / 255; - - FX_Blood(vBloodPos, vBloodColor); - break; case EV_SMOKE: vector vSmokePos; vSmokePos[0] = readcoord(); diff --git a/src/client/init.qc b/src/client/init.qc index ec1038d..0b6f241 100644 --- a/src/client/init.qc +++ b/src/client/init.qc @@ -107,7 +107,6 @@ ClientGame_RendererRestart(string rstr) Obituary_Precache(); Damage_Precache(); - FX_Blood_Init(); FX_Smokenade_Init(); HLSprite_Init(); diff --git a/src/rules/counterstrike.qc b/src/rules/counterstrike.qc index 7abe00d..d8cf8bb 100644 --- a/src/rules/counterstrike.qc +++ b/src/rules/counterstrike.qc @@ -745,9 +745,9 @@ CodeCallback_StartGameType(void) string spawnT; /* players can buy these any time. so they should be precached for speed. */ - ents.Precache("player_vip"); - ents.Precache("player_terrorist"); - ents.Precache("player_counterterrorist"); + precache.Entity("player_vip"); + precache.Entity("player_terrorist"); + precache.Entity("player_counterterrorist"); spawnCT = entityDef.GetString("player_counterterrorist", "spawnpoint"); spawnT = entityDef.GetString("player_terrorist", "spawnpoint"); diff --git a/src/shared/include.src b/src/shared/include.src index 0dc5e6d..c31d7a8 100644 --- a/src/shared/include.src +++ b/src/shared/include.src @@ -6,7 +6,6 @@ ../../../cstrike/src/shared/animations.h ../../../cstrike/src/shared/animations.qc ../../../cstrike/src/shared/item_c4bomb.h -../../../valve/src/shared/fx_blood.qc ../../../cstrike/src/shared/fx_flashbang.qc ../../../cstrike/src/shared/fx_smokenade.qc ../../../cstrike/src/shared/item_c4bomb.qc diff --git a/src/shared/player.h b/src/shared/player.h index 66d4219..31dbb23 100644 --- a/src/shared/player.h +++ b/src/shared/player.h @@ -421,7 +421,7 @@ void CSPlayer::Bot_Roam(vector roamOrigin, int maxDistance) { randLoc.y += cos(radian) * distance; /* Go to the random waypoint. */ - RouteToPosition(Nodes_PositionOfClosestNode(randLoc)); + RouteToPosition(ncNavInfo::PositionOfClosestNode(randLoc)); } void