vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Client: Add force parameter to Sky_Update() and make sure Sky_Update() is

Browse source 
called upon CSQC_RendererRestarted.
This commit is contained in:
Marco Cawthorne 2021-03-08 01:45:15 +01:00
parent c13f1f13cd
commit 46f9e1be0f
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/client/entry.qc
View file

@ -65,6 +65,7 @@ CSQC_Init(float apilevel, string enginename, float engineversion)
registercommand("dev_sunpos"); registercommand("dev_sunpos");
registercommand("dev_measure"); registercommand("dev_measure");
registercommand("way_menu"); registercommand("way_menu");
registercommand("view_geomtest");
precache_model("sprites/640_pain.spr"); precache_model("sprites/640_pain.spr");
precache_model("sprites/crosshairs.spr"); precache_model("sprites/crosshairs.spr");
@ -128,6 +129,7 @@ CSQC_RendererRestarted(string rstr)
Fade_Init(); Fade_Init();
Decal_Reload(); Decal_Reload();
FX_Init(); FX_Init();
Sky_Update(TRUE);
} }
/* this is so that profile_csqc reports more accurate statistics as to /* this is so that profile_csqc reports more accurate statistics as to
@ -163,7 +165,7 @@ CSQC_UpdateView(float w, float h, float focus)
video_res[1] = h; video_res[1] = h;
Fog_Update(); Fog_Update();
Sky_Update(); Sky_Update(FALSE);
cvar_set("_background", serverkey("background")); cvar_set("_background", serverkey("background"));
if (serverkeyfloat("background") == 1) { if (serverkeyfloat("background") == 1) {
@ -750,6 +752,9 @@ CSQC_ConsoleCommand(string sCMD)
case "_fnchat_msg": case "_fnchat_msg":
CSQC_Parse_Print(argv(1), PRINT_CHAT); CSQC_Parse_Print(argv(1), PRINT_CHAT);
break; break;
case "view_geomtest":
Weapons_SetGeomset(sprintf("geomset %s %s\n", argv(1), argv(2)));
break;
default: default:
return ClientGame_ConsoleCommand(); return ClientGame_ConsoleCommand();
} }
@ -947,7 +952,7 @@ CSQC_WorldLoaded(void)
/* we've gone through all ent-lumps, so we can read sky-overrides from /* we've gone through all ent-lumps, so we can read sky-overrides from
worldspawn now. */ worldspawn now. */
Sky_Update(); Sky_Update(TRUE);
} }
/* /*

4
src/client/sky.qc
View file

@ -17,9 +17,9 @@
var string g_strSkyName; var string g_strSkyName;
void void
Sky_Update(void) Sky_Update(int force)
{ {
if (g_strSkyName != serverkey("skyname")) { if (g_strSkyName != serverkey("skyname") || force == TRUE) {
g_strSkyName = serverkey("skyname"); g_strSkyName = serverkey("skyname");
localcmd(sprintf("sky %s\n", g_strSkyName)); localcmd(sprintf("sky %s\n", g_strSkyName));
} }