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

- did some trivial replacements for deprecated functions.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-24 14:04:57 +02:00
parent 335df86213
commit 761412313f
5 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5627,9 +5627,9 @@ static void actCheckThings()
viewBackupSpriteLoc(actor); viewBackupSpriteLoc(actor);
if (pXSector && pXSector->panVel) if (pXSector && pXSector->panVel)
{ {
int top, bottom; double top, bottom;
GetActorExtents(actor, &top, &bottom); GetActorExtents(actor, &top, &bottom);
if (getflorzofslopeptr(pSector, actor->spr.pos) <= bottom) if (getflorzofslopeptrf(pSector, actor->spr.pos) <= bottom)
{ {
int angle = pXSector->panAngle.Buildang(); int angle = pXSector->panAngle.Buildang();
int speed = 0; int speed = 0;
@ -6052,9 +6052,9 @@ static void actCheckDudes()
if (pXSector) if (pXSector)
{ {
int top, bottom; double top, bottom;
GetActorExtents(actor, &top, &bottom); GetActorExtents(actor, &top, &bottom);
if (getflorzofslopeptr(pSector, actor->spr.pos) <= bottom) if (getflorzofslopeptrf(pSector, actor->spr.pos) <= bottom)
{ {
int angle = pXSector->panAngle.Buildang(); int angle = pXSector->panAngle.Buildang();
int speed = 0; int speed = 0;

2
source/games/blood/src/animatesprite.cpp
View file

@ -620,7 +620,7 @@ void viewProcessSprites(tspriteArray& tsprites, const DVector3& cPos, DAngle cA,
{ {
double top, bottom; double top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom); GetSpriteExtents(pTSprite, &top, &bottom);
if (getflorzofslopeptr(pTSprite->sectp, pTSprite->pos) > bottom) if (getflorzofslopeptrf(pTSprite->sectp, pTSprite->pos) > bottom)
nAnim = 1; nAnim = 1;
} }
break; break;

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

@ -314,9 +314,9 @@ int HitScan(DBloodActor* actor, int z, int dx, int dy, int dz, unsigned int nMas
if (!pWall->twoSided()) if (!pWall->twoSided())
return 0; return 0;
int nZCeil, nZFloor; double nZCeil, nZFloor;
getzsofslopeptr(pWall->nextSector(), gHitInfo.int_hitpos().X, gHitInfo.int_hitpos().Y, &nZCeil, &nZFloor); getzsofslopeptr(pWall->nextSector(), gHitInfo.hitpos.X, gHitInfo.hitpos.Y, &nZCeil, &nZFloor);
if (gHitInfo.int_hitpos().Z <= nZCeil || gHitInfo.int_hitpos().Z >= nZFloor) if (gHitInfo.hitpos.Z <= nZCeil || gHitInfo.hitpos.Z >= nZFloor)
return 0; return 0;
return 4; return 4;
} }
@ -412,11 +412,11 @@ int VectorScan(DBloodActor* actor, int nOffset, int nZOffset, int dx, int dy, in
return 0; return 0;
sectortype* pSector = gHitInfo.hitSector; sectortype* pSector = gHitInfo.hitSector;
sectortype* pSectorNext = pWall->nextSector(); sectortype* pSectorNext = pWall->nextSector();
int nZCeil, nZFloor; double nZCeil, nZFloor;
getzsofslopeptr(pWall->nextSector(), gHitInfo.int_hitpos().X, gHitInfo.int_hitpos().Y, &nZCeil, &nZFloor); getzsofslopeptr(pWall->nextSector(), gHitInfo.hitpos, &nZCeil, &nZFloor);
if (gHitInfo.int_hitpos().Z <= nZCeil) if (gHitInfo.hitpos.Z <= nZCeil)
return 0; return 0;
if (gHitInfo.int_hitpos().Z >= nZFloor) if (gHitInfo.hitpos.Z >= nZFloor)
{ {
if (!(pSector->floorstat & CSTAT_SECTOR_SKY) || !(pSectorNext->floorstat & CSTAT_SECTOR_SKY)) if (!(pSector->floorstat & CSTAT_SECTOR_SKY) || !(pSectorNext->floorstat & CSTAT_SECTOR_SKY))
return 0; return 0;

8
source/games/blood/src/nnexts.cpp
View file

@ -6740,7 +6740,7 @@ void useSlopeChanger(DBloodActor* sourceactor, int objType, sectortype* pSect, D
while (auto iactor = it.Next()) while (auto iactor = it.Next())
{ {
if (!(iactor->spr.cstat & CSTAT_SPRITE_ALIGNMENT_FLOOR)) continue; if (!(iactor->spr.cstat & CSTAT_SPRITE_ALIGNMENT_FLOOR)) continue;
else if (getflorzofslopeptr(pSect, iactor->spr.pos) - kSlopeDist <= iactor->int_pos().Z) else if (getflorzofslopeptrf(pSect, iactor->spr.pos) - kSlopeDist <= iactor->spr.pos.Z)
{ {
sprite2sectorSlope(iactor, pSect, 0, true); sprite2sectorSlope(iactor, pSect, 0, true);
@ -6776,7 +6776,7 @@ void useSlopeChanger(DBloodActor* sourceactor, int objType, sectortype* pSect, D
while (auto iactor = it.Next()) while (auto iactor = it.Next())
{ {
if (!(iactor->spr.cstat & CSTAT_SPRITE_ALIGNMENT_FLOOR)) continue; if (!(iactor->spr.cstat & CSTAT_SPRITE_ALIGNMENT_FLOOR)) continue;
else if (getceilzofslopeptr(pSect, iactor->spr.pos) + kSlopeDist >= iactor->int_pos().Z) else if (getceilzofslopeptrf(pSect, iactor->spr.pos) + kSlopeDist >= iactor->spr.pos.Z)
{ {
sprite2sectorSlope(iactor, pSect, 1, true); sprite2sectorSlope(iactor, pSect, 1, true);
@ -6831,8 +6831,8 @@ void useSlopeChanger(DBloodActor* sourceactor, int objType, sectortype* pSect, D
case 1: sprite2sectorSlope(objActor, objActor->sector(), 0, flag2); break; case 1: sprite2sectorSlope(objActor, objActor->sector(), 0, flag2); break;
case 2: sprite2sectorSlope(objActor, objActor->sector(), 1, flag2); break; case 2: sprite2sectorSlope(objActor, objActor->sector(), 1, flag2); break;
case 3: case 3:
if (getflorzofslopeptr(objActor->sector(), objActor->spr.pos) - kSlopeDist <= objActor->int_pos().Z) sprite2sectorSlope(objActor, objActor->sector(), 0, flag2); if (getflorzofslopeptrf(objActor->sector(), objActor->spr.pos) - kSlopeDist <= objActor->spr.pos.Z) sprite2sectorSlope(objActor, objActor->sector(), 0, flag2);
if (getceilzofslopeptr(objActor->sector(), objActor->spr.pos) + kSlopeDist >= objActor->int_pos().Z) sprite2sectorSlope(objActor, objActor->sector(), 1, flag2); if (getceilzofslopeptrf(objActor->sector(), objActor->spr.pos) + kSlopeDist >= objActor->spr.pos.Z) sprite2sectorSlope(objActor, objActor->sector(), 1, flag2);
break; break;
} }
break; break;

4
source/games/blood/src/triggers.cpp
View file

@ -947,9 +947,9 @@ void TranslateSector(sectortype* pSector, int a2, int a3, int a4, int a5, int a6
} }
else if (pXSector->Drag) else if (pXSector->Drag)
{ {
int top, bottom; double top, bottom;
GetActorExtents(actor, &top, &bottom); GetActorExtents(actor, &top, &bottom);
int floorZ = getflorzofslopeptr(pSector, actor->spr.pos); double floorZ = getflorzofslopeptrf(pSector, actor->spr.pos);
if (!(actor->spr.cstat & CSTAT_SPRITE_ALIGNMENT_MASK) && floorZ <= bottom) if (!(actor->spr.cstat & CSTAT_SPRITE_ALIGNMENT_MASK) && floorZ <= bottom)
{ {
viewBackupSpriteLoc(actor); viewBackupSpriteLoc(actor);