From 41ce469bb39003e8b35b48e5828c46a5b155f34c Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sun, 8 Mar 2020 11:53:57 +0100 Subject: [PATCH] Fix worldspawn 'skyname' key --- src/client/cstrike/progs.src | 2 +- src/client/entry.c | 1 + src/client/gearbox/progs.src | 2 +- src/client/hunger/progs.src | 2 +- src/client/poke646/progs.src | 3 ++- src/client/rewolf/progs.src | 2 +- src/client/scihunt/progs.src | 2 +- src/client/sky.c | 11 +---------- src/client/tfc/progs.src | 2 +- src/client/valve/progs.src | 2 +- 10 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/client/cstrike/progs.src b/src/client/cstrike/progs.src index 31dbac11..9d426f2e 100755 --- a/src/client/cstrike/progs.src +++ b/src/client/cstrike/progs.src @@ -58,7 +58,6 @@ defs.h ../../shared/valve/player.cpp ../../shared/pmove.c -../sky.c ../fade.c ../sprite.cpp ../titles.c @@ -72,6 +71,7 @@ defs.h ../../shared/spraylogo.cpp ../npc.c +../sky.c overview.c ../player.c ../predict.c diff --git a/src/client/entry.c b/src/client/entry.c index 7ad93e28..9a473f37 100644 --- a/src/client/entry.c +++ b/src/client/entry.c @@ -810,6 +810,7 @@ CSQC_WorldLoaded(void) return; } } + Sky_Update(); } void diff --git a/src/client/gearbox/progs.src b/src/client/gearbox/progs.src index 6cf07097..d03baedd 100644 --- a/src/client/gearbox/progs.src +++ b/src/client/gearbox/progs.src @@ -17,7 +17,6 @@ ../defs.h ../../vgui/include.src ../util.c -../sky.c ../fade.c ../sprite.cpp ../titles.c @@ -25,6 +24,7 @@ ../sentences.c ../../gs-entbase/client.src +../sky.c ../sound.c ../prints.c ../voice.c diff --git a/src/client/hunger/progs.src b/src/client/hunger/progs.src index 8e2ec6b5..80a603e8 100644 --- a/src/client/hunger/progs.src +++ b/src/client/hunger/progs.src @@ -17,7 +17,6 @@ ../defs.h ../../vgui/include.src ../util.c -../sky.c ../fade.c ../sprite.cpp ../titles.c @@ -25,6 +24,7 @@ ../sentences.c ../../gs-entbase/client.src +../sky.c ../sound.c ../prints.c ../voice.c diff --git a/src/client/poke646/progs.src b/src/client/poke646/progs.src index db55f406..449247aa 100644 --- a/src/client/poke646/progs.src +++ b/src/client/poke646/progs.src @@ -17,7 +17,6 @@ ../defs.h ../../vgui/include.src ../util.c -../sky.c ../fade.c ../sprite.cpp ../titles.c @@ -25,6 +24,8 @@ ../sentences.c ../../gs-entbase/client.src + +../sky.c ../sound.c ../prints.c ../voice.c diff --git a/src/client/rewolf/progs.src b/src/client/rewolf/progs.src index a683fa6c..2e0124ed 100755 --- a/src/client/rewolf/progs.src +++ b/src/client/rewolf/progs.src @@ -21,7 +21,6 @@ ../util.c init.c -../sky.c ../fade.c ../sprite.cpp ../titles.c @@ -32,6 +31,7 @@ init.c decore.cpp +../sky.c ../sound.c ../prints.c ../voice.c diff --git a/src/client/scihunt/progs.src b/src/client/scihunt/progs.src index 7f521d1e..0d3881e8 100644 --- a/src/client/scihunt/progs.src +++ b/src/client/scihunt/progs.src @@ -19,7 +19,6 @@ ../util.c -../sky.c ../fade.c ../sprite.cpp ../titles.c @@ -28,6 +27,7 @@ ../../gs-entbase/client.src +../sky.c ../sound.c ../prints.c ../voice.c diff --git a/src/client/sky.c b/src/client/sky.c index f7817874..757f0ede 100644 --- a/src/client/sky.c +++ b/src/client/sky.c @@ -14,19 +14,10 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -var string g_skyname = "desert"; - void Sky_Update(void) { if (serverkeyfloat("*bspversion") != 30) { return; } - localcmd(sprintf("sky %s\n", g_skyname)); -} - -void Sky_Set(string name) -{ - g_skyname = name; - dprint(sprintf("[SKY] Set to %s\n", g_skyname)); - Sky_Update(); + localcmd(sprintf("sky %s\n", g_strSkyName)); } diff --git a/src/client/tfc/progs.src b/src/client/tfc/progs.src index d11a60b7..dbbc84b9 100755 --- a/src/client/tfc/progs.src +++ b/src/client/tfc/progs.src @@ -22,7 +22,6 @@ vgui_chooseteam.cpp ../util.c init.c -../sky.c ../fade.c ../sprite.cpp ../titles.c @@ -31,6 +30,7 @@ init.c ../../gs-entbase/client.src +../sky.c ../sound.c ../prints.c ../voice.c diff --git a/src/client/valve/progs.src b/src/client/valve/progs.src index ec7318c1..019a8a19 100755 --- a/src/client/valve/progs.src +++ b/src/client/valve/progs.src @@ -20,7 +20,6 @@ particles.h ../util.c init.c -../sky.c ../fade.c ../sprite.cpp ../titles.c @@ -29,6 +28,7 @@ init.c ../../gs-entbase/client.src +../sky.c ../sound.c ../prints.c ../voice.c