teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- wrapped all literal assignments to clipdist - part 5

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

2
source/games/sw/src/actor.cpp
View file

@ -473,7 +473,7 @@ int DoActorDebris(DSWActor* actor)
int DoFireFly(DSWActor* actor)
{
actor->spr.clipdist = 256>>2;
actor->set_native_clipdist(256>>2);
if (!move_actor(actor, DVector3(actor->spr.angle.ToVector() * (0.25 * ACTORMOVETICS), 0)))
{
actor->spr.angle += DAngle180;

2
source/games/sw/src/bunny.cpp
View file

@ -755,7 +755,7 @@ int SetupBunny(DSWActor* actor)
actor->spr.xrepeat = 96;
actor->spr.yrepeat = 90;
actor->spr.clipdist = 200>>2;
actor->set_native_clipdist(200>>2);
if (!(actor->spr.cstat & CSTAT_SPRITE_RESTORE))
actor->user.Health = 60;

2
source/games/sw/src/coolie.cpp
View file

@ -410,7 +410,7 @@ void EnemyDefaults(DSWActor* actor, ACTOR_ACTION_SET* action, PERSONALITY* perso
actor->user.spal = actor->spr.pal;
actor->user.RotNum = 5;
actor->spr.clipdist = 256 >> 2;
actor->set_native_clipdist(256 >> 2);
actor->user.zclip = 48;
actor->user.lo_step = 32;

2
source/games/sw/src/goro.cpp
View file

@ -505,7 +505,7 @@ int SetupGoro(DSWActor* actor)
EnemyDefaults(actor, &GoroActionSet, &GoroPersonality);
actor->spr.clipdist = 512 >> 2;
actor->set_native_clipdist(512 >> 2);
actor->user.Flags |= (SPR_XFLIP_TOGGLE);
return 0;

16
source/games/sw/src/jweapon.cpp
View file

@ -1292,13 +1292,13 @@ int PlayerInitChemBomb(PLAYER* pp)
actorNew->vel.Z -= pp->horizon.horiz.asbuildf() * HORIZ_MULTF;
oclipdist = plActor->spr.clipdist;
plActor->spr.clipdist = 0;
actorNew->spr.clipdist = 0;
plActor->set_native_clipdist(0);
actorNew->set_native_clipdist(0);
MissileSetPos(actorNew, DoChemBomb, 1000);
plActor->spr.clipdist = uint8_t(oclipdist);
actorNew->spr.clipdist = 80 >> 2;
actorNew->set_native_clipdist(80 >> 2);
UpdateChange(actorNew, 0.5);
@ -1342,7 +1342,7 @@ int InitSpriteChemBomb(DSWActor* actor)
actorNew->vel.Z = (-100 - RandomRange(100)) * HORIZ_MULTF;
actorNew->spr.clipdist = 80 >> 2;
actorNew->set_native_clipdist(80 >> 2);
UpdateChange(actorNew, 0.5);
@ -1382,7 +1382,7 @@ int InitChemBomb(DSWActor* actor)
actorNew->user.Flags |= (SPR_UNDERWATER);
actorNew->vel.Z = (-100 - RandomRange(100)) * HORIZ_MULTF;
actorNew->spr.clipdist = 0;
actorNew->set_native_clipdist(0);
if (actor->user.ID == MUSHROOM_CLOUD || actor->user.ID == 3121 || actor->user.ID == SUMO_RUN_R0) // 3121 == GRENADE_EXP
{
@ -1656,13 +1656,13 @@ int PlayerInitCaltrops(PLAYER* pp)
actorNew->vel.Z -= pp->horizon.horiz.asbuildf() * 0.5;
oclipdist = plActor->spr.clipdist;
plActor->spr.clipdist = 0;
actorNew->spr.clipdist = 0;
plActor->set_native_clipdist(0);
actorNew->set_native_clipdist(0);
MissileSetPos(actorNew, DoCaltrops, 1000);
plActor->spr.clipdist = uint8_t(oclipdist);
actorNew->spr.clipdist = 80L >> 2;
actorNew->set_native_clipdist(80 >> 2);
UpdateChange(actorNew, 0.5);

2
source/games/sw/src/ripper2.cpp
View file

@ -903,7 +903,7 @@ int SetupRipper2(DSWActor* actor)
DoActorSetSpeed(actor, NORM_SPEED);
actor->user.StateEnd = s_Ripper2Die;
actor->user.Rot = sg_Ripper2Run;
actor->spr.clipdist = 512 >> 2; // This actor is bigger, needs bigger box.
actor->set_native_clipdist(512 >> 2); // This actor is bigger, needs bigger box.
actor->spr.xrepeat = actor->spr.yrepeat = 55;
if (actor->spr.pal == PALETTE_BROWN_RIPPER)

2
source/games/sw/src/skel.cpp
View file

@ -525,7 +525,7 @@ int SetupSkel(DSWActor* actor)
EnemyDefaults(actor, &SkelActionSet, &SkelPersonality);
// 256 is default
//actor->spr.clipdist = 256 >> 2;
//actor->set_native_clipdist(256 >> 2);
actor->user.Flags |= (SPR_XFLIP_TOGGLE);
return 0;