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
This commit is contained in:
helixhorned 2012-07-09 19:00:21 +00:00
parent d66856eeea
commit 9000e23683
1 changed files with 9 additions and 19 deletions

View File

@ -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); Bmemcpy(&w->wall.buffer[15], &ns->floor.buffer[(nnwallnum - nsec->wallptr) * 5], sizeof(GLfloat) * 3);
if (wal->cstat & 2) if (wal->cstat & 2)
{
curpicnum = nwallpicnum;
curpal = wall[nwallnum].pal;
curshade = wall[nwallnum].shade;
curxpanning = wall[nwallnum].xpanning;
curypanning = wall[nwallnum].ypanning;
refwall = nwallnum; refwall = nwallnum;
}
else else
{
curpicnum = wallpicnum;
curpal = wal->pal;
curshade = wal->shade;
curxpanning = wal->xpanning;
curypanning = wal->ypanning;
refwall = wallnum; 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); polymer_getbuildmaterial(&w->wall.material, curpicnum, curpal, curshade, 0);
if ((!(wal->cstat & 2) && (wal->cstat & 4)) || ((wal->cstat & 2) && (wall[nwallnum].cstat & 4))) if (!(wall[refwall].cstat&4))
yref = sec->ceilingz;
else
yref = nsec->floorz; yref = nsec->floorz;
else
yref = sec->ceilingz;
if (curypanning) if (curypanning)
// under // under