zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 19:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

engine.c: fix clipmove() against upper part of wall-aligned sprites.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4882 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-01-06 20:54:49 +00:00
parent 5c4f9b1f14
commit 26683d5bfe
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
polymer/eduke32/build/src/engine.c
View file

@ -13912,7 +13912,7 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum,
{ {
const int32_t daz = spr->z + spriteheightofs(j, &k, 1); const int32_t daz = spr->z + spriteheightofs(j, &k, 1);
if ((pos->z < daz+ceildist) && (pos->z > daz-k-flordist)) if (pos->z > daz-k-flordist && pos->z < daz+ceildist)
{ {
int32_t bsz; int32_t bsz;
bsz = (spr->clipdist<<2)+walldist; if (gx < 0) bsz = -bsz; bsz = (spr->clipdist<<2)+walldist; if (gx < 0) bsz = -bsz;
@ -13925,10 +13925,9 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum,
case 16: case 16:
{ {
const int32_t daz = spr->z + spriteheightofs(j, &k, 1) + ceildist; const int32_t daz = spr->z + spriteheightofs(j, &k, 1);
const int32_t daz2 = daz-k - flordist;
if (pos->z < daz && pos->z > daz2) if (pos->z > daz-k-flordist && pos->z < daz+ceildist)
{ {
get_wallspr_points(spr, &x1, &x2, &y1, &y2); get_wallspr_points(spr, &x1, &x2, &y1, &y2);
@ -13959,10 +13958,7 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum,
case 32: case 32:
{ {
const int32_t daz = spr->z + ceildist; if (pos->z > spr->z - flordist && pos->z < spr->z + ceildist)
const int32_t daz2 = spr->z - flordist;
if (pos->z < daz && pos->z > daz2)
{ {
if ((cstat&64) != 0) if ((cstat&64) != 0)
if ((pos->z > spr->z) == ((cstat&8)==0)) if ((pos->z > spr->z) == ((cstat&8)==0))