mirror of
https://github.com/nzp-team/dquakeplus.git
synced 2025-02-18 09:31:31 +00:00
Make sure we explicitly express scale as a float
This commit is contained in:
parent
4300d60192
commit
d564ccf92a
2 changed files with 6 additions and 7 deletions
|
@ -621,7 +621,7 @@ void CL_ParseUpdate (int bits)
|
||||||
if (bits & U_SCALE)
|
if (bits & U_SCALE)
|
||||||
ent->scale = MSG_ReadFloat();
|
ent->scale = MSG_ReadFloat();
|
||||||
else
|
else
|
||||||
ent->scale = 1;
|
ent->scale = 1.0f;
|
||||||
|
|
||||||
// Tomaz - QC Alpha Scale Glow Begin
|
// Tomaz - QC Alpha Scale Glow Begin
|
||||||
if (bits & U_RENDERAMT)
|
if (bits & U_RENDERAMT)
|
||||||
|
|
|
@ -516,11 +516,11 @@ void SV_WriteEntitiesToClient (edict_t *clent, sizebuf_t *msg, qboolean nomap)
|
||||||
bits |= U_MODEL;
|
bits |= U_MODEL;
|
||||||
|
|
||||||
if (ent->baseline.scale != ent->v.scale) {
|
if (ent->baseline.scale != ent->v.scale) {
|
||||||
if (ent->v.scale == 0)
|
if (ent->v.scale == 0f)
|
||||||
ent->v.scale = 1;
|
ent->v.scale = 1.0f;
|
||||||
|
|
||||||
if (ent->v.scale > 16)
|
if (ent->v.scale > 16.0f)
|
||||||
ent->v.scale = 16;
|
ent->v.scale = 16.0f;
|
||||||
|
|
||||||
bits |= U_SCALE;
|
bits |= U_SCALE;
|
||||||
}
|
}
|
||||||
|
@ -1044,16 +1044,15 @@ void SV_CreateBaseline (void)
|
||||||
VectorCopy (svent->v.angles, svent->baseline.angles);
|
VectorCopy (svent->v.angles, svent->baseline.angles);
|
||||||
svent->baseline.frame = svent->v.frame;
|
svent->baseline.frame = svent->v.frame;
|
||||||
svent->baseline.skin = svent->v.skin;
|
svent->baseline.skin = svent->v.skin;
|
||||||
|
svent->baseline.scale = 1.0f;
|
||||||
if (entnum > 0 && entnum <= svs.maxclients)
|
if (entnum > 0 && entnum <= svs.maxclients)
|
||||||
{
|
{
|
||||||
svent->baseline.colormap = entnum;
|
svent->baseline.colormap = entnum;
|
||||||
svent->baseline.scale = 1;
|
|
||||||
svent->baseline.modelindex = SV_ModelIndex("models/player.mdl");
|
svent->baseline.modelindex = SV_ModelIndex("models/player.mdl");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
svent->baseline.colormap = 0;
|
svent->baseline.colormap = 0;
|
||||||
svent->baseline.scale = 1;
|
|
||||||
svent->baseline.modelindex =
|
svent->baseline.modelindex =
|
||||||
SV_ModelIndex(pr_strings + svent->v.model);
|
SV_ModelIndex(pr_strings + svent->v.model);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue