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

- wrapped all literal assignments to clipdist - part 4

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-09 18:17:20 +02:00
parent 3c498e715d
commit 08a53188a8
21 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/exhumed/src/anims.cpp
View file

@ -79,7 +79,7 @@ DExhumedActor* BuildAnim(DExhumedActor* pActor, int val, int val2, const DVector
pActor->spr.shade = -12;
}
pActor->spr.clipdist = 10;
pActor->set_native_clipdist(10);
pActor->spr.xrepeat = nRepeat;
pActor->spr.yrepeat = nRepeat;
pActor->spr.picnum = 1;

2
source/games/exhumed/src/anubis.cpp
View file

@ -64,7 +64,7 @@ void BuildAnubis(DExhumedActor* ap, const DVector3& pos, sectortype* pSector, DA
ap->spr.yoffset = 0;
ap->spr.picnum = 1;
ap->spr.pal = ap->sector()->ceilingpal;
ap->spr.clipdist = 60;
ap->set_native_clipdist(60);
ap->spr.angle = nAngle;
ap->spr.xrepeat = 40;
ap->spr.yrepeat = 40;

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

@ -46,7 +46,7 @@ DExhumedActor* BuildBubble(const DVector3& pos, sectortype* pSector)
pActor->spr.cstat = 0;
pActor->spr.shade = -32;
pActor->spr.pal = 0;
pActor->spr.clipdist = 5;
pActor->set_native_clipdist(5);
pActor->spr.xrepeat = 40;
pActor->spr.yrepeat = 40;
pActor->spr.xoffset = 0;

2
source/games/exhumed/src/bullet.cpp
View file

@ -601,7 +601,7 @@ DExhumedActor* BuildBullet(DExhumedActor* pActor, int nType, int nZOffset, DAngl
pBulletActor->spr.pal = 0;
}
pBulletActor->spr.clipdist = 25;
pBulletActor->set_native_clipdist(25);
int nRepeat = pBulletInfo->xyRepeat;
if (nRepeat < 0) {

4
source/games/exhumed/src/fish.cpp
View file

@ -63,7 +63,7 @@ void BuildFishLimb(DExhumedActor* pActor, int anim)
pChunkActor->spr.picnum = anim;
pChunkActor->spr.lotag = runlist_HeadRun() + 1;
pChunkActor->spr.clipdist = 0;
pChunkActor->set_native_clipdist(0);
// GrabTimeSlot(3);
@ -153,7 +153,7 @@ void BuildFish(DExhumedActor* pActor, const DVector3& pos, sectortype* pSector,
pActor->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
pActor->spr.shade = -12;
pActor->spr.clipdist = 80;
pActor->set_native_clipdist(80);
pActor->spr.xrepeat = 40;
pActor->spr.yrepeat = 40;
pActor->spr.pal = pActor->sector()->ceilingpal;

2
source/games/exhumed/src/grenade.cpp
View file

@ -109,7 +109,7 @@ void BuildGrenade(int nPlayer)
pActor->spr.cstat = CSTAT_SPRITE_INVISIBLE;
pActor->spr.picnum = 1;
pActor->spr.pal = 0;
pActor->spr.clipdist = 30;
pActor->set_native_clipdist(30);
pActor->spr.xoffset = 0;
pActor->spr.yoffset = 0;
pActor->spr.angle = pPlayerActor->spr.angle;

4
source/games/exhumed/src/lavadude.cpp
View file

@ -55,7 +55,7 @@ DExhumedActor* BuildLavaLimb(DExhumedActor* pActor, int move, int ebx)
pLimbActor->spr.picnum = (move & 3) % 3;
pLimbActor->spr.hitag = 0;
pLimbActor->spr.lotag = runlist_HeadRun() + 1;
pLimbActor->spr.clipdist = 0;
pLimbActor->set_native_clipdist(0);
// GrabTimeSlot(3);
@ -118,7 +118,7 @@ void BuildLava(DExhumedActor* pActor, const DVector3& pos, sectortype* pSector,
pActor->spr.yrepeat = 200;
pActor->spr.shade = -12;
pActor->spr.pal = 0;
pActor->spr.clipdist = 127;
pActor->set_native_clipdist(127);
pActor->spr.xoffset = 0;
pActor->spr.yoffset = 0;
pActor->spr.picnum = seq_GetSeqPicnum(kSeqLavag, LavadudeSeq[3].a, 0);

2
source/games/exhumed/src/lion.cpp
View file

@ -56,7 +56,7 @@ void BuildLion(DExhumedActor* pActor, const DVector3& pos, sectortype* pSector,
}
pActor->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
pActor->spr.clipdist = 60;
pActor->set_native_clipdist(60);
pActor->spr.shade = -12;
pActor->spr.xrepeat = 40;
pActor->spr.yrepeat = 40;

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

@ -1312,7 +1312,7 @@ DExhumedActor* BuildCreatureChunk(DExhumedActor* pSrc, int nPic, bool bSpecial)
pActor->spr.yoffset = 0;
pActor->spr.picnum = nPic;
pActor->spr.lotag = runlist_HeadRun() + 1;
pActor->spr.clipdist = 40;
pActor->set_native_clipdist(40);
// GrabTimeSlot(3);

2
source/games/exhumed/src/mummy.cpp
View file

@ -52,7 +52,7 @@ void BuildMummy(DExhumedActor* pActor, const DVector3& pos, sectortype* pSector,
pActor->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
pActor->spr.shade = -12;
pActor->spr.clipdist = 32;
pActor->set_native_clipdist(32);
pActor->vel.X = 0;
pActor->vel.Y = 0;
pActor->vel.Z = 0;

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

@ -1318,7 +1318,7 @@ void AITrap::Tick(RunListEvent* ev)
}
else
{
pBullet->spr.clipdist = 50;
pBullet->set_native_clipdist(50);
auto pWall = sTrap[nTrap].pWall1;
if (pWall)
@ -1399,7 +1399,7 @@ DExhumedActor* BuildSpark(DExhumedActor* pActor, int nVal)
pSpark->spr.pos.Z = pActor->spr.pos.Z;
pSpark->spr.lotag = runlist_HeadRun() + 1;
pSpark->spr.clipdist = 1;
pSpark->set_native_clipdist(1);
pSpark->spr.hitag = 0;
pSpark->backuppos();

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

@ -291,7 +291,7 @@ void RestartPlayer(int nPlayer)
pActor->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
pActor->spr.shade = -12;
pActor->spr.clipdist = 58;
pActor->set_native_clipdist(58);
pActor->spr.pal = 0;
pActor->spr.xrepeat = 40;
pActor->spr.yrepeat = 40;

8
source/games/exhumed/src/queen.cpp
View file

@ -393,7 +393,7 @@ void BuildTail()
pTailActor->spr.shade = -12;
pTailActor->spr.hitag = 0;
pTailActor->spr.cstat = 0;
pTailActor->spr.clipdist = 100;
pTailActor->set_native_clipdist(100);
pTailActor->spr.xrepeat = 80;
pTailActor->spr.yrepeat = 80;
pTailActor->spr.picnum = 1;
@ -432,7 +432,7 @@ void BuildQueenEgg(int nQueen, int nVal)
pActor2->spr.pos = DVector3(pActor->spr.pos.XY(), pSector->floorz);
pActor2->spr.pal = 0;
pActor2->spr.clipdist = 50;
pActor2->set_native_clipdist(50);
pActor2->spr.xoffset = 0;
pActor2->spr.yoffset = 0;
pActor2->spr.shade = -12;
@ -686,7 +686,7 @@ void BuildQueenHead(int nQueen)
pActor2->spr.pos.XY() = pActor->spr.pos.XY();
pActor2->spr.pos.Z = pSector->floorz;
pActor2->spr.clipdist = 70;
pActor2->set_native_clipdist(70);
pActor2->spr.xrepeat = 80;
pActor2->spr.yrepeat = 80;
pActor2->spr.cstat = 0;
@ -1090,7 +1090,7 @@ void BuildQueen(DExhumedActor* pActor, const DVector3& pos, sectortype* pSector,
pActor->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
pActor->spr.pal = 0;
pActor->spr.shade = -12;
pActor->spr.clipdist = 100;
pActor->set_native_clipdist(100);
pActor->spr.xrepeat = 80;
pActor->spr.yrepeat = 80;
pActor->spr.xoffset = 0;

2
source/games/exhumed/src/rat.cpp
View file

@ -92,7 +92,7 @@ void BuildRat(DExhumedActor* pActor, const DVector3& pos, sectortype* pSector, D
pActor->spr.yoffset = 0;
pActor->spr.picnum = 1;
pActor->spr.pal = pActor->sector()->ceilingpal;
pActor->spr.clipdist = 30;
pActor->set_native_clipdist(30);
pActor->spr.angle = nAngle;
pActor->spr.xrepeat = 50;
pActor->spr.yrepeat = 50;

2
source/games/exhumed/src/rex.cpp
View file

@ -52,7 +52,7 @@ void BuildRex(DExhumedActor* pActor, const DVector3& pos, sectortype* pSector, D
}
pActor->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
pActor->spr.clipdist = 80;
pActor->set_native_clipdist(80);
pActor->spr.shade = -12;
pActor->spr.xrepeat = 64;
pActor->spr.yrepeat = 64;

2
source/games/exhumed/src/roach.cpp
View file

@ -55,7 +55,7 @@ void BuildRoach(int nType, DExhumedActor* pActor, const DVector3& pos, sectortyp
pActor->spr.yoffset = 0;
pActor->spr.picnum = 1;
pActor->spr.pal = pActor->sector()->ceilingpal;
pActor->spr.clipdist = 60;
pActor->set_native_clipdist(60);
pActor->spr.angle = angle;
pActor->spr.xrepeat = 40;
pActor->spr.yrepeat = 40;

2
source/games/exhumed/src/scorp.cpp
View file

@ -53,7 +53,7 @@ void BuildScorp(DExhumedActor* pActor, const DVector3& pos, sectortype* pSector,
}
pActor->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
pActor->spr.clipdist = 70;
pActor->set_native_clipdist(70);
pActor->spr.shade = -12;
pActor->spr.xrepeat = 80;
pActor->spr.yrepeat = 80;

4
source/games/exhumed/src/set.cpp
View file

@ -55,7 +55,7 @@ void BuildSet(DExhumedActor* pActor, const DVector3& pos, sectortype* pSector, D
pActor->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
pActor->spr.shade = -12;
pActor->spr.clipdist = 110;
pActor->set_native_clipdist(110);
pActor->vel.X = 0;
pActor->vel.Y = 0;
pActor->vel.Z = 0;
@ -100,7 +100,7 @@ void BuildSoul(DExhumedActor* pSet)
pActor->spr.xrepeat = 1;
pActor->spr.yrepeat = 1;
pActor->spr.pal = 0;
pActor->spr.clipdist = 5;
pActor->set_native_clipdist(5);
pActor->spr.xoffset = 0;
pActor->spr.yoffset = 0;
pActor->spr.picnum = seq_GetSeqPicnum(kSeqSet, 75, 0);

2
source/games/exhumed/src/snake.cpp
View file

@ -206,7 +206,7 @@ void BuildSnake(int nPlayer, int zVal)
pActor->spr.yrepeat = 40 - 3 * i;
}
pActor->spr.clipdist = 10;
pActor->set_native_clipdist(10);
pActor->spr.cstat = 0;
pActor->spr.shade = -64;
pActor->spr.pal = 0;

2
source/games/exhumed/src/spider.cpp
View file

@ -53,7 +53,7 @@ DExhumedActor* BuildSpider(DExhumedActor* spp, const DVector3& pos, sectortype*
spp->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
spp->spr.shade = -12;
spp->spr.clipdist = 15;
spp->set_native_clipdist(15);
spp->vel.X = 0;
spp->vel.Y = 0;
spp->vel.Z = 0;

2
source/games/exhumed/src/wasp.cpp
View file

@ -56,7 +56,7 @@ DExhumedActor* BuildWasp(DExhumedActor* pActor, const DVector3& pos, sectortype*
pActor->spr.shade = -12;
pActor->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
pActor->spr.pal = pActor->sector()->ceilingpal;
pActor->spr.clipdist = 70;
pActor->set_native_clipdist(70);
if (bEggWasp)
{