teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Assignments

Browse source 
# Conflicts:
#	source/build/src/clip.cpp
This commit is contained in:
Richard C. Gobeille 2020-06-02 04:32:37 -07:00 committed by Christoph Oelckers
parent 9fc5f2d2e7
commit a0876223ab
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1724,7 +1724,7 @@ void getzrange(const vec3_t *pos, int16_t sectnum,
const int32_t dawalclipmask = (cliptype&65535);
const int32_t dasprclipmask = (cliptype>>16);
vec2_t closest = { pos->x, pos->y };
vec2_t closest = pos->vec2;
if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE)
getsectordist(closest, sectnum, &closest);
if (enginecompatibility_mode == ENGINECOMPATIBILITY_19950829)
@ -1786,13 +1786,13 @@ restart_grand:
continue;
int32_t daz, daz2;
closest = { pos->x, pos->y };
closest = pos->vec2;
if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE)
getsectordist(closest, k, &closest);
getzsofslope(k,closest.x,closest.y,&daz,&daz2);
int32_t fz, cz;
closest = { pos->x, pos->y };
closest = pos->vec2;
if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE)
getsectordist(closest, sectq[clipinfo[curidx].qend], &closest);
getzsofslope(sectq[clipinfo[curidx].qend],closest.x,closest.y,&cz,&fz);
@ -1878,7 +1878,7 @@ restart_grand:
#endif
//It actually got here, through all the continue's!!!
int32_t daz, daz2;
closest = { pos->x, pos->y };
closest = pos->vec2;
if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE)
getsectordist(closest, k, &closest);
if (enginecompatibility_mode == ENGINECOMPATIBILITY_19950829)
@ -1894,7 +1894,7 @@ restart_grand:
{
int32_t fz,cz, hitwhat=(curspr-(uspritetype *)sprite)+49152;
closest = { pos->x, pos->y };
closest = pos->vec2;
if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE)
getsectordist(closest, sectq[clipinfo[curidx].qend], &closest);
getzsofslope(sectq[clipinfo[curidx].qend],closest.x,closest.y,&cz,&fz);
@ -2081,7 +2081,7 @@ restart_grand:
{
addclipsect(j);
closest = { pos->x, pos->y };
closest = pos->vec2;
if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE)
getsectordist(closest, j, &closest);
int const daz = getceilzofslope(j, closest.x, closest.y);
@ -2122,7 +2122,7 @@ restart_grand:
{
addclipsect(j);
closest = { pos->x, pos->y };
closest = pos->vec2;
if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE)
getsectordist(closest, j, &closest);
int const daz = getflorzofslope(j, closest.x,closest.y);

3
source/duke3d/src/gameexec.cpp
View file

@ -3113,8 +3113,7 @@ badindex:
{
// else, they did see it.
// save where we were looking...
vm.pActor->lastv.x = pSprite->x;
vm.pActor->lastv.y = pSprite->y;
vm.pActor->lastv = pSprite->pos.vec2;
}
if (tw && (vm.pSprite->statnum == STAT_ACTOR || vm.pSprite->statnum == STAT_STANDABLE))