teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-05 07:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- MoveSector et.al.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-22 21:03:10 +01:00
parent 0b254255e2
commit 5e01841f1e
9 changed files with 71 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/core/gamefuncs.h
View file

@ -336,6 +336,15 @@ inline void dragpoint(walltype* pointhighlight, int32_t dax, int32_t day)
dragpoint(wallnum(pointhighlight), dax, day);
}
inline int32_t clipmove(vec3_t* const pos, sectortype** const sect, int32_t xvect, int32_t yvect,
int32_t const walldist, int32_t const ceildist, int32_t const flordist, uint32_t const cliptype, int clipmoveboxtracenum = 3)
{
int sectno = *sect ? sector.IndexOf(*sect) : -1;
int res = clipmove(pos, &sectno, xvect, yvect, walldist, ceildist, flordist, cliptype, clipmoveboxtracenum);
*sect = sectno == -1 ? nullptr : &sector[sectno];
return res;
}
inline int pushmove(vec3_t *const vect, sectortype**const sect, int32_t const walldist, int32_t const ceildist, int32_t const flordist,
uint32_t const cliptype, bool clear = true)
{

10
source/core/interpolate.cpp
View file

@ -178,9 +178,9 @@ void ClearMovementInterpolations()
}
}
void setsectinterpolate(int sectnum)
void setsectinterpolate(sectortype* sect)
{
for (auto&wal : wallsofsector(sectnum))
for (auto&wal : wallsofsector(sect))
{
StartInterpolation(&wal, Interp_Wall_X);
StartInterpolation(&wal, Interp_Wall_Y);
@ -196,11 +196,9 @@ void setsectinterpolate(int sectnum)
}
}
void clearsectinterpolate(int sectnum)
void clearsectinterpolate(sectortype* sect)
{
auto sect = &sector[sectnum];
for (auto& wal : wallsofsector(sectnum))
for (auto& wal : wallsofsector(sect))
{
StopInterpolation(&wal, Interp_Wall_X);
StopInterpolation(&wal, Interp_Wall_Y);

4
source/core/interpolate.h
View file

@ -31,8 +31,8 @@ void ClearMovementInterpolations();
void DoInterpolations(double smoothratio);
void RestoreInterpolations();
void SerializeInterpolations(FSerializer& arc);
void clearsectinterpolate(int sectnum);
void setsectinterpolate(int sectnum);
void clearsectinterpolate(sectortype* sectnum);
void setsectinterpolate(sectortype* sectnum);
inline void StartInterpolation(walltype* wall, int type)
{

2
source/games/duke/src/spawn.cpp
View file

@ -1064,7 +1064,7 @@ void spawneffector(DDukeActor* actor)
case SE_15_SLIDING_DOOR:
case SE_16_REACTOR:
case SE_26:
setsectinterpolate(actor->s->sectnum);
setsectinterpolate(actor->s->sector());
break;
case SE_29_WAVES:

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

@ -238,7 +238,7 @@ void CheckSectorFloor(int nSector, int z, int *x, int *y);
int GetAngleToSprite(DExhumedActor* nSprite1, DExhumedActor* nSprite2);
int GetWallNormal(int nWall);
int GetUpAngle(DExhumedActor* nSprite1, int nVal, DExhumedActor* nSprite2, int ecx);
void MoveSector(int nSector, int nAngle, int *nXVel, int *nYVel);
void MoveSector(sectortype* pSector, int nAngle, int *nXVel, int *nYVel);
Collision AngleChase(DExhumedActor* nSprite, DExhumedActor* nSprite2, int ebx, int ecx, int push1);
void SetQuake(DExhumedActor* nSprite, int nVal);

5
source/games/exhumed/src/exhumedactor.h
View file

@ -239,6 +239,11 @@ inline void ChangeActorSect(DExhumedActor* actor, int stat)
changespritesect(actor->GetSpriteIndex(), stat);
}
inline void ChangeActorSect(DExhumedActor* actor, sectortype* stat)
{
changespritesect(actor->GetSpriteIndex(), sector.IndexOf(stat));
}
inline void setActorPos(DExhumedActor* actor, vec3_t* pos)
{
setsprite(actor->GetSpriteIndex(), pos);

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

@ -863,9 +863,9 @@ void CreatePushBlock(int nSector)
sectp->extra = nBlock;
}
void MoveSector(int nSector, int nAngle, int *nXVel, int *nYVel)
void MoveSector(sectortype* pSector, int nAngle, int *nXVel, int *nYVel)
{
if (nSector == -1) {
if (pSector == nullptr) {
return;
}
@ -882,11 +882,9 @@ void MoveSector(int nSector, int nAngle, int *nXVel, int *nYVel)
nXVect = bcos(nAngle, 6);
nYVect = bsin(nAngle, 6);
}
sectortype *pSector = &sector[nSector];
int nBlock = pSector->extra;
int nSectFlag = sector[nSector].Flag;
int nSectFlag = pSector->Flag;
int nFloorZ = pSector->floorz;
@ -903,7 +901,6 @@ void MoveSector(int nSector, int nAngle, int *nXVel, int *nYVel)
pos.y = sBlockInfo[nBlock].y;
int y_b = sBlockInfo[nBlock].y;
auto nSectorB = nSector;
int nZVal;
@ -924,12 +921,13 @@ void MoveSector(int nSector, int nAngle, int *nXVel, int *nYVel)
pSector->floorz = pNextSector->floorz;
}
clipmove(&pos, &nSectorB, nXVect, nYVect, pBlockInfo->field_8, 0, 0, CLIPMASK1);
auto pSectorB = pSector;
clipmove(&pos, &pSectorB, nXVect, nYVect, pBlockInfo->field_8, 0, 0, CLIPMASK1);
int yvect = pos.y - y_b;
int xvect = pos.x - x_b;
if (&sector[nSectorB] != pNextSector && nSectorB != nSector)
if (pSectorB != pNextSector && pSectorB != pSector)
{
yvect = 0;
xvect = 0;
@ -940,7 +938,7 @@ void MoveSector(int nSector, int nAngle, int *nXVel, int *nYVel)
{
pos = { x_b, y_b, nZVal };
clipmove(&pos, &nSectorB, nXVect, nYVect, pBlockInfo->field_8, 0, 0, CLIPMASK1);
clipmove(&pos, &pSectorB, nXVect, nYVect, pBlockInfo->field_8, 0, 0, CLIPMASK1);
int ebx = pos.x;
int ecx = x_b;
@ -987,7 +985,7 @@ void MoveSector(int nSector, int nAngle, int *nXVel, int *nYVel)
// GREEN
if (yvect || xvect)
{
ExhumedSectIterator it(nSector);
ExhumedSectIterator it(pSector);
while (auto pActor = it.Next())
{
auto sp = &pActor->s();
@ -1004,12 +1002,12 @@ void MoveSector(int nSector, int nAngle, int *nXVel, int *nYVel)
{
pos.x = sp->x;
pos.y = sp->y;
nSectorB = nSector;
pSectorB = pSector;
clipmove(&pos, &nSectorB, -xvect, -yvect, 4 * sp->clipdist, 0, 0, CLIPMASK0);
clipmove(&pos, &pSectorB, -xvect, -yvect, 4 * sp->clipdist, 0, 0, CLIPMASK0);
if (validSectorIndex(nSectorB)) {
ChangeActorSect(pActor, nSectorB);
if (pSectorB) {
ChangeActorSect(pActor, pSectorB);
}
}
}
@ -1022,20 +1020,20 @@ void MoveSector(int nSector, int nAngle, int *nXVel, int *nYVel)
if (pSprite->statnum >= 99)
{
pos = pSprite->pos;
nSectorB = nNextSector;
pSectorB = pNextSector;
clipmove(&pos, &nSectorB,
clipmove(&pos, &pSectorB,
-xvect - (bcos(nAngle) * (4 * pSprite->clipdist)),
-yvect - (bsin(nAngle) * (4 * pSprite->clipdist)),
4 * pSprite->clipdist, 0, 0, CLIPMASK0);
if (nSectorB != nNextSector && (nSectorB == nSector || nNextSector == nSector))
if (pSectorB != pNextSector && (pSectorB == pSector || pNextSector == pSector))
{
if (nSectorB != nSector || nFloorZ >= pSprite->z)
if (pSectorB != pSector || nFloorZ >= pSprite->z)
{
if (validSectorIndex(nSectorB)) {
ChangeActorSect(pActor, nSectorB);
if (pSectorB) {
ChangeActorSect(pActor, pSectorB);
}
}
else
@ -1064,14 +1062,14 @@ void MoveSector(int nSector, int nAngle, int *nXVel, int *nYVel)
if (!(nSectFlag & kSectUnderwater))
{
ExhumedSectIterator it(nSector);
ExhumedSectIterator it(pSector);
while (auto pActor = it.Next())
{
auto pSprite = &pActor->s();
if (pSprite->statnum >= 99 && nZVal == pSprite->z && !(pSprite->cstat & 0x8000))
{
nSectorB = nSector;
clipmove(&pSprite->pos, &nSectorB, xvect, yvect, 4 * pSprite->clipdist, 5120, -5120, CLIPMASK0);
pSectorB = pSector;
clipmove(&pSprite->pos, &pSectorB, xvect, yvect, 4 * pSprite->clipdist, 5120, -5120, CLIPMASK0);
}
}
}

47
source/games/exhumed/src/object.cpp
View file

@ -89,8 +89,8 @@ struct Elev
// 16 bytes
struct MoveSect
{
int nSector;
int nCurSector;
sectortype* pSector;
sectortype* pCurSector;
int field_10;
int16_t nTrail;
int16_t nTrailPoint;
@ -245,11 +245,11 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, MoveSect& w, MoveS
{
if (arc.BeginObject(keyname))
{
arc("sector", w.nSector)
arc("sector", w.pSector)
("trail", w.nTrail)
("trailpoint", w.nTrailPoint)
("at6", w.nFlags)
("at8", w.nCurSector)
("at8", w.pCurSector)
("at10", w.field_10)
("at14", w.nChannel)
("movedir", w.sMoveDir)
@ -2307,8 +2307,9 @@ void ProcessTrailSprite(DExhumedActor* pActor, int nLotag, int nHitag)
// ok?
void AddMovingSector(int nSector, int edx, int ebx, int ecx)
{
auto pSector = &sector[nSector];
CreatePushBlock(nSector);
setsectinterpolate(nSector);
setsectinterpolate(pSector);
int nTrail = FindTrail(ebx);
@ -2319,10 +2320,10 @@ void AddMovingSector(int nSector, int edx, int ebx, int ecx)
pMoveSect->sMoveDir = 1;
pMoveSect->nTrail = nTrail;
pMoveSect->nTrailPoint = -1;
pMoveSect->nCurSector = -1;
pMoveSect->pCurSector = nullptr;
pMoveSect->nFlags = ecx;
pMoveSect->field_10 = (edx / 1000) + 1;
pMoveSect->nSector = nSector;
pMoveSect->pSector = pSector;
if (ecx & 8)
{
@ -2333,14 +2334,14 @@ void AddMovingSector(int nSector, int edx, int ebx, int ecx)
pMoveSect->nChannel = -1;
}
sector[nSector].floorstat |= 0x40;
pSector->floorstat |= 0x40;
}
void DoMovingSects()
{
for (unsigned i = 0; i < sMoveSect.Size(); i++)
{
if (sMoveSect[i].nSector == -1) {
if (sMoveSect[i].pSector == nullptr) {
continue;
}
@ -2348,8 +2349,8 @@ void DoMovingSects()
continue;
}
int nSector =sMoveSect[i].nSector;
int nBlock = sector[nSector].extra;
auto pSector =sMoveSect[i].pSector;
int nBlock = pSector->extra;
BlockInfo* pBlockInfo = &sBlockInfo[nBlock];
@ -2455,20 +2456,20 @@ void DoMovingSects()
}
// loc_2393A:
if (sMoveSect[i].nCurSector != -1)
if (sMoveSect[i].pCurSector != nullptr)
{
MoveSector(sMoveSect[i].nCurSector, -1, &nXVel, &nYVel);
MoveSector(sMoveSect[i].pCurSector, -1, &nXVel, &nYVel);
}
int var_2C = nXVel;
int var_30 = nYVel;
MoveSector(nSector, -1, &nXVel, &nYVel);
MoveSector(pSector, -1, &nXVel, &nYVel);
if (nXVel != var_2C || nYVel != var_30)
{
MoveSector(sMoveSect[i].nCurSector, -1, &var_2C, &var_30);
MoveSector(sMoveSect[i].nCurSector, -1, &nXVel, &nYVel);
MoveSector(sMoveSect[i].pCurSector, -1, &var_2C, &var_30);
MoveSector(sMoveSect[i].pCurSector, -1, &nXVel, &nYVel);
}
}
}
@ -2484,21 +2485,21 @@ void PostProcess()
runlist_ChangeChannel(sMoveSect[i].nChannel, 1);
}
int nSector =sMoveSect[i].nSector;
auto pSector =sMoveSect[i].pSector;
if (sector[nSector].Flag & kSectUnderwater)
if (pSector->Flag & kSectUnderwater)
{
sector[nSector].ceilingstat |= 0x40;
sector[nSector].floorstat &= 0xBFFF;
pSector->ceilingstat |= 0x40;
pSector->floorstat &= 0xBFFF;
for (unsigned j = 0; j < sMoveSect.Size(); j++)
{
if (j != i && sMoveSect[i].nTrail == sMoveSect[j].nTrail)
{
sMoveSect[j].nCurSector = sMoveSect[i].nSector;
sMoveSect[j].pCurSector = sMoveSect[i].pSector;
SnapSectors(sMoveSect[j].nSector, sMoveSect[i].nSector, 0);
sMoveSect[i].nSector = -1;
SnapSectors(sectnum(sMoveSect[j].pSector), sectnum(sMoveSect[i].pSector), 0);
sMoveSect[i].pSector = nullptr;
}
}
}

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

@ -1035,7 +1035,8 @@ void AIPlayer::Tick(RunListEvent* ev)
if (sectnum >= 0)
{
if ((sector[sectnum].hitag == 45) && bTouchFloor)
auto sect = &sector[sectnum];
if ((sect->hitag == 45) && bTouchFloor)
{
int nDiff = AngleDiff(nNormal, (pPlayerSprite->ang + 1024) & kAngleMask);
@ -1051,8 +1052,8 @@ void AIPlayer::Tick(RunListEvent* ev)
int yvel = sPlayerInput[nPlayer].yVel;
int nMyAngle = GetMyAngle(xvel, yvel);
setsectinterpolate(sectnum);
MoveSector(sectnum, nMyAngle, &xvel, &yvel);
setsectinterpolate(sect);
MoveSector(sect, nMyAngle, &xvel, &yvel);
if (PlayerList[nPlayer].nPlayerPushSound <= -1)
{