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

fix highlighted sector deleting and probably a couple of other inconsistencies stemming from that bug 

git-svn-id: https://svn.eduke32.com/eduke32@1922 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-06-26 23:29:51 +00:00
parent 83ab50d66e
commit 87f726bfd7
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
polymer/eduke32/build/src/build.c
View File

@ -5918,9 +5918,7 @@ end_space_handling:
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
int16_t cb, fb; int16_t cb, fb;
uint8_t bunchbitmap[YAX_MAXBUNCHES>>3];
// used as a bunch bitmap here
Bmemset(hlsectorbitmap, 0, sizeof(hlsectorbitmap));
#endif #endif
keystatus[0xd3] = 0; keystatus[0xd3] = 0;
@ -5952,8 +5950,8 @@ end_space_handling:
{ {
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
yax_getbunches(highlightsector[j], &cb, &fb); yax_getbunches(highlightsector[j], &cb, &fb);
if (cb>=0) hlsectorbitmap[cb>>3] |= (1<<(cb&7)); if (cb>=0) bunchbitmap[cb>>3] |= (1<<(cb&7));
if (fb>=0) hlsectorbitmap[fb>>3] |= (1<<(fb&7)); if (fb>=0) bunchbitmap[fb>>3] |= (1<<(fb&7));
#endif #endif
deletesector(highlightsector[j]); deletesector(highlightsector[j]);
for (k=j-1; k>=0; k--) for (k=j-1; k>=0; k--)
@ -5998,8 +5996,8 @@ end_space_handling:
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
yax_getbunches(i, &cb, &fb); yax_getbunches(i, &cb, &fb);
if (cb>=0) hlsectorbitmap[cb>>3] |= (1<<(cb&7)); if (cb>=0) bunchbitmap[cb>>3] |= (1<<(cb&7));
if (fb>=0) hlsectorbitmap[fb>>3] |= (1<<(fb&7)); if (fb>=0) bunchbitmap[fb>>3] |= (1<<(fb&7));
#endif #endif
deletesector(i); deletesector(i);
mkonwinvalid(); mkonwinvalid();
@ -6013,9 +6011,9 @@ end_space_handling:
for (j=0; j<numsectors; j++) for (j=0; j<numsectors; j++)
{ {
yax_getbunches(j, &cb, &fb); yax_getbunches(j, &cb, &fb);
if (hlsectorbitmap[cb>>3] & (1<<(cb&7))) if (bunchbitmap[cb>>3] & (1<<(cb&7)))
yax_setbunch(j, YAX_CEILING, -1); yax_setbunch(j, YAX_CEILING, -1);
if (hlsectorbitmap[fb>>3] & (1<<(fb&7))) if (bunchbitmap[fb>>3] & (1<<(fb&7)))
yax_setbunch(j, YAX_FLOOR, -1); yax_setbunch(j, YAX_FLOOR, -1);
} }
#endif #endif