From: havoc Date: Mon, 23 May 2011 11:08:46 +0000 (+0000) Subject: fix steelstorm animated shader timing (shadertime was not declared in X-Git-Tag: xonotic-v0.5.0~158 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=0ff89222e677b14483ba7daee257abbdabf40aa8;p=xonotic%2Fdarkplaces.git fix steelstorm animated shader timing (shadertime was not declared in this csprogs.dat and the old code checked for that, no longer possible) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11162 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=9ae45aa38830d74344ac5d7a959788a2d89b5a6f --- diff --git a/csprogs.c b/csprogs.c index 58290c5b..1a718039 100644 --- a/csprogs.c +++ b/csprogs.c @@ -360,7 +360,8 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum) VM_GenerateFrameGroupBlend(ed->priv.server->framegroupblend, ed); VM_FrameBlendFromFrameGroupBlend(ed->priv.server->frameblend, ed->priv.server->framegroupblend, model); VM_UpdateEdictSkeleton(ed, model, ed->priv.server->frameblend); - entrender->shadertime = PRVM_clientedictfloat(ed, shadertime); + if (PRVM_clientedictfloat(ed, shadertime)) // hack for csprogs.dat files that do not set shadertime, leaves the value at entity spawn time + entrender->shadertime = PRVM_clientedictfloat(ed, shadertime); // transparent offset if (renderflags & RF_USETRANSPARENTOFFSET)