From 6583a42a873e38081723a6179c302d99bfbbaa8c Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sun, 13 Dec 2020 00:56:11 +0100 Subject: [PATCH] Change magic numbers of BSP version checks to macro defines. --- src/client/cstrike/player.c | 2 +- src/client/entry.c | 2 +- src/client/sky.c | 2 +- src/client/valve/player.c | 2 +- src/gs-entbase/client/env_sound.cpp | 2 +- src/gs-entbase/client/env_sun.cpp | 2 +- src/gs-entbase/server/func_breakable.cpp | 2 +- src/gs-entbase/server/infodecal.cpp | 2 +- src/gs-entbase/shared/decals.cpp | 6 +++--- src/server/entry.c | 2 +- src/server/footsteps.c | 8 ++++---- src/shared/valve/fx_blood.c | 2 +- src/shared/valve/fx_gibhuman.c | 2 +- src/shared/valve/fx_impact.c | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/client/cstrike/player.c b/src/client/cstrike/player.c index ad6013dc..903447ce 100644 --- a/src/client/cstrike/player.c +++ b/src/client/cstrike/player.c @@ -33,7 +33,7 @@ Player_PreDraw(base_player pl, int thirdperson) makevectors(ang); traceline(src, src + (v_forward * 8096), MOVE_NORMAL, pl); - if (serverkeyfloat("*bspversion") == 30) { + if (serverkeyfloat("*bspversion") == BSPVER_HL) { dynamiclight_add(trace_endpos + (v_forward * -2), 128, [1,1,1]); } else { float p = dynamiclight_add(src, 512, [1,1,1], 0, "textures/flashlight"); diff --git a/src/client/entry.c b/src/client/entry.c index da0bfe33..8df70fbe 100644 --- a/src/client/entry.c +++ b/src/client/entry.c @@ -904,7 +904,7 @@ void CSQC_WorldLoaded(void) { /* Primarily for the flashlight */ - if (serverkeyfloat("*bspversion") != 30) { + if (serverkeyfloat("*bspversion") != BSPVER_HL) { localcmd("r_shadow_realtime_dlight 1\n"); } else { localcmd("r_shadow_realtime_dlight 0\n"); diff --git a/src/client/sky.c b/src/client/sky.c index f6c128a7..ff92eb5f 100644 --- a/src/client/sky.c +++ b/src/client/sky.c @@ -17,7 +17,7 @@ void Sky_Update(void) { - if (serverkeyfloat("*bspversion") != 30) { + if (serverkeyfloat("*bspversion") != BSPVER_HL) { return; } localcmd(sprintf("sky %s\n", g_strSkyName)); diff --git a/src/client/valve/player.c b/src/client/valve/player.c index 43dc25ca..e970f1c4 100644 --- a/src/client/valve/player.c +++ b/src/client/valve/player.c @@ -33,7 +33,7 @@ Player_PreDraw(base_player pl, int thirdperson) makevectors(ang); traceline(src, src + (v_forward * 8096), MOVE_NORMAL, pl); - if (serverkeyfloat("*bspversion") == 30) { + if (serverkeyfloat("*bspversion") == BSPVER_HL) { dynamiclight_add(trace_endpos + (v_forward * -2), 128, [1,1,1]); } else { float p = dynamiclight_add(src, 512, [1,1,1], 0, "textures/flashlight"); diff --git a/src/gs-entbase/client/env_sound.cpp b/src/gs-entbase/client/env_sound.cpp index 346da947..5f0f9c74 100644 --- a/src/gs-entbase/client/env_sound.cpp +++ b/src/gs-entbase/client/env_sound.cpp @@ -170,7 +170,7 @@ env_sound::env_sound(void) setorigin(this, origin); /* Valve BSP, convert their env_sound */ - if (serverkeyfloat("*bspversion") != 30) { + if (serverkeyfloat("*bspversion") != BSPVER_HL) { return; } diff --git a/src/gs-entbase/client/env_sun.cpp b/src/gs-entbase/client/env_sun.cpp index 619e1503..b2877abd 100644 --- a/src/gs-entbase/client/env_sun.cpp +++ b/src/gs-entbase/client/env_sun.cpp @@ -33,7 +33,7 @@ This entity was introduced in Half-Life 2 (2004). int Util_IsSky(vector pos) { - if (serverkeyfloat("*bspversion") == 30) + if (serverkeyfloat("*bspversion") == BSPVER_HL) if (getsurfacetexture(world, getsurfacenearpoint(world, pos)) == "sky") { return TRUE; } diff --git a/src/gs-entbase/server/func_breakable.cpp b/src/gs-entbase/server/func_breakable.cpp index a7324d51..ab93c58f 100755 --- a/src/gs-entbase/server/func_breakable.cpp +++ b/src/gs-entbase/server/func_breakable.cpp @@ -131,7 +131,7 @@ func_breakable::Pain(void) if (spawnflags & SF_TRIGGER) { return; } - if (serverkeyfloat("*bspversion") != 30) { + if (serverkeyfloat("*bspversion") != BSPVER_HL) { return; } diff --git a/src/gs-entbase/server/infodecal.cpp b/src/gs-entbase/server/infodecal.cpp index ba774292..06caa818 100644 --- a/src/gs-entbase/server/infodecal.cpp +++ b/src/gs-entbase/server/infodecal.cpp @@ -95,7 +95,7 @@ infodecal::SpawnKey(string strKey, string strValue) void infodecal::infodecal(void) { - if (serverkeyfloat("*bspversion") != 30) { + if (serverkeyfloat("*bspversion") != BSPVER_HL) { remove(self); return; } diff --git a/src/gs-entbase/shared/decals.cpp b/src/gs-entbase/shared/decals.cpp index 3d438a0b..1ff6fc79 100644 --- a/src/gs-entbase/shared/decals.cpp +++ b/src/gs-entbase/shared/decals.cpp @@ -62,7 +62,7 @@ decal::ReceiveEntity(void) size = drawgetimagesize(m_strTexture); - if (serverkeyfloat("*bspversion") == 30) { + if (serverkeyfloat("*bspversion") == BSPVER_HL) { BuildShader(); } @@ -158,7 +158,7 @@ decal::Place(vector org, string dname) #else size = drawgetimagesize(m_strTexture); - if (serverkeyfloat("*bspversion") == 30) { + if (serverkeyfloat("*bspversion") == BSPVER_HL) { BuildShader(); } @@ -222,7 +222,7 @@ decal Decals_Next(vector pos) /* Generalized Decal Placing Function */ void Decals_Place(vector pos, string dname) { - if (serverkeyfloat("*bspversion") != 30) { + if (serverkeyfloat("*bspversion") != BSPVER_HL) { return; } diff --git a/src/server/entry.c b/src/server/entry.c index 629085c8..0128702d 100644 --- a/src/server/entry.c +++ b/src/server/entry.c @@ -153,7 +153,7 @@ void initents(void) /* sound shader init */ Sound_Init(); - if (serverkeyfloat("*bspversion") != 30) { + if (serverkeyfloat("*bspversion") == BSPVER_HL) { /* load materials.txt because someone thought this was the best idea */ filestream fileMaterial = fopen("sound/materials.txt", FILE_READ); hashMaterials = __NULL__; diff --git a/src/server/footsteps.c b/src/server/footsteps.c index 31f35384..69d5e0c6 100755 --- a/src/server/footsteps.c +++ b/src/server/footsteps.c @@ -267,12 +267,12 @@ Footsteps_Update(void) pl.step_time = time + 0.35; switch (serverkeyfloat("*bspversion")) { - case 30: /* HL */ + case BSPVER_HL: Footsteps_HLBSP(pl); break; - case 46: /* Q3 */ - case 47: /* RtCW */ - case 1: /* RFVBSP */ + case BSPVER_Q3: /* Q3 */ + case BSPVER_RTCW: /* RtCW */ + case BSPVER_RBSP: /* RFVBSP */ Footsteps_VVBSP(pl); break; default: diff --git a/src/shared/valve/fx_blood.c b/src/shared/valve/fx_blood.c index 2a8acadf..fe0a1496 100644 --- a/src/shared/valve/fx_blood.c +++ b/src/shared/valve/fx_blood.c @@ -45,7 +45,7 @@ FX_Blood(vector pos, vector color) #else static void Blood_Touch(void) { - if (serverkeyfloat("*bspversion") == 30) + if (serverkeyfloat("*bspversion") == BSPVER_HL) Decals_Place(self.origin, sprintf("{blood%d", floor(random(1,9)))); else { decal_pickwall(self, self.origin); diff --git a/src/shared/valve/fx_gibhuman.c b/src/shared/valve/fx_gibhuman.c index 361dd3bc..25bd9198 100644 --- a/src/shared/valve/fx_gibhuman.c +++ b/src/shared/valve/fx_gibhuman.c @@ -52,7 +52,7 @@ FX_GibHuman(vector pos) } static void Gib_Touch(void) { - if (serverkeyfloat("*bspversion") == 30) + if (serverkeyfloat("*bspversion") == BSPVER_HL) Decals_Place(self.origin, sprintf("{blood%d", floor(random(1,9)))); else { decal_pickwall(self, self.origin); diff --git a/src/shared/valve/fx_impact.c b/src/shared/valve/fx_impact.c index bd0e5258..dc5a1353 100644 --- a/src/shared/valve/fx_impact.c +++ b/src/shared/valve/fx_impact.c @@ -88,7 +88,7 @@ FX_Impact(int iType, vector vecPos, vector vNormal) multicast(vecPos, MULTICAST_PVS); #else /* decals */ - if (serverkeyfloat("*bspversion") == 30) + if (serverkeyfloat("*bspversion") == BSPVER_HL) switch (iType) { case IMPACT_GLASS: Decals_Place(vecPos, sprintf("{break%d", floor(random(1,4))));