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

Polymer: include wall[].ypanning in wall invalidation logic.

Browse source 
Fixes bug reported here:
http://forums.duke4.net/topic/1348-mapster32-problems-and-bugs/page__view__findpost__p__213759

git-svn-id: https://svn.eduke32.com/eduke32@4833 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-12-21 15:51:51 +00:00
parent 3a741de9fe
commit a20a7878bb
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
polymer/eduke32/build/src/polymer.c
View file

@ -2842,6 +2842,9 @@ static float calc_ypancoef(char curypanning, int16_t curpicnum, int32_t dopancor
} }
} }
#define NBYTES_WALL_CSTAT_THROUGH_YPANNING \
(offsetof(walltype, ypanning)+sizeof(wall[0].ypanning) - offsetof(walltype, cstat))
static void polymer_updatewall(int16_t wallnum) static void polymer_updatewall(int16_t wallnum)
{ {
int16_t nwallnum, nnwallnum, curpicnum, wallpicnum, walloverpicnum, nwallpicnum; int16_t nwallnum, nnwallnum, curpicnum, wallpicnum, walloverpicnum, nwallpicnum;
@ -2908,7 +2911,7 @@ static void polymer_updatewall(int16_t wallnum)
(w->invalidid == invalid) && (w->invalidid == invalid) &&
(wallpicnum == w->picnum_anim) && (wallpicnum == w->picnum_anim) &&
(walloverpicnum == w->overpicnum_anim) && (walloverpicnum == w->overpicnum_anim) &&
!Bmemcmp(&wal->cstat, &w->cstat, offsetof(walltype, ypanning) - offsetof(walltype, cstat)) && !Bmemcmp(&wal->cstat, &w->cstat, NBYTES_WALL_CSTAT_THROUGH_YPANNING) &&
((nwallnum < 0 || nwallnum > numwalls) || ((nwallnum < 0 || nwallnum > numwalls) ||
((nwallpicnum == w->nwallpicnum) && ((nwallpicnum == w->nwallpicnum) &&
(wall[nwallnum].xpanning == w->nwallxpanning) && (wall[nwallnum].xpanning == w->nwallxpanning) &&
@ -2923,7 +2926,7 @@ static void polymer_updatewall(int16_t wallnum)
{ {
w->invalidid = invalid; w->invalidid = invalid;
Bmemcpy(&w->cstat, &wal->cstat, offsetof(walltype, ypanning) - offsetof(walltype, cstat)); Bmemcpy(&w->cstat, &wal->cstat, NBYTES_WALL_CSTAT_THROUGH_YPANNING);
w->picnum_anim = wallpicnum; w->picnum_anim = wallpicnum;
w->overpicnum_anim = walloverpicnum; w->overpicnum_anim = walloverpicnum;