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

Finally Duke's DEMO1 is sync

Browse source
This commit is contained in:
nukeykt 2019-07-30 00:12:01 +09:00 committed by Christoph Oelckers
parent 05749679a8
commit af2106c9d0
2 changed files with 89 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/build/src/clip.cpp
View file

@ -1663,6 +1663,7 @@ void getzrange(const vec3_t *pos, int16_t sectnum,
const int32_t dasprclipmask = (cliptype>>16); const int32_t dasprclipmask = (cliptype>>16);
vec2_t closest = { pos->x, pos->y }; vec2_t closest = { pos->x, pos->y };
if (!blooddemohack)
getsectordist(closest, sectnum, &closest); getsectordist(closest, sectnum, &closest);
getzsofslope(sectnum,closest.x,closest.y,ceilz,florz); getzsofslope(sectnum,closest.x,closest.y,ceilz,florz);
*ceilhit = sectnum+16384; *florhit = sectnum+16384; *ceilhit = sectnum+16384; *florhit = sectnum+16384;
@ -2007,6 +2008,7 @@ restart_grand:
addclipsect(j); addclipsect(j);
closest = { pos->x, pos->y }; closest = { pos->x, pos->y };
if (!blooddemohack)
getsectordist(closest, j, &closest); getsectordist(closest, j, &closest);
int const daz = getceilzofslope(j, closest.x, closest.y); int const daz = getceilzofslope(j, closest.x, closest.y);
@ -2047,6 +2049,7 @@ restart_grand:
addclipsect(j); addclipsect(j);
closest = { pos->x, pos->y }; closest = { pos->x, pos->y };
if (!blooddemohack)
getsectordist(closest, j, &closest); getsectordist(closest, j, &closest);
int const daz = getflorzofslope(j, closest.x,closest.y); int const daz = getflorzofslope(j, closest.x,closest.y);

75
source/build/src/engine.cpp
View file

@ -11513,10 +11513,33 @@ int findwallbetweensectors(int sect1, int sect2)
// //
void updatesector(int32_t const x, int32_t const y, int16_t * const sectnum) void updatesector(int32_t const x, int32_t const y, int16_t * const sectnum)
{ {
if (blooddemohack)
{
if (inside_p(x, y, *sectnum))
return;
if ((unsigned)*sectnum < (unsigned)numsectors)
{
const uwalltype *wal = (uwalltype *)&wall[sector[*sectnum].wallptr];
int wallsleft = sector[*sectnum].wallnum;
do
{
int const next = wal->nextsector;
if (inside_p(x, y, next))
SET_AND_RETURN(*sectnum, next);
wal++;
}
while (--wallsleft);
}
}
else
{
int16_t sect = *sectnum; int16_t sect = *sectnum;
updatesectorneighbor(x, y, &sect, INITIALUPDATESECTORDIST, MAXUPDATESECTORDIST); updatesectorneighbor(x, y, &sect, INITIALUPDATESECTORDIST, MAXUPDATESECTORDIST);
if (sect != -1) if (sect != -1)
SET_AND_RETURN(*sectnum, sect); SET_AND_RETURN(*sectnum, sect);
}
// we need to support passing in a sectnum of -1, unfortunately // we need to support passing in a sectnum of -1, unfortunately
@ -11560,10 +11583,62 @@ void updatesectorexclude(int32_t const x, int32_t const y, int16_t * const sectn
void updatesectorz(int32_t const x, int32_t const y, int32_t const z, int16_t * const sectnum) void updatesectorz(int32_t const x, int32_t const y, int32_t const z, int16_t * const sectnum)
{ {
if (blooddemohack)
{
if ((uint32_t)(*sectnum) < 2*MAXSECTORS)
{
int32_t nofirstzcheck = 0;
if (*sectnum >= MAXSECTORS)
{
*sectnum -= MAXSECTORS;
nofirstzcheck = 1;
}
// this block used to be outside the "if" and caused crashes in Polymost Mapster32
int32_t cz, fz;
getzsofslope(*sectnum, x, y, &cz, &fz);
#ifdef YAX_ENABLE
if (z < cz)
{
int const next = yax_getneighborsect(x, y, *sectnum, YAX_CEILING);
if (next >= 0 && z >= getceilzofslope(next, x, y))
SET_AND_RETURN(*sectnum, next);
}
if (z > fz)
{
int const next = yax_getneighborsect(x, y, *sectnum, YAX_FLOOR);
if (next >= 0 && z <= getflorzofslope(next, x, y))
SET_AND_RETURN(*sectnum, next);
}
#endif
if (nofirstzcheck || (z >= cz && z <= fz))
if (inside_p(x, y, *sectnum))
return;
uwalltype const * wal = (uwalltype *)&wall[sector[*sectnum].wallptr];
int wallsleft = sector[*sectnum].wallnum;
do
{
// YAX: TODO: check neighboring sectors here too?
int const next = wal->nextsector;
if (next>=0 && inside_z_p(x,y,z, next))
SET_AND_RETURN(*sectnum, next);
wal++;
}
while (--wallsleft);
}
}
else
{
int16_t sect = *sectnum; int16_t sect = *sectnum;
updatesectorneighborz(x, y, z, &sect, INITIALUPDATESECTORDIST, MAXUPDATESECTORDIST); updatesectorneighborz(x, y, z, &sect, INITIALUPDATESECTORDIST, MAXUPDATESECTORDIST);
if (sect != -1) if (sect != -1)
SET_AND_RETURN(*sectnum, sect); SET_AND_RETURN(*sectnum, sect);
}
// we need to support passing in a sectnum of -1, unfortunately // we need to support passing in a sectnum of -1, unfortunately
for (int i = numsectors - 1; i >= 0; --i) for (int i = numsectors - 1; i >= 0; --i)