diff --git a/src/k_kart.c b/src/k_kart.c index 0fea67447..32fdaca87 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9011,7 +9011,7 @@ static void K_drawNameTags(void) an = R_PointToAngle2(camera[0].x, camera[0].y, players[i].mo->x, players[i].mo->y) - camera[0].angle; if (an > ANGLE_90 && an < ANGLE_270) continue; // behind back - if (!P_CheckSight2(players[i].mo, stplyr->mo)) + if (!P_CheckSight(players[i].mo, stplyr->mo)) continue; cm = R_GetTranslationColormap(players[i].skin, players[i].mo->color, GTC_CACHE); diff --git a/src/p_local.h b/src/p_local.h index b95940672..df8df412e 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -363,8 +363,6 @@ void P_BounceMove(mobj_t *mo); boolean P_CheckSight(mobj_t *t1, mobj_t *t2); void P_CheckHoopPosition(mobj_t *hoopthing, fixed_t x, fixed_t y, fixed_t z, fixed_t radius); -boolean P_CheckSight2(mobj_t *t1, mobj_t *t2); - boolean P_CheckSector(sector_t *sector, boolean crunch); void P_DelSeclist(msecnode_t *node); diff --git a/src/p_sight.c b/src/p_sight.c index 8d7a5c718..b482403cb 100644 --- a/src/p_sight.c +++ b/src/p_sight.c @@ -169,173 +169,6 @@ static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los) return true; } -static boolean P_CrossSubsector2(size_t num, register los_t *los) -{ - seg_t *seg; - INT32 count; - polyobj_t *po; // haleyjd 02/23/06 - -#ifdef RANGECHECK - if (num >= numsubsectors) - I_Error("P_CrossSubsector: ss %s with numss = %s\n", sizeu1(num), sizeu2(numsubsectors)); -#endif - - // haleyjd 02/23/06: this assignment should be after the above check - seg = segs + subsectors[num].firstline; - - // haleyjd 02/23/06: check polyobject lines - if ((po = subsectors[num].polyList)) - { - while (po) - { - if (po->validcount != validcount) - { - po->validcount = validcount; - if (!P_CrossSubsecPolyObj(po, los)) - return false; - } - po = (polyobj_t *)(po->link.next); - } - } - - for (count = subsectors[num].numlines; --count >= 0; seg++) // check lines - { - line_t *line = seg->linedef; - divline_t divl; - fixed_t popentop, popenbottom; - const sector_t *front, *back; - const vertex_t *v1,*v2; - fixed_t frac; - fixed_t frontf, backf, frontc, backc; - fixed_t fracx, fracy; - - // already checked other side? - if (line->validcount == validcount) - continue; - - line->validcount = validcount; - - // OPTIMIZE: killough 4/20/98: Added quick bounding-box rejection test - if (line->bbox[BOXLEFT ] > los->bbox[BOXRIGHT ] || - line->bbox[BOXRIGHT ] < los->bbox[BOXLEFT ] || - line->bbox[BOXBOTTOM] > los->bbox[BOXTOP ] || - line->bbox[BOXTOP] < los->bbox[BOXBOTTOM]) - continue; - - v1 = line->v1; - v2 = line->v2; - - // line isn't crossed? - if (P_DivlineSide(v1->x, v1->y, &los->strace) == - P_DivlineSide(v2->x, v2->y, &los->strace)) - continue; - - divl.dx = v2->x - (divl.x = v1->x); - divl.dy = v2->y - (divl.y = v1->y); - - // line isn't crossed? - if (P_DivlineSide(los->strace.x, los->strace.y, &divl) == - P_DivlineSide(los->t2x, los->t2y, &divl)) - continue; - - // stop because it is not two sided anyway - if (!(line->flags & ML_TWOSIDED)) - return false; - - // calculate fractional intercept (how far along we are divided by how far we are from t2) - frac = P_InterceptVector2(&los->strace, &divl); - - front = seg->frontsector; - back = seg->backsector; - // calculate position at intercept - fracx = los->strace.x + FixedMul(los->strace.dx, frac); - fracy = los->strace.y + FixedMul(los->strace.dy, frac); - // calculate sector heights - frontf = P_GetSectorFloorZAt (front, fracx, fracy); - frontc = P_GetSectorCeilingZAt(front, fracx, fracy); - backf = P_GetSectorFloorZAt (back , fracx, fracy); - backc = P_GetSectorCeilingZAt(back , fracx, fracy); - // crosses a two sided line - // no wall to block sight with? - if (frontf == backf && frontc == backc - && !front->ffloors & !back->ffloors) // (and no FOFs) - continue; - - // possible occluder - // because of ceiling height differences - popentop = min(frontc, backc); - - // because of floor height differences - popenbottom = max(frontf, backf); - - // quick test for totally closed doors - if (popenbottom >= popentop) - return false; - - if (frontf != backf) - { - fixed_t slope = FixedDiv(popenbottom - los->sightzstart , frac); - if (slope > los->bottomslope) - los->bottomslope = slope; - } - - if (frontc != backc) - { - fixed_t slope = FixedDiv(popentop - los->sightzstart , frac); - if (slope < los->topslope) - los->topslope = slope; - } - - if (los->topslope <= los->bottomslope) - return false; - - // Monster Iestyn: check FOFs! - if (front->ffloors || back->ffloors) - { - ffloor_t *rover; - fixed_t topslope, bottomslope; - fixed_t topz, bottomz; - // check front sector's FOFs first - for (rover = front->ffloors; rover; rover = rover->next) - { - if (!(rover->flags & FF_EXISTS) - || !(rover->flags & FF_RENDERSIDES) || (rover->flags & (FF_TRANSLUCENT|FF_FOG))) - { - continue; - } - - topz = P_GetFFloorTopZAt (rover, fracx, fracy); - bottomz = P_GetFFloorBottomZAt(rover, fracx, fracy); - topslope = FixedDiv( topz - los->sightzstart, frac); - bottomslope = FixedDiv(bottomz - los->sightzstart, frac); - if (topslope >= los->topslope && bottomslope <= los->bottomslope) - return false; // view completely blocked - } - // check back sector's FOFs as well - for (rover = back->ffloors; rover; rover = rover->next) - { - if (!(rover->flags & FF_EXISTS) - || !(rover->flags & FF_RENDERSIDES) || (rover->flags & (FF_TRANSLUCENT|FF_FOG))) - { - continue; - } - - topz = P_GetFFloorTopZAt (rover, fracx, fracy); - bottomz = P_GetFFloorBottomZAt(rover, fracx, fracy); - topslope = FixedDiv( topz - los->sightzstart, frac); - bottomslope = FixedDiv(bottomz - los->sightzstart, frac); - if (topslope >= los->topslope && bottomslope <= los->bottomslope) - return false; // view completely blocked - } - // TODO: figure out if it's worth considering partially blocked cases or not? - // maybe to adjust los's top/bottom slopes if needed - } - } - - // passed the subsector ok - return true; -} - // // P_CrossSubsector @@ -536,26 +369,6 @@ static boolean P_CrossBSPNode(INT32 bspnum, register los_t *los) P_CrossSubsector((bspnum == -1 ? 0 : bspnum & ~NF_SUBSECTOR), los); } -static boolean P_CrossBSPNode2(INT32 bspnum, register los_t *los) -{ - while (!(bspnum & NF_SUBSECTOR)) - { - register node_t *bsp = nodes + bspnum; - INT32 side = P_DivlineSide(los->strace.x,los->strace.y,(divline_t *)bsp)&1; - if (side == P_DivlineSide(los->t2x, los->t2y, (divline_t *) bsp)) - bspnum = bsp->children[side]; // doesn't touch the other side - else // the partition plane is crossed here - { - if (!P_CrossBSPNode2(bsp->children[side], los)) - return 0; // cross the starting side - else - bspnum = bsp->children[side^1]; // cross the ending side - } - } - return - P_CrossSubsector2((bspnum == -1 ? 0 : bspnum & ~NF_SUBSECTOR), los); -} - // // P_CheckSight // @@ -680,124 +493,4 @@ boolean P_CheckSight(mobj_t *t1, mobj_t *t2) // the head node is the last node output return P_CrossBSPNode((INT32)numnodes - 1, &los); -} - -boolean P_CheckSight2(mobj_t *t1, mobj_t *t2) -{ - const sector_t *s1, *s2; - size_t pnum; - los_t los; - - // First check for trivial rejection. - if (!t1 || !t2) - return false; - - I_Assert(!P_MobjWasRemoved(t1)); - I_Assert(!P_MobjWasRemoved(t2)); - - if (!t1->subsector || !t2->subsector - || !t1->subsector->sector || !t2->subsector->sector) - return false; - - s1 = t1->subsector->sector; - s2 = t2->subsector->sector; - pnum = (s1-sectors)*numsectors + (s2-sectors); - - if (rejectmatrix != NULL) - { - // Check in REJECT table. - if (rejectmatrix[pnum>>3] & (1 << (pnum&7))) // can't possibly be connected - return false; - } - - // killough 11/98: shortcut for melee situations - // same subsector? obviously visible - // haleyjd 02/23/06: can't do this if there are polyobjects in the subsec - if (!t1->subsector->polyList && - t1->subsector == t2->subsector) - return true; - - // An unobstructed LOS is possible. - // Now look from eyes of t1 to any part of t2. - sightcounts[1]++; - - validcount++; - - los.topslope = - (los.bottomslope = t2->z - (los.sightzstart = - t1->z + t1->height - - (t1->height>>2))) + t2->height; - los.strace.dx = (los.t2x = t2->x) - (los.strace.x = t1->x); - los.strace.dy = (los.t2y = t2->y) - (los.strace.y = t1->y); - - if (t1->x > t2->x) - los.bbox[BOXRIGHT] = t1->x, los.bbox[BOXLEFT] = t2->x; - else - los.bbox[BOXRIGHT] = t2->x, los.bbox[BOXLEFT] = t1->x; - - if (t1->y > t2->y) - los.bbox[BOXTOP] = t1->y, los.bbox[BOXBOTTOM] = t2->y; - else - los.bbox[BOXTOP] = t2->y, los.bbox[BOXBOTTOM] = t1->y; - - // Prevent SOME cases of looking through 3dfloors - // - // This WILL NOT work for things like 3d stairs with monsters behind - // them - they will still see you! TODO: Fix. - // - if (s1 == s2) // Both sectors are the same. - { - ffloor_t *rover; - fixed_t topz1, bottomz1; // top, bottom heights at t1's position - fixed_t topz2, bottomz2; // likewise but for t2 - - for (rover = s1->ffloors; rover; rover = rover->next) - { - // Allow sight through water, fog, etc. - /// \todo Improve by checking fog density/translucency - /// and setting a sight limit. - if (!(rover->flags & FF_EXISTS) - || !(rover->flags & FF_RENDERPLANES) || (rover->flags & (FF_TRANSLUCENT|FF_FOG))) - { - continue; - } - - topz1 = P_GetFFloorTopZAt (rover, t1->x, t1->y); - topz2 = P_GetFFloorTopZAt (rover, t2->x, t2->y); - bottomz1 = P_GetFFloorBottomZAt(rover, t1->x, t1->y); - bottomz2 = P_GetFFloorBottomZAt(rover, t2->x, t2->y); - - // Check for blocking floors here. - if ((los.sightzstart < bottomz1 && t2->z >= topz2) - || (los.sightzstart >= topz1 && t2->z + t2->height < bottomz2)) - { - // no way to see through that - return false; - } - - if (rover->flags & FF_SOLID) - continue; // shortcut since neither mobj can be inside the 3dfloor - - if (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES)) - { - if (los.sightzstart >= topz1 && t2->z + t2->height < topz2) - return false; // blocked by upper outside plane - - if (los.sightzstart < bottomz1 && t2->z >= bottomz2) - return false; // blocked by lower outside plane - } - - if (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES) - { - if (los.sightzstart < topz1 && t2->z >= topz2) - return false; // blocked by upper inside plane - - if (los.sightzstart >= bottomz1 && t2->z + t2->height < bottomz2) - return false; // blocked by lower inside plane - } - } - } - - // the head node is the last node output - return P_CrossBSPNode2((INT32)numnodes - 1, &los); } \ No newline at end of file