From 9000e236832427952840a8a330644aa4155bf016 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Mon, 9 Jul 2012 19:00:21 +0000 Subject: [PATCH] Polymer: simplify some code while I'm at it (equivalence tranformations only) git-svn-id: https://svn.eduke32.com/eduke32@2823 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/polymer.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/polymer/eduke32/build/src/polymer.c b/polymer/eduke32/build/src/polymer.c index cd40f2cbe..c2d2dffd1 100644 --- a/polymer/eduke32/build/src/polymer.c +++ b/polymer/eduke32/build/src/polymer.c @@ -2926,32 +2926,22 @@ static void polymer_updatewall(int16_t wallnum) Bmemcpy(&w->wall.buffer[15], &ns->floor.buffer[(nnwallnum - nsec->wallptr) * 5], sizeof(GLfloat) * 3); if (wal->cstat & 2) - { - curpicnum = nwallpicnum; - curpal = wall[nwallnum].pal; - curshade = wall[nwallnum].shade; - curxpanning = wall[nwallnum].xpanning; - curypanning = wall[nwallnum].ypanning; - refwall = nwallnum; - } else - { - curpicnum = wallpicnum; - curpal = wal->pal; - curshade = wal->shade; - curxpanning = wal->xpanning; - curypanning = wal->ypanning; - refwall = wallnum; - } + + curpicnum = wall[refwall].picnum; + curpal = wall[refwall].pal; + curshade = wall[refwall].shade; + curxpanning = wall[refwall].xpanning; + curypanning = wall[refwall].ypanning; polymer_getbuildmaterial(&w->wall.material, curpicnum, curpal, curshade, 0); - if ((!(wal->cstat & 2) && (wal->cstat & 4)) || ((wal->cstat & 2) && (wall[nwallnum].cstat & 4))) - yref = sec->ceilingz; - else + if (!(wall[refwall].cstat&4)) yref = nsec->floorz; + else + yref = sec->ceilingz; if (curypanning) // under