OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- handled approx. half of all cases where the address of level is taken.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-28 00:55:21 +01:00
commit 648e472744
38 changed files with 122 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/po_man.cpp
View file

@ -741,11 +741,6 @@ int FPolyObj::GetMirror()
return MirrorNum;
}
FLevelLocals *FPolyObj::GetLevel() const
{
return &level;
}
//==========================================================================
//
// ThrustMobj
@ -756,7 +751,6 @@ void FPolyObj::ThrustMobj (AActor *actor, side_t *side)
{
DAngle thrustAngle;
DPolyAction *pe;
auto Level = GetLevel();
double force;
@ -811,7 +805,6 @@ void FPolyObj::UpdateLinks()
{
if (bHasPortals == 2)
{
auto Level = GetLevel();
TMap<int, bool> processed;
for (unsigned i = 0; i < Linedefs.Size(); i++)
{
@ -1000,7 +993,6 @@ void FPolyObj::UnLinkPolyobj ()
polyblock_t *link;
int i, j;
int index;
auto Level = GetLevel();
// remove the polyobj from each blockmap section
for(j = bbox[BOXBOTTOM]; j <= bbox[BOXTOP]; j++)
@ -1033,7 +1025,6 @@ void FPolyObj::UnLinkPolyobj ()
bool FPolyObj::CheckMobjBlocking (side_t *sd)
{
auto Level = GetLevel();
static TArray<AActor *> checker;
FBlockNode *block;
AActor *mobj;
@ -1169,7 +1160,6 @@ void FPolyObj::LinkPolyobj ()
{
polyblock_t **link;
polyblock_t *tempLink;
auto Level = GetLevel();
int bmapwidth = Level->blockmap.bmapwidth;
int bmapheight = Level->blockmap.bmapheight;
@ -1666,7 +1656,6 @@ static void SplitPoly(FPolyNode *pnode, void *node, float bbox[4])
void FPolyObj::CreateSubsectorLinks()
{
auto Level = GetLevel();
FPolyNode *node = NewPolyNode();
// Even though we don't care about it, we need to initialize this
// bounding box to something so that Valgrind won't complain about it
@ -1846,7 +1835,7 @@ FPolyObj *FPolyMirrorIterator::NextMirror()
if (i == NumUsedPolys)
{ // No, it has not been returned.
UsedPolys[NumUsedPolys++] = mirror;
nextpoly = poly->GetLevel()->GetPolyobj(mirror);
nextpoly = poly->Level->GetPolyobj(mirror);
if (nextpoly == nullptr)
{
Printf("Invalid mirror polyobj num %d for polyobj num %d\n", mirror, UsedPolys[i - 1]);