zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed: P_CheckPosition must initialized tm.floorterrain.

This commit is contained in:
Christoph Oelckers 2016-04-27 12:08:22 +02:00
parent f5afa30ee6
commit 044bf4ada6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_map.cpp
View File

@ -1526,6 +1526,7 @@ bool P_CheckPosition(AActor *thing, const DVector2 &pos, FCheckPosition &tm, boo
tm.ceilingz = newsec->ceilingplane.ZatPoint(pos); tm.ceilingz = newsec->ceilingplane.ZatPoint(pos);
tm.ceilingpic = newsec->GetTexture(sector_t::ceiling); tm.ceilingpic = newsec->GetTexture(sector_t::ceiling);
tm.floorsector = tm.ceilingsector = newsec; tm.floorsector = tm.ceilingsector = newsec;
tm.floorterrain = newsec->GetTerrain(sector_t::floor);
} }
F3DFloor* rover; F3DFloor* rover;
@ -1546,6 +1547,7 @@ bool P_CheckPosition(AActor *thing, const DVector2 &pos, FCheckPosition &tm, boo
{ {
tm.floorz = tm.dropoffz = ff_top; tm.floorz = tm.dropoffz = ff_top;
tm.floorpic = *rover->top.texture; tm.floorpic = *rover->top.texture;
tm.floorterrain = rover->model->GetTerrain(rover->top.isceiling);
} }
if (ff_bottom < tm.ceilingz && abs(delta1) >= abs(delta2)) if (ff_bottom < tm.ceilingz && abs(delta1) >= abs(delta2))
{ {