zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

This commit is contained in:
Christoph Oelckers 2016-05-11 11:47:00 +02:00
parent 15933f9c72 43d93a19a0
commit 12b84d9f71
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/p_local.h
View File

@ -354,7 +354,6 @@ msecnode_t* P_DelSecnode(msecnode_t *, msecnode_t *sector_t::*head);
void P_CreateSecNodeList(AActor*); // phares 3/14/98 void P_CreateSecNodeList(AActor*); // phares 3/14/98
double P_GetMoveFactor(const AActor *mo, double *frictionp); // phares 3/6/98 double P_GetMoveFactor(const AActor *mo, double *frictionp); // phares 3/6/98
double P_GetFriction(const AActor *mo, double *frictionfactor); double P_GetFriction(const AActor *mo, double *frictionfactor);
bool Check_Sides(AActor *, int, int); // phares
// [RH] // [RH]
const secplane_t * P_CheckSlopeWalk(AActor *actor, DVector2 &move); const secplane_t * P_CheckSlopeWalk(AActor *actor, DVector2 &move);

6
src/p_map.cpp
View File

@ -2533,13 +2533,13 @@ bool P_CheckMove(AActor *thing, const DVector2 &pos, int flags)
return false; return false;
} }
} }
else if (flags & PCM_DROPOFF) else if ((flags & PCM_DROPOFF) && !(thing->flags & (MF_FLOAT|MF_DROPOFF)))
{ {
const DVector3 oldpos = thing->Pos(); const DVector3 oldpos = thing->Pos();
thing->SetOrigin(pos.X, pos.Y, newz, true); 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); thing->SetOrigin(oldpos, true);
if (hcheck && !(thing->flags & MF_FLOAT) && !(i_compatflags & COMPATF_DROPOFF)) if (hcheck)
{ {
return false; return false;
} }

1
src/p_mobj.cpp
View File

@ -4390,6 +4390,7 @@ void AActor::Deactivate (AActor *activator)
void AActor::Destroy () void AActor::Destroy ()
{ {
ClearRenderSectorList(); ClearRenderSectorList();
ClearRenderLineList();
// [RH] Destroy any inventory this actor is carrying // [RH] Destroy any inventory this actor is carrying
DestroyAllInventory (); DestroyAllInventory ();

6
src/p_sectors.cpp
View File

@ -1126,11 +1126,9 @@ bool P_AlignFlat (int linenum, int side, int fc)
if (!sec) if (!sec)
return false; return false;
DVector2 pos = line->v1->fPos(); DAngle angle = line->Delta().Angle();
DVector2 pos2 = line->v2->fPos();
DAngle angle = (pos2 - pos).Angle();
DAngle norm = angle - 90; 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) if (side)
{ {

2
src/s_sound.cpp
View File

@ -1396,8 +1396,6 @@ static void S_LoadSound3D(sfxinfo_t *sfx)
if(sfx->data3d.isValid()) if(sfx->data3d.isValid())
return; return;
unsigned int i;
DPrintf("Loading monoized sound \"%s\" (%td)\n", sfx->name.GetChars(), sfx - &S_sfx[0]); DPrintf("Loading monoized sound \"%s\" (%td)\n", sfx->name.GetChars(), sfx - &S_sfx[0]);
int size = Wads.LumpLength(sfx->lumpnum); int size = Wads.LumpLength(sfx->lumpnum);