From 3a7ed49c9a8a9550a335435c6ccb0c3c0c6bc6d5 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sat, 31 Oct 2015 19:35:25 +0000 Subject: [PATCH] Mapster32: various stylistic tweaks, no functional changes. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@5413 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/build.c | 16 +++++++--------- polymer/eduke32/build/src/engine.c | 15 ++++++++------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c index ae1a8223b..1987791c2 100644 --- a/polymer/eduke32/build/src/build.c +++ b/polymer/eduke32/build/src/build.c @@ -5169,16 +5169,14 @@ end_yax: ; } } #ifdef YAX_ENABLE - { - int16_t cb, fb; + int16_t cb, fb; - yax_getbunches(highlightsector[i], &cb, &fb); - if (cb>=0 || fb>=0) - { - // TROR stuff in the pasted sectors would really - // complicate things, so don't allow this - didmakered=1; - } + yax_getbunches(highlightsector[i], &cb, &fb); + if (cb>=0 || fb>=0) + { + // TROR stuff in the pasted sectors would really + // complicate things, so don't allow this + didmakered=1; } #endif } diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index d6f174db5..f730f74ba 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -331,7 +331,7 @@ int32_t get_alwaysshowgray(void) void yax_updategrays(int32_t posze) { - int32_t i, j, k=1; + int32_t i, j; #ifdef YAX_ENABLE int32_t mingoodz=INT32_MAX, maxgoodz=INT32_MIN; #else @@ -345,11 +345,12 @@ void yax_updategrays(int32_t posze) { #ifdef YAX_ENABLE int16_t 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 - k = ((cb<0 || sector[i].ceilingz < posze) && (fb<0 || posze <= sector[i].floorz)); + + // Update grayouts due to TROR, has to be --v-- half-open --v-- + // 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)) { mingoodz = min(mingoodz, sector[i].ceilingz); @@ -357,9 +358,9 @@ void yax_updategrays(int32_t posze) } #endif // 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)); }