yquake2
/
rogue
mirror of https://github.com/yquake2/rogue.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37 from BjossiAlfreds/mysterymove 

Fixed entities mysteriously teleporting to another location
This commit is contained in:
Yamagi 2019-09-27 11:10:08 +02:00 committed by GitHub
parent 5f46d72acd 48f7e38792
commit f24de8d323
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/g_phys.c
View File

@ -1205,6 +1205,7 @@ G_RunEntity(edict_t *ent)
{ {
trace_t trace; trace_t trace;
vec3_t previous_origin; vec3_t previous_origin;
qboolean saved_origin;
if (!ent) if (!ent)
{ {
@ -1214,6 +1215,11 @@ G_RunEntity(edict_t *ent)
if (ent->movetype == MOVETYPE_STEP) if (ent->movetype == MOVETYPE_STEP)
{ {
VectorCopy(ent->s.origin, previous_origin); VectorCopy(ent->s.origin, previous_origin);
saved_origin = true;
}
else
{
saved_origin = false;
} }
if (ent->prethink) if (ent->prethink)
@ -1249,7 +1255,7 @@ G_RunEntity(edict_t *ent)
gi.error("SV_Physics: bad movetype %i", (int)ent->movetype); gi.error("SV_Physics: bad movetype %i", (int)ent->movetype);
} }
if (ent->movetype == MOVETYPE_STEP) if (saved_origin)
{ {
/* if we moved, check and fix origin if needed */ /* if we moved, check and fix origin if needed */
if (!VectorCompare(ent->s.origin, previous_origin)) if (!VectorCompare(ent->s.origin, previous_origin))