zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

E1L2 door fix.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1286 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2009-03-29 19:31:24 +00:00
parent 3d6b06e958
commit 74a9338243
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2041,7 +2041,7 @@ static void polymer_updatewall(int16_t wallnum)
else else
xref = 0; xref = 0;
if ((wal->nextsector == -1) || (wal->cstat & 32)) if (wal->nextsector == -1)
{ {
memcpy(w->wall.buffer, &s->floor.buffer[(wallnum - sec->wallptr) * 5], sizeof(GLfloat) * 3); memcpy(w->wall.buffer, &s->floor.buffer[(wallnum - sec->wallptr) * 5], sizeof(GLfloat) * 3);
memcpy(&w->wall.buffer[5], &s->floor.buffer[(wal->point2 - sec->wallptr) * 5], sizeof(GLfloat) * 3); memcpy(&w->wall.buffer[5], &s->floor.buffer[(wal->point2 - sec->wallptr) * 5], sizeof(GLfloat) * 3);
@ -2106,7 +2106,7 @@ static void polymer_updatewall(int16_t wallnum)
(s->floor.buffer[((wal->point2 - sec->wallptr) * 5) + 1] <= ns->floor.buffer[((nwallnum - nsec->wallptr) * 5) + 1]))) (s->floor.buffer[((wal->point2 - sec->wallptr) * 5) + 1] <= ns->floor.buffer[((nwallnum - nsec->wallptr) * 5) + 1])))
underwall = 1; underwall = 1;
if ((underwall) || (wal->cstat & 16)) if ((underwall) || (wal->cstat & 16) || (wal->cstat & 32))
{ {
memcpy(w->wall.buffer, &s->floor.buffer[(wallnum - sec->wallptr) * 5], sizeof(GLfloat) * 3); memcpy(w->wall.buffer, &s->floor.buffer[(wallnum - sec->wallptr) * 5], sizeof(GLfloat) * 3);
memcpy(&w->wall.buffer[5], &s->floor.buffer[(wal->point2 - sec->wallptr) * 5], sizeof(GLfloat) * 3); memcpy(&w->wall.buffer[5], &s->floor.buffer[(wal->point2 - sec->wallptr) * 5], sizeof(GLfloat) * 3);
@ -2184,7 +2184,7 @@ static void polymer_updatewall(int16_t wallnum)
(s->ceil.buffer[((wal->point2 - sec->wallptr) * 5) + 1] >= ns->ceil.buffer[((nwallnum - nsec->wallptr) * 5) + 1]))) (s->ceil.buffer[((wal->point2 - sec->wallptr) * 5) + 1] >= ns->ceil.buffer[((nwallnum - nsec->wallptr) * 5) + 1])))
overwall = 1; overwall = 1;
if ((overwall) || (wal->cstat & 16)) if ((overwall) || (wal->cstat & 16) || (wal->cstat & 32))
{ {
if (w->over.buffer == NULL) { if (w->over.buffer == NULL) {
w->over.buffer = calloc(4, sizeof(GLfloat) * 5); w->over.buffer = calloc(4, sizeof(GLfloat) * 5);
@ -2203,7 +2203,7 @@ static void polymer_updatewall(int16_t wallnum)
polymer_getbuildmaterial(&w->over.material, curpicnum, wal->pal, wal->shade); polymer_getbuildmaterial(&w->over.material, curpicnum, wal->pal, wal->shade);
if (wal->cstat & 16) if ((wal->cstat & 16) || (wal->cstat & 32))
{ {
// mask // mask
polymer_getbuildmaterial(&w->mask.material, walloverpicnum, wal->pal, wal->shade); polymer_getbuildmaterial(&w->mask.material, walloverpicnum, wal->pal, wal->shade);
@ -2256,7 +2256,7 @@ static void polymer_updatewall(int16_t wallnum)
memcpy(&w->mask.buffer[10], &w->over.buffer[5], sizeof(GLfloat) * 5); memcpy(&w->mask.buffer[10], &w->over.buffer[5], sizeof(GLfloat) * 5);
memcpy(&w->mask.buffer[15], &w->over.buffer[0], sizeof(GLfloat) * 5); memcpy(&w->mask.buffer[15], &w->over.buffer[0], sizeof(GLfloat) * 5);
if (wal->cstat & 16) if ((wal->cstat & 16) || (wal->cstat & 32))
{ {
// mask wall pass // mask wall pass
if (wal->cstat & 4) if (wal->cstat & 4)
@ -2264,6 +2264,14 @@ static void polymer_updatewall(int16_t wallnum)
else else
yref = max(sec->ceilingz, nsec->ceilingz); yref = max(sec->ceilingz, nsec->ceilingz);
if (wal->cstat & 32)
{
if ((!(wal->cstat & 2) && (wal->cstat & 4)) || ((wal->cstat & 2) && (wall[nwallnum].cstat & 4)))
yref = sec->ceilingz;
else
yref = nsec->ceilingz;
}
curpicnum = walloverpicnum; curpicnum = walloverpicnum;
if (wal->ypanning) if (wal->ypanning)
@ -2300,7 +2308,7 @@ static void polymer_updatewall(int16_t wallnum)
} }
} }
if ((wal->nextsector == -1) || (wal->cstat & 32)) if (wal->nextsector == -1)
memcpy(w->mask.buffer, w->wall.buffer, sizeof(GLfloat) * 4 * 5); memcpy(w->mask.buffer, w->wall.buffer, sizeof(GLfloat) * 4 * 5);
memcpy(w->bigportal, &s->floor.buffer[(wallnum - sec->wallptr) * 5], sizeof(GLfloat) * 3); memcpy(w->bigportal, &s->floor.buffer[(wallnum - sec->wallptr) * 5], sizeof(GLfloat) * 3);
@ -2358,6 +2366,9 @@ static void polymer_drawwall(int16_t sectnum, int16_t wallnum)
polymer_drawplane(&w->over); polymer_drawplane(&w->over);
} }
if (wall[wallnum].cstat & 32)
polymer_drawplane(&w->mask);
if ((sector[sectnum].ceilingstat & 1) && if ((sector[sectnum].ceilingstat & 1) &&
((wall[wallnum].nextsector == -1) || ((wall[wallnum].nextsector == -1) ||
!(sector[wall[wallnum].nextsector].ceilingstat & 1))) !(sector[wall[wallnum].nextsector].ceilingstat & 1)))