zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- MoveDude

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-24 00:16:02 +01:00
parent 6ee9ae7ec6
commit 611d35222e
4 changed files with 60 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
source/games/blood/src/actor.cpp
View file

@ -4821,10 +4821,10 @@ void MoveDude(DBloodActor* actor)
int bz = (bottom - pSprite->z) / 4;
int tz = (pSprite->z - top) / 4;
int wd = pSprite->clipdist << 2;
int nSector = pSprite->sectnum;
auto pSector = pSprite->sector();
int nAiStateType = (pXSprite->aiState) ? pXSprite->aiState->stateType : -1;
assert(validSectorIndex(nSector));
assert(pSector);
if (actor->xvel || actor->yvel)
{
@ -4832,30 +4832,30 @@ void MoveDude(DBloodActor* actor)
{
pSprite->x += actor->xvel >> 12;
pSprite->y += actor->yvel >> 12;
if (!FindSector(pSprite->x, pSprite->y, &nSector))
nSector = pSprite->sectnum;
if (!FindSector(pSprite->x, pSprite->y, &pSector))
pSector = pSprite->sector();
}
else
{
auto bakCstat = pSprite->cstat;
pSprite->cstat &= ~257;
actor->hit.hit = ClipMove(&pSprite->pos, &nSector, actor->xvel >> 12, actor->yvel >> 12, wd, tz, bz, CLIPMASK0);
if (nSector == -1)
actor->hit.hit = ClipMove(&pSprite->pos, &pSector, actor->xvel >> 12, actor->yvel >> 12, wd, tz, bz, CLIPMASK0);
if (pSector == nullptr)
{
nSector = pSprite->sectnum;
pSector = pSprite->sector();
if (pSprite->statnum == kStatDude || pSprite->statnum == kStatThing)
actDamageSprite(actor, actor, kDamageFall, 1000 << 4);
}
if (sector[nSector].type >= kSectorPath && sector[nSector].type <= kSectorRotate)
if (pSector->type >= kSectorPath && pSector->type <= kSectorRotate)
{
int nSector2 = nSector;
if (pushmove(&pSprite->pos, &nSector2, wd, tz, bz, CLIPMASK0) == -1)
auto pSector2 = pSector;
if (pushmove(&pSprite->pos, &pSector2, wd, tz, bz, CLIPMASK0) == -1)
actDamageSprite(actor, actor, kDamageFall, 1000 << 4);
if (nSector2 != -1)
nSector = nSector2;
if (pSector2 != nullptr)
pSector = pSector2;
}
assert(nSector >= 0);
assert(pSector);
pSprite->cstat = bakCstat;
}
const Collision& coll = actor->hit.hit;
@ -4917,14 +4917,13 @@ void MoveDude(DBloodActor* actor)
}
else
{
assert(validSectorIndex(nSector));
FindSector(pSprite->x, pSprite->y, pSprite->z, &nSector);
assert(pSector);
FindSector(pSprite->x, pSprite->y, pSprite->z, &pSector);
}
auto pSector = &sector[nSector];
XSECTOR* pXSector = pSector->hasX() ? &pSector->xs() : nullptr;
if (pSprite->sectnum != nSector)
if (pSprite->sector() != pSector)
{
assert(validSectorIndex(pSprite->sectnum));
auto pOldSector = pSprite->sector();
@ -4932,7 +4931,7 @@ void MoveDude(DBloodActor* actor)
if (pXOldSector && pXOldSector->Exit && (pPlayer || !pXOldSector->dudeLockout))
trTriggerSector(pOldSector, kCmdSectorExit);
ChangeActorSect(actor, nSector);
ChangeActorSect(actor, pSector);
if (pXSector && pXSector->Enter && (pPlayer || !pXSector->dudeLockout))
{
@ -4941,7 +4940,7 @@ void MoveDude(DBloodActor* actor)
trTriggerSector(pSector, kCmdSectorEnter);
}
nSector = pSprite->sectnum;
pSector = pSprite->sector();
}
int bUnderwater = 0;
int bDepth = 0;
@ -4950,8 +4949,8 @@ void MoveDude(DBloodActor* actor)
if (pXSector->Underwater) bUnderwater = 1;
if (pXSector->Depth) bDepth = 1;
}
auto pUpperLink = getUpperLink(nSector);
auto pLowerLink = getLowerLink(nSector);
auto pUpperLink = pSector->upperLink;
auto pLowerLink = pSector->lowerLink;
if (pUpperLink && (pUpperLink->s().type == kMarkerUpWater || pUpperLink->s().type == kMarkerUpGoo)) bDepth = 1;
if (pLowerLink && (pLowerLink->s().type == kMarkerLowWater || pLowerLink->s().type == kMarkerLowGoo)) bDepth = 1;
if (pPlayer) wd += 16;
@ -4969,7 +4968,7 @@ void MoveDude(DBloodActor* actor)
{
if (bUnderwater)
{
int cz = getceilzofslope(nSector, pSprite->x, pSprite->y);
int cz = getceilzofslopeptr(pSector, pSprite->x, pSprite->y);
if (cz > top)
vc += ((bottom - cz) * -80099) / (bottom - top);
else
@ -4977,7 +4976,7 @@ void MoveDude(DBloodActor* actor)
}
else
{
int fz = getflorzofslope(nSector, pSprite->x, pSprite->y);
int fz = getflorzofslopeptr(pSector, pSprite->x, pSprite->y);
if (fz < bottom)
vc += ((bottom - fz) * -80099) / (bottom - top);
}
@ -5076,7 +5075,7 @@ void MoveDude(DBloodActor* actor)
if (gModernMap)
{
pPlayer->nWaterPal = 0;
auto pUpper = getUpperLink(nSector);
auto pUpper = pSector->upperLink;
if (pUpper && pUpper->hasX()) pPlayer->nWaterPal = pUpper->x().data2;
}
#endif

5
source/games/blood/src/bloodactor.h
View file

@ -377,6 +377,11 @@ inline void ChangeActorSect(DBloodActor* actor, int stat)
ChangeSpriteSect(actor->GetSpriteIndex(), stat);
}
inline void ChangeActorSect(DBloodActor* actor, sectortype* stat)
{
ChangeSpriteSect(actor->GetSpriteIndex(), sectnum(stat));
}
inline int Collision::actorIndex(DBloodActor* actor)
{
return int(actor - bloodActors);

16
source/games/blood/src/gameutil.cpp
View file

@ -712,6 +712,22 @@ unsigned int ClipMove(vec3_t *pos, int *nSector, int xv, int yv, int wd, int cd,
return nRes;
}
unsigned int ClipMove(vec3_t* pos, sectortype** pSector, int xv, int yv, int wd, int cd, int fd, unsigned int nMask, int tracecount)
{
auto opos = *pos;
sectortype* bakSect = *pSector;
unsigned int nRes = clipmove(pos, &bakSect, xv << 14, yv << 14, wd, cd, fd, nMask, tracecount);
if (bakSect == nullptr)
{
*pos = opos;
}
else
{
*pSector = bakSect;
}
return nRes;
}
BitArray GetClosestSpriteSectors(int nSector, int x, int y, int nDist, TArray<walltype*>* pWalls, bool newSectCheckMethod)
{
// by default this function fails with sectors that linked with wide spans, or there was more than one link to the same sector. for example...

17
source/games/blood/src/gameutil.h
View file

@ -53,7 +53,21 @@ enum {
struct Collision;
bool FindSector(int nX, int nY, int nZ, int *nSector);
inline bool FindSector(int nX, int nY, int nZ, sectortype** ppSector)
{
int n = sectnum(*ppSector);
bool res = FindSector(nX, nY, nZ, &n);
*ppSector = &sector[n];
return res;
}
bool FindSector(int nX, int nY, int *nSector);
inline bool FindSector(int nX, int nY, sectortype** ppSector)
{
int n = sectnum(*ppSector);
bool res = FindSector(nX, nY, &n);
*ppSector = &sector[n];
return res;
}
bool CheckProximity(DBloodActor *pSprite, int nX, int nY, int nZ, int nSector, int nDist);
bool CheckProximityPoint(int nX1, int nY1, int nZ1, int nX2, int nY2, int nZ2, int nDist);
bool CheckProximityWall(walltype* pWall, int x, int y, int nDist);
@ -65,7 +79,8 @@ int VectorScan(DBloodActor *pSprite, int nOffset, int nZOffset, int dx, int dy,
void GetZRange(DBloodActor *pSprite, int *ceilZ, Collision *ceilHit, int *floorZ, Collision *floorHit, int nDist, unsigned int nMask, unsigned int nClipParallax = 0);
void GetZRangeAtXYZ(int x, int y, int z, int nSector, int *ceilZ, Collision *ceilHit, int *floorZ, Collision *floorHit, int nDist, unsigned int nMask, unsigned int nClipParallax = 0);
int GetDistToLine(int x1, int y1, int x2, int y2, int x3, int y3);
unsigned int ClipMove(vec3_t* pos, int *nSector, int xv, int yv, int wd, int cd, int fd, unsigned int nMask, int tracecount = 3);
[[deprecated]] unsigned int ClipMove(vec3_t* pos, int *nSector, int xv, int yv, int wd, int cd, int fd, unsigned int nMask, int tracecount = 3);
unsigned int ClipMove(vec3_t* pos, sectortype** pSector, int xv, int yv, int wd, int cd, int fd, unsigned int nMask, int tracecount = 3);
BitArray GetClosestSpriteSectors(int nSector, int x, int y, int nDist, TArray<walltype*>* pWalls, bool newSectCheckMethod = false);
int picWidth(int nPic, int repeat);
int picHeight(int nPic, int repeat);