vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

PMove: Move some things around a bit.

Browse source
This commit is contained in:
Marco Cawthorne 2022-05-01 22:04:40 -07:00
parent 70c2b43ff3
commit 17611b7d38
Signed by: eukara
GPG key ID: C196CD8BA993248A
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gs-entbase/shared/NSTrigger.qc
View file

@ -100,16 +100,16 @@ NSTrigger::GetMaster(void)
/* we couldn't find it, so let's not even bother going further */ /* we couldn't find it, so let's not even bother going further */
if (!t) { if (!t) {
print(sprintf("^2%s::^3GetMaster^7: Invalid master (%s), return success\n", dprint(sprintf("^2%s::^3GetMaster^7: Invalid master (%s), return success\n",
this.classname, m_strMaster)); this.classname, m_strMaster));
return (1); return (1);
} }
if (t.GetValue() == 1) if (t.GetValue() == 1)
print(sprintf("^2%s::^3GetMaster^7: %s learns %s ^2POSITIVE\n", dprint(sprintf("^2%s::^3GetMaster^7: %s learns %s ^2POSITIVE\n",
this.classname, targetname, m_strMaster)); this.classname, targetname, m_strMaster));
else else
print(sprintf("^2%s::^3GetMaster^7: %s learns %s ^1NEGATIVE\n", dprint(sprintf("^2%s::^3GetMaster^7: %s learns %s ^1NEGATIVE\n",
this.classname, targetname, m_strMaster)); this.classname, targetname, m_strMaster));
return t.GetValue(); return t.GetValue();

9
src/shared/pmove_custom.qc
View file

@ -91,6 +91,8 @@ PMoveCustom_Categorize(void)
} else { } else {
self.flags &= ~FL_ONGROUND; self.flags &= ~FL_ONGROUND;
} }
} else {
self.groundentity = __NULL__;
} }
self.flags &= ~FL_WATERJUMP; self.flags &= ~FL_WATERJUMP;
@ -460,7 +462,6 @@ PMoveCustom_Move(void)
if (!(self.flags & FL_ONGROUND)) { if (!(self.flags & FL_ONGROUND)) {
self.basevelocity[2] = 0; self.basevelocity[2] = 0;
} }
self.velocity += self.basevelocity;
/* we need to bounce off surfaces (in order to slide along them), /* we need to bounce off surfaces (in order to slide along them),
* so we need at 2 attempts */ * so we need at 2 attempts */
@ -501,7 +502,7 @@ PMoveCustom_Move(void)
float roof_fraction = trace_fraction; float roof_fraction = trace_fraction;
vector roof_plane_normal = trace_plane_normal; vector roof_plane_normal = trace_plane_normal;
dest = trace_endpos + self.velocity*move_time; dest = trace_endpos + (self.velocity*move_time);
dest[2] = trace_endpos[2]; /*only horizontally*/ dest[2] = trace_endpos[2]; /*only horizontally*/
/* move forwards */ /* move forwards */
@ -556,9 +557,6 @@ PMoveCustom_Move(void)
self.groundentity = trace_ent; self.groundentity = trace_ent;
} }
/* make sure that the basevelocity we've applied is discarded by next frame */
self.velocity -= self.basevelocity;
tracebox(self.origin, self.mins, self.maxs, self.origin, MOVE_NORMAL, self); tracebox(self.origin, self.mins, self.maxs, self.origin, MOVE_NORMAL, self);
} }
@ -588,7 +586,6 @@ PMoveCustom_RunPlayerPhysics(entity target)
/* clear base-velocity and ground-entity */ /* clear base-velocity and ground-entity */
self.basevelocity = [0,0,0]; self.basevelocity = [0,0,0];
self.groundentity = __NULL__;
/* activate any SOLID_TRIGGER entities */ /* activate any SOLID_TRIGGER entities */
touchtriggers(); touchtriggers();