From 42521ffd6f49e70955cf9c89379914ccecb60297 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 8 Mar 2016 18:34:58 +0100 Subject: [PATCH] - fixed some mixed up variables in a few blockmap iterators. --- src/g_hexen/a_spike.cpp | 2 +- src/p_map.cpp | 4 ++-- src/r_bsp.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/g_hexen/a_spike.cpp b/src/g_hexen/a_spike.cpp index 10444ecb9..3943bee30 100644 --- a/src/g_hexen/a_spike.cpp +++ b/src/g_hexen/a_spike.cpp @@ -161,7 +161,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_ThrustImpale) while (it.Next(&cres)) { fixed_t blockdist = self->radius + cres.thing->radius; - if (abs(self->X() - cres.position.x) >= blockdist || abs(self->Y() - cres.position.y) >= blockdist) + if (abs(cres.thing->X() - cres.position.x) >= blockdist || abs(cres.thing->Y() - cres.position.y) >= blockdist) continue; // Q: Make this z-aware for everything? It never was before. diff --git a/src/p_map.cpp b/src/p_map.cpp index 8174d8e77..a277c7b77 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -5527,7 +5527,7 @@ void P_FindAboveIntersectors(AActor *actor) { AActor *thing = cres.thing; fixed_t blockdist = actor->radius + thing->radius; - if (abs(actor->X() - cres.position.x) >= blockdist || abs(actor->Y() - cres.position.y) >= blockdist) + if (abs(thing->X() - cres.position.x) >= blockdist || abs(thing->Y() - cres.position.y) >= blockdist) continue; if (!(thing->flags & MF_SOLID)) @@ -5583,7 +5583,7 @@ void P_FindBelowIntersectors(AActor *actor) { AActor *thing = cres.thing; fixed_t blockdist = actor->radius + thing->radius; - if (abs(actor->X() - cres.position.x) >= blockdist || abs(actor->Y() - cres.position.y) >= blockdist) + if (abs(thing->X() - cres.position.x) >= blockdist || abs(thing->Y() - cres.position.y) >= blockdist) continue; if (!(thing->flags & MF_SOLID)) diff --git a/src/r_bsp.cpp b/src/r_bsp.cpp index 97ac7e5e3..861040cf0 100644 --- a/src/r_bsp.cpp +++ b/src/r_bsp.cpp @@ -1092,7 +1092,7 @@ void R_Subsector (subsector_t *sub) basecolormap = frontsector->ColorMap; } - skybox = frontsector->GetSkyBox(sector_t::ceiling); + skybox = NULL;// frontsector->GetSkyBox(sector_t::ceiling); if (skybox != NULL && skybox->special1 >= SKYBOX_PLANE) skybox = NULL; // skip unsupported portal types ceilingplane = frontsector->ceilingplane.PointOnSide(viewx, viewy, viewz) > 0 || @@ -1134,7 +1134,7 @@ void R_Subsector (subsector_t *sub) // killough 3/7/98: Add (x,y) offsets to flats, add deep water check // killough 3/16/98: add floorlightlevel // killough 10/98: add support for skies transferred from sidedefs - skybox = frontsector->GetSkyBox(sector_t::floor); + skybox = NULL;// frontsector->GetSkyBox(sector_t::floor); if (skybox != NULL && skybox->special1 >= SKYBOX_PLANE) skybox = NULL; // skip unsupported portal types floorplane = frontsector->floorplane.PointOnSide(viewx, viewy, viewz) > 0 || // killough 3/7/98