zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mapster32: various stylistic tweaks, no functional changes. DONT_BUILD.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5413 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-10-31 19:35:25 +00:00
parent 8f5c6ab05a
commit 3a7ed49c9a
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5169,16 +5169,14 @@ end_yax: ;
} }
} }
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
{ int16_t cb, fb;
int16_t cb, fb;
yax_getbunches(highlightsector[i], &cb, &fb); yax_getbunches(highlightsector[i], &cb, &fb);
if (cb>=0 || fb>=0) if (cb>=0 || fb>=0)
{ {
// TROR stuff in the pasted sectors would really // TROR stuff in the pasted sectors would really
// complicate things, so don't allow this // complicate things, so don't allow this
didmakered=1; didmakered=1;
}
} }
#endif #endif
} }

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

@ -331,7 +331,7 @@ int32_t get_alwaysshowgray(void)
void yax_updategrays(int32_t posze) void yax_updategrays(int32_t posze)
{ {
int32_t i, j, k=1; int32_t i, j;
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
int32_t mingoodz=INT32_MAX, maxgoodz=INT32_MIN; int32_t mingoodz=INT32_MAX, maxgoodz=INT32_MIN;
#else #else
@ -345,11 +345,12 @@ void yax_updategrays(int32_t posze)
{ {
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
int16_t cb, fb; int16_t cb, fb;
yax_getbunches(i, &cb, &fb); yax_getbunches(i, &cb, &fb);
// update grayouts due to yax --v-- has to be half-open --v--
// because only one level should v be ever active v // Update grayouts due to TROR, has to be --v-- half-open --v--
k = ((cb<0 || sector[i].ceilingz < posze) && (fb<0 || posze <= sector[i].floorz)); // because only one level should ever be v v
// active. v v
int32_t keep = ((cb<0 || sector[i].ceilingz < posze) && (fb<0 || posze <= sector[i].floorz));
if (autogray && (cb>=0 || fb>=0) && (sector[i].ceilingz <= posze && posze <= sector[i].floorz)) if (autogray && (cb>=0 || fb>=0) && (sector[i].ceilingz <= posze && posze <= sector[i].floorz))
{ {
mingoodz = min(mingoodz, sector[i].ceilingz); mingoodz = min(mingoodz, sector[i].ceilingz);
@ -357,9 +358,9 @@ void yax_updategrays(int32_t posze)
} }
#endif #endif
// update grayouts due to editorzrange // update grayouts due to editorzrange
k &= (sector[i].ceilingz >= editorzrange[0] && sector[i].floorz <= editorzrange[1]); keep &= (sector[i].ceilingz >= editorzrange[0] && sector[i].floorz <= editorzrange[1]);
if (!k) // outside bounds, gray out! if (!keep) // outside bounds, gray out!
graysectbitmap[i>>3] |= (1<<(i&7)); graysectbitmap[i>>3] |= (1<<(i&7));
} }