mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-10 23:01:59 +00:00
Merge branch 'master' of https://github.com/rheit/zdoom
This commit is contained in:
commit
12b84d9f71
5 changed files with 6 additions and 10 deletions
|
@ -354,7 +354,6 @@ msecnode_t* P_DelSecnode(msecnode_t *, msecnode_t *sector_t::*head);
|
|||
void P_CreateSecNodeList(AActor*); // phares 3/14/98
|
||||
double P_GetMoveFactor(const AActor *mo, double *frictionp); // phares 3/6/98
|
||||
double P_GetFriction(const AActor *mo, double *frictionfactor);
|
||||
bool Check_Sides(AActor *, int, int); // phares
|
||||
|
||||
// [RH]
|
||||
const secplane_t * P_CheckSlopeWalk(AActor *actor, DVector2 &move);
|
||||
|
|
|
@ -2533,13 +2533,13 @@ bool P_CheckMove(AActor *thing, const DVector2 &pos, int flags)
|
|||
return false;
|
||||
}
|
||||
}
|
||||
else if (flags & PCM_DROPOFF)
|
||||
else if ((flags & PCM_DROPOFF) && !(thing->flags & (MF_FLOAT|MF_DROPOFF)))
|
||||
{
|
||||
const DVector3 oldpos = thing->Pos();
|
||||
thing->SetOrigin(pos.X, pos.Y, newz, true);
|
||||
bool hcheck = (newz - thing->MaxDropOffHeight > thing->dropoffz);
|
||||
bool hcheck = (newz - thing->dropoffz > thing->MaxDropOffHeight);
|
||||
thing->SetOrigin(oldpos, true);
|
||||
if (hcheck && !(thing->flags & MF_FLOAT) && !(i_compatflags & COMPATF_DROPOFF))
|
||||
if (hcheck)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -4390,6 +4390,7 @@ void AActor::Deactivate (AActor *activator)
|
|||
void AActor::Destroy ()
|
||||
{
|
||||
ClearRenderSectorList();
|
||||
ClearRenderLineList();
|
||||
|
||||
// [RH] Destroy any inventory this actor is carrying
|
||||
DestroyAllInventory ();
|
||||
|
|
|
@ -1126,11 +1126,9 @@ bool P_AlignFlat (int linenum, int side, int fc)
|
|||
if (!sec)
|
||||
return false;
|
||||
|
||||
DVector2 pos = line->v1->fPos();
|
||||
DVector2 pos2 = line->v2->fPos();
|
||||
DAngle angle = (pos2 - pos).Angle();
|
||||
DAngle angle = line->Delta().Angle();
|
||||
DAngle norm = angle - 90;
|
||||
double dist = norm.Cos() * pos.X + norm.Sin() * pos.Y;
|
||||
double dist = -(norm.Cos() * line->v1->fX() + norm.Sin() * line->v1->fY());
|
||||
|
||||
if (side)
|
||||
{
|
||||
|
|
|
@ -1396,8 +1396,6 @@ static void S_LoadSound3D(sfxinfo_t *sfx)
|
|||
if(sfx->data3d.isValid())
|
||||
return;
|
||||
|
||||
unsigned int i;
|
||||
|
||||
DPrintf("Loading monoized sound \"%s\" (%td)\n", sfx->name.GetChars(), sfx - &S_sfx[0]);
|
||||
|
||||
int size = Wads.LumpLength(sfx->lumpnum);
|
||||
|
|
Loading…
Reference in a new issue