From 5aa79332f0a4c564b0b674df654ed5dc7a14fbd5 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Mon, 8 Aug 2022 14:28:28 +0300 Subject: [PATCH] minor clean-up after the model scaling patch. --- Quake/gl_refrag.c | 3 +-- Quake/gl_rmain.c | 2 +- Quake/pr_cmds.c | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Quake/gl_refrag.c b/Quake/gl_refrag.c index 03d9b9c4..146452c2 100644 --- a/Quake/gl_refrag.c +++ b/Quake/gl_refrag.c @@ -169,8 +169,6 @@ R_AddEfrags void R_AddEfrags (entity_t *ent) { qmodel_t *entmodel; - int i; - vec3_t boundVec, scaledVec; vec_t scalefactor; if (!ent->model) @@ -184,6 +182,7 @@ void R_AddEfrags (entity_t *ent) scalefactor = ENTSCALE_DECODE(ent->scale); if (scalefactor != 1.0f) { + vec3_t boundVec, scaledVec; VectorCopy (entmodel->mins, boundVec); VectorScale (boundVec, scalefactor, scaledVec); VectorAdd (ent->origin, scaledVec, r_emins); diff --git a/Quake/gl_rmain.c b/Quake/gl_rmain.c index 1fc91b11..5310f494 100644 --- a/Quake/gl_rmain.c +++ b/Quake/gl_rmain.c @@ -294,7 +294,6 @@ R_CullModelForEntity -- johnfitz -- uses correct bounds based on rotation qboolean R_CullModelForEntity (entity_t *e) { vec3_t mins, maxs, minbounds, maxbounds; - vec3_t scaledVec; vec_t scalefactor; if (e->angles[0] || e->angles[2]) //pitch or roll @@ -317,6 +316,7 @@ qboolean R_CullModelForEntity (entity_t *e) scalefactor = ENTSCALE_DECODE(e->scale); if (scalefactor != 1.0f) { + vec3_t scaledVec; VectorScale (minbounds, scalefactor, scaledVec); VectorAdd (e->origin, scaledVec, mins); VectorScale (maxbounds, scalefactor, scaledVec); diff --git a/Quake/pr_cmds.c b/Quake/pr_cmds.c index cca188e6..a861ade1 100644 --- a/Quake/pr_cmds.c +++ b/Quake/pr_cmds.c @@ -1580,7 +1580,6 @@ static void PF_makestatic (void) edict_t *ent; int i; int bits = 0; //johnfitz -- PROTOCOL_FITZQUAKE - eval_t *val; ent = G_EDICT(OFS_PARM0); @@ -1602,6 +1601,8 @@ static void PF_makestatic (void) } else { + eval_t *val; + if (SV_ModelIndex(PR_GetString(ent->v.model)) & 0xFF00) bits |= B_LARGEMODEL; if ((int)(ent->v.frame) & 0xFF00)