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

- Exhumed: Replace use of clipmove_old() inline wrapper with clipmove().

Browse source
This commit is contained in:
Mitch Richters 2021-10-30 21:26:42 +11:00 committed by Christoph Oelckers
parent b793bc8327
commit 0ac63fd663
4 changed files with 37 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/exhumed/src/aistuff.h
View file

@ -222,7 +222,7 @@ void Gravity(DExhumedActor* actor);
DExhumedActor* UpdateEnemy(DExhumedActor** ppEnemy);
Collision MoveCreature(DExhumedActor* nSprite);
Collision MoveCreatureWithCaution(DExhumedActor* actor);
void WheresMyMouth(int nPlayer, int *x, int *y, int *z, short *sectnum);
void WheresMyMouth(int nPlayer, vec3_t* pos, short *sectnum);
int GetActorHeight(DExhumedActor* nSprite);
DExhumedActor* insertActor(int, int);
DExhumedActor* GrabBody();

14
source/games/exhumed/src/bubbles.cpp
View file

@ -35,7 +35,7 @@ void DestroyBubble(DExhumedActor* pActor)
DeleteActor(pActor);
}
DExhumedActor* BuildBubble(int x, int y, int z, short nSector)
DExhumedActor* BuildBubble(vec3_t pos, short nSector)
{
int nSize = RandomSize(3);
if (nSize > 4) {
@ -45,9 +45,7 @@ DExhumedActor* BuildBubble(int x, int y, int z, short nSector)
auto pActor = insertActor(nSector, 402);
auto pSprite = &pActor->s();
pSprite->x = x;
pSprite->y = y;
pSprite->z = z;
pSprite->pos = pos;
pSprite->cstat = 0;
pSprite->shade = -32;
pSprite->pal = 0;
@ -131,7 +129,7 @@ void DoBubbleMachines()
pActor->nCount = (RandomWord() % pActor->nFrame) + 30;
auto pSprite = &pActor->s();
BuildBubble(pSprite->x, pSprite->y, pSprite->z, pSprite->sectnum);
BuildBubble(pSprite->pos, pSprite->sectnum);
}
}
}
@ -148,12 +146,12 @@ void BuildBubbleMachine(DExhumedActor* pActor)
void DoBubbles(int nPlayer)
{
int x, y, z;
vec3_t pos;
short nSector;
WheresMyMouth(nPlayer, &x, &y, &z, &nSector);
WheresMyMouth(nPlayer, &pos, &nSector);
auto pActor = BuildBubble(x, y, z, nSector);
auto pActor = BuildBubble(pos, nSector);
pActor->s().hitag = nPlayer;
}
END_PS_NS

59
source/games/exhumed/src/move.cpp
View file

@ -576,7 +576,7 @@ Collision movesprite(DExhumedActor* pActor, int dx, int dy, int dz, int ceildist
CheckSectorFloor(overridesect, pSprite->z, &dx, &dy);
}
int colv = clipmove_old(&pSprite->x, &pSprite->y, &pSprite->z, &nSector, dx, dy, nClipDist, nSpriteHeight, flordist, clipmask);
int colv = clipmove(&pSprite->pos, &nSector, dx, dy, nClipDist, nSpriteHeight, flordist, clipmask);
Collision coll(colv);
if (coll.type != kHitNone) // originally this or'ed the two values which can create unpredictable bad values in some edge cases.
{
@ -940,38 +940,39 @@ void MoveSector(short nSector, int nAngle, int *nXVel, int *nYVel)
BlockInfo *pBlockInfo = &sBlockInfo[nBlock];
int x = sBlockInfo[nBlock].x;
vec3_t pos;
pos.x = sBlockInfo[nBlock].x;
int x_b = sBlockInfo[nBlock].x;
int y = sBlockInfo[nBlock].y;
pos.y = sBlockInfo[nBlock].y;
int y_b = sBlockInfo[nBlock].y;
short nSectorB = nSector;
int nZVal;
int z;
int bUnderwater = nSectFlag & kSectUnderwater;
if (nSectFlag & kSectUnderwater)
{
nZVal = sector[nSector].ceilingz;
z = sector[nNextSector].ceilingz + 256;
pos.z = sector[nNextSector].ceilingz + 256;
sector[nSector].ceilingz = sector[nNextSector].ceilingz;
}
else
{
nZVal = sector[nSector].floorz;
z = sector[nNextSector].floorz - 256;
pos.z = sector[nNextSector].floorz - 256;
sector[nSector].floorz = sector[nNextSector].floorz;
}
clipmove_old((int32_t*)&x, (int32_t*)&y, (int32_t*)&z, &nSectorB, nXVect, nYVect, pBlockInfo->field_8, 0, 0, CLIPMASK1);
clipmove(&pos, &nSectorB, nXVect, nYVect, pBlockInfo->field_8, 0, 0, CLIPMASK1);
int yvect = y - y_b;
int xvect = x - x_b;
int yvect = pos.y - y_b;
int xvect = pos.x - x_b;
if (nSectorB != nNextSector && nSectorB != nSector)
{
@ -982,15 +983,13 @@ void MoveSector(short nSector, int nAngle, int *nXVel, int *nYVel)
{
if (!bUnderwater)
{
z = nZVal;
x = x_b;
y = y_b;
pos = { x_b, y_b, nZVal };
clipmove_old((int32_t*)&x, (int32_t*)&y, (int32_t*)&z, &nSectorB, nXVect, nYVect, pBlockInfo->field_8, 0, 0, CLIPMASK1);
clipmove(&pos, &nSectorB, nXVect, nYVect, pBlockInfo->field_8, 0, 0, CLIPMASK1);
int ebx = x;
int ebx = pos.x;
int ecx = x_b;
int edx = y;
int edx = pos.y;
int eax = xvect;
int esi = y_b;
@ -1044,15 +1043,15 @@ void MoveSector(short nSector, int nAngle, int *nXVel, int *nYVel)
}
else
{
z = sp->z;
pos.z = sp->z;
if ((nSectFlag & kSectUnderwater) || z != nZVal || sp->cstat & 0x8000)
if ((nSectFlag & kSectUnderwater) || pos.z != nZVal || sp->cstat & 0x8000)
{
x = sp->x;
y = sp->y;
pos.x = sp->x;
pos.y = sp->y;
nSectorB = nSector;
clipmove_old(&x, &y, &z, &nSectorB, -xvect, -yvect, 4 * sp->clipdist, 0, 0, CLIPMASK0);
clipmove(&pos, &nSectorB, -xvect, -yvect, 4 * sp->clipdist, 0, 0, CLIPMASK0);
if (nSectorB >= 0 && nSectorB < kMaxSectors && nSectorB != nSector) {
ChangeActorSect(pActor, nSectorB);
@ -1067,12 +1066,10 @@ void MoveSector(short nSector, int nAngle, int *nXVel, int *nYVel)
auto pSprite = &pActor->s();
if (pSprite->statnum >= 99)
{
x = pSprite->x;
y = pSprite->y;
z = pSprite->z;
pos = pSprite->pos;
nSectorB = nNextSector;
clipmove_old((int32_t*)&x, (int32_t*)&y, (int32_t*)&z, &nSectorB,
clipmove(&pos, &nSectorB,
-xvect - (bcos(nAngle) * (4 * pSprite->clipdist)),
-yvect - (bsin(nAngle) * (4 * pSprite->clipdist)),
4 * pSprite->clipdist, 0, 0, CLIPMASK0);
@ -1121,7 +1118,7 @@ void MoveSector(short nSector, int nAngle, int *nXVel, int *nYVel)
if (pSprite->statnum >= 99 && nZVal == pSprite->z && !(pSprite->cstat & 0x8000))
{
nSectorB = nSector;
clipmove_old(&pSprite->x, &pSprite->y, &pSprite->z, &nSectorB, xvect, yvect, 4 * pSprite->clipdist, 5120, -5120, CLIPMASK0);
clipmove(&pSprite->pos, &nSectorB, xvect, yvect, 4 * pSprite->clipdist, 5120, -5120, CLIPMASK0);
}
}
}
@ -1307,20 +1304,18 @@ int GetWallNormal(short nWall)
return (nAngle + 512) & kAngleMask;
}
void WheresMyMouth(int nPlayer, int *x, int *y, int *z, short *sectnum)
void WheresMyMouth(int nPlayer, vec3_t* pos, short *sectnum)
{
auto pActor = PlayerList[nPlayer].Actor();
auto pSprite = &pActor->s();
*x = pSprite->x;
*y = pSprite->y;
int height = GetActorHeight(pActor) >> 1;
int height = GetActorHeight(pActor) / 2;
*z = pSprite->z - height;
*sectnum = pSprite->sectnum;
*pos = pSprite->pos;
pos->z -= height;
clipmove_old((int32_t*)x, (int32_t*)y, (int32_t*)z, sectnum,
clipmove(pos, sectnum,
bcos(pSprite->ang, 7),
bsin(pSprite->ang, 7),
5120, 1280, 1280, CLIPMASK1);

6
source/games/exhumed/src/player.cpp
View file

@ -2538,11 +2538,11 @@ sectdone:
if (!RandomSize(5))
{
int mouthX, mouthY, mouthZ;
vec3_t pos;
short mouthSect;
WheresMyMouth(nPlayer, &mouthX, &mouthY, &mouthZ, &mouthSect);
WheresMyMouth(nPlayer, &pos, &mouthSect);
BuildAnim(nullptr, 71, 0, mouthX, mouthY, pPlayerSprite->z + 3840, mouthSect, 75, 128);
BuildAnim(nullptr, 71, 0, pos.x, pos.y, pPlayerSprite->z + 3840, mouthSect, 75, 128);
}
break;
case 17: