zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-18 10:11:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixing things.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-09 21:19:27 +01:00
parent 21ac6ab97f
commit ce8d5b48ef
5 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_maputl.h
View file

@ -311,7 +311,7 @@ class FBlockThingsIterator
public:
FBlockThingsIterator(FLevelLocals *Level, int minx, int miny, int maxx, int maxy);
FBlockThingsIterator(FLevelLocals *Level, const FBoundingBox &box)
FBlockThingsIterator(FLevelLocals *l, const FBoundingBox &box) : Level(l)
{
init(box);
}

2
src/p_tick.cpp
View file

@ -107,7 +107,7 @@ void P_Ticker (void)
ForAllLevels([](FLevelLocals *Level)
{
// [RH] Frozen mode is only changed every 4 tics, to make it work with A_Tracer().
if ((Level->time & 3) == 0)
if ((Level->maptime & 3) == 0)
{
if (Level->changefreeze)
{

2
src/p_user.cpp
View file

@ -1226,7 +1226,7 @@ void P_PlayerThink (player_t *player)
}
// Bots do not think in freeze mode.
if (!(player->mo->Level->freeze && player->Bot != nullptr))
if (player->mo->Level->freeze && player->Bot != nullptr)
{
return;
}

8
src/po_man.cpp
View file

@ -900,13 +900,13 @@ void FPolyObj::CalcCenter()
//
//==========================================================================
bool FPolyObj::MovePolyobj (const DVector2 &pos, bool force)
bool FPolyObj::MovePolyobj (const DVector2 &pos, bool fromsave)
{
FBoundingBox oldbounds = Bounds;
UnLinkPolyobj ();
DoMovePolyobj (pos);
if (!force)
if (!fromsave)
{
bool blocked = false;
@ -928,7 +928,7 @@ bool FPolyObj::MovePolyobj (const DVector2 &pos, bool force)
CenterSpot.pos += pos;
LinkPolyobj ();
ClearSubsectorLinks();
RecalcActorFloorCeil(Bounds | oldbounds);
if (!fromsave) RecalcActorFloorCeil(Bounds | oldbounds);
return true;
}
@ -1022,7 +1022,7 @@ bool FPolyObj::RotatePolyobj (DAngle angle, bool fromsave)
Angle += angle;
LinkPolyobj();
ClearSubsectorLinks();
RecalcActorFloorCeil(Bounds | oldbounds);
if (!fromsave) RecalcActorFloorCeil(Bounds | oldbounds);
return true;
}

3
src/r_data/r_interpolate.cpp
View file

@ -432,7 +432,6 @@ void DSectorPlaneInterpolation::OnDestroy()
{
sector->interpolations[sector_t::FloorMove] = nullptr;
}
sector = nullptr;
}
for(unsigned i=0; i<attached.Size(); i++)
{
@ -593,7 +592,6 @@ void DSectorScrollInterpolation::OnDestroy()
{
sector->interpolations[sector_t::FloorScroll] = nullptr;
}
sector = nullptr;
}
Super::OnDestroy();
}
@ -693,7 +691,6 @@ void DWallScrollInterpolation::OnDestroy()
if (side != nullptr)
{
side->textures[part].interpolation = nullptr;
side = nullptr;
}
Super::OnDestroy();
}