stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-14 00:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash with ceiling slopes and line collisions

Browse source
This commit is contained in:
RedEnchilada 2015-04-25 20:39:18 -05:00
parent f130a529b1
commit bac34d783e
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/p_maputl.c
View file

@ -357,7 +357,7 @@ void P_CameraLineOpening(line_t *linedef)
if (sectors[front->camsec].c_slope) if (sectors[front->camsec].c_slope)
frontceiling = P_GetZAt(sectors[front->camsec].c_slope, camera.x, camera.y); frontceiling = P_GetZAt(sectors[front->camsec].c_slope, camera.x, camera.y);
#endif #endif
} }
else if (front->heightsec >= 0) else if (front->heightsec >= 0)
{ {
@ -463,7 +463,7 @@ void P_CameraLineOpening(line_t *linedef)
/*#ifdef ESLOPE /*#ifdef ESLOPE
if (rover->t_slope) if (rover->t_slope)
topheight = P_GetZAt(rover->t_slope, camera.x, camera.y); topheight = P_GetZAt(rover->t_slope, camera.x, camera.y);
if (rover->b_slope) if (rover->b_slope)
bottomheight = P_GetZAt(rover->b_slope, camera.x, camera.y); bottomheight = P_GetZAt(rover->b_slope, camera.x, camera.y);
#endif // ESLOPE*/ #endif // ESLOPE*/
@ -494,7 +494,7 @@ void P_CameraLineOpening(line_t *linedef)
/*#ifdef ESLOPE /*#ifdef ESLOPE
if (rover->t_slope) if (rover->t_slope)
topheight = P_GetZAt(rover->t_slope, camera.x, camera.y); topheight = P_GetZAt(rover->t_slope, camera.x, camera.y);
if (rover->b_slope) if (rover->b_slope)
bottomheight = P_GetZAt(rover->b_slope, camera.x, camera.y); bottomheight = P_GetZAt(rover->b_slope, camera.x, camera.y);
#endif // ESLOPE*/ #endif // ESLOPE*/
@ -642,7 +642,7 @@ void P_LineOpening(line_t *linedef)
if (front->c_slope) highceiling = P_GetZAt(front->c_slope, tmthing->x, tmthing->y); if (front->c_slope) highceiling = P_GetZAt(front->c_slope, tmthing->x, tmthing->y);
} }
if (front->c_slope && front->floorheight < back->floorheight) if (front->f_slope && front->floorheight < back->floorheight)
{ {
openbottom = P_GetZAt(front->f_slope, tmthing->x, tmthing->y); openbottom = P_GetZAt(front->f_slope, tmthing->x, tmthing->y);
if (back->f_slope) lowfloor = P_GetZAt(back->f_slope, tmthing->x, tmthing->y); if (back->f_slope) lowfloor = P_GetZAt(back->f_slope, tmthing->x, tmthing->y);
@ -683,11 +683,11 @@ void P_LineOpening(line_t *linedef)
fixed_t topheight = *rover->topheight; fixed_t topheight = *rover->topheight;
fixed_t bottomheight = *rover->bottomheight; fixed_t bottomheight = *rover->bottomheight;
/*#ifdef ESLOPE /*#ifdef ESLOPE
if (rover->t_slope) if (rover->t_slope)
topheight = P_GetZAt(rover->t_slope, camera.x, camera.y); topheight = P_GetZAt(rover->t_slope, camera.x, camera.y);
if (rover->b_slope) if (rover->b_slope)
bottomheight = P_GetZAt(rover->b_slope, camera.x, camera.y); bottomheight = P_GetZAt(rover->b_slope, camera.x, camera.y);
#endif*/ #endif*/
@ -730,7 +730,7 @@ void P_LineOpening(line_t *linedef)
/*#ifdef ESLOPE /*#ifdef ESLOPE
if (rover->t_slope) if (rover->t_slope)
topheight = P_GetZAt(rover->t_slope, tmthing->x, tmthing->y); topheight = P_GetZAt(rover->t_slope, tmthing->x, tmthing->y);
if (rover->b_slope) if (rover->b_slope)
bottomheight = P_GetZAt(rover->b_slope, tmthing->x, tmthing->y); bottomheight = P_GetZAt(rover->b_slope, tmthing->x, tmthing->y);
#endif*/ #endif*/