fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-03-12 22:03:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make sure scales are initialized to ENTSCALE_DEFAULT

Browse source
This commit is contained in:
temx 2022-09-05 23:56:30 +03:00 committed by Ozkan Sezer
parent 947c782f64
commit 6bff9566a5
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Quake/cl_parse.c
View file

@ -126,6 +126,7 @@ entity_t *CL_EntityNum (int num)
{
cl_entities[cl.num_entities].colormap = vid.colormap;
cl_entities[cl.num_entities].lerpflags |= LERP_RESETMOVE|LERP_RESETANIM; //johnfitz
cl_entities[cl.num_entities].baseline.scale = ENTSCALE_DEFAULT;
cl.num_entities++;
}
}
@ -622,7 +623,7 @@ void CL_ParseUpdate (int bits)
}
else
ent->alpha = ent->baseline.alpha;
ent->scale = ENTSCALE_DEFAULT;
ent->scale = ent->baseline.scale;
}
//johnfitz

1
Quake/host_cmd.c
View file

@ -1239,6 +1239,7 @@ static void Host_Loadgame_f (void)
}
else {
memset (ent, 0, pr_edict_size);
ent->baseline.scale = ENTSCALE_DEFAULT;
}
data = ED_ParseEdict (data, ent);

2
Quake/pr_edict.c
View file

@ -131,6 +131,7 @@ edict_t *ED_Alloc (void)
sv.num_edicts++;
e = EDICT_NUM(i);
memset(e, 0, pr_edict_size); // ericw -- switched sv.edicts to malloc(), so we are accessing uninitialized memory and must fully zero it, not just ED_ClearEdict
e->baseline.scale = ENTSCALE_DEFAULT;
return e;
}
@ -159,6 +160,7 @@ void ED_Free (edict_t *ed)
ed->v.nextthink = -1;
ed->v.solid = 0;
ed->alpha = ENTALPHA_DEFAULT; //johnfitz -- reset alpha for next entity
ed->scale = ENTSCALE_DEFAULT;
ed->freetime = sv.time;
}

2
Quake/sv_main.c
View file

@ -1247,7 +1247,7 @@ void SV_CreateBaseline (void)
svent->baseline.colormap = 0;
svent->baseline.modelindex = SV_ModelIndex(PR_GetString(svent->v.model));
svent->baseline.alpha = svent->alpha; //johnfitz -- alpha support
svent->baseline.scale = svent->scale;
svent->baseline.scale = ENTSCALE_DEFAULT;
}
//johnfitz -- PROTOCOL_FITZQUAKE