- more assignment wraps

This commit is contained in:
Christoph Oelckers 2022-09-09 18:23:28 +02:00
parent 3fc592c505
commit 9721d80f44
13 changed files with 17 additions and 17 deletions

View file

@ -184,11 +184,11 @@ void resetpins(sectortype* sect)
spawned->spr.lotag = a2->spr.lotag;
if (spawned->spr.lotag == 3 || spawned->spr.lotag == 5)
{
spawned->spr.clipdist = (1 + (krand() % 1)) * 16 + 32;
spawned->set_native_clipdist((1 + (krand() % 1)) * 16 + 32);
}
else
{
spawned->spr.clipdist = (1 + (krand() % 1)) * 16 + 32;
spawned->set_native_clipdist((1 + (krand() % 1)) * 16 + 32);
}
spawned->add_int_ang(-(((krand() & 32) - (krand() & 64)) & 2047));
}

View file

@ -304,7 +304,7 @@ void DoDebrisCurrent(DSWActor* actor)
int nx, ny;
auto sectp = actor->sector();
//actor->spr.clipdist = (256+128)>>2;
//actor->set_native_clipdist((256+128)>>2;
double spd = sectp->speed / 64.0;
auto vect = sectp->angle.ToVector() * spd;
@ -850,7 +850,7 @@ int DoActorDeathMove(DSWActor* actor)
DoActorFall(actor);
}
actor->spr.clipdist = (128+64)>>2;
actor->set_native_clipdist((128+64)>>2);
move_actor(actor, DVector3(actor->spr.angle.ToVector() * actor->vel.X, 0));

View file

@ -746,7 +746,7 @@ int SetupBunny(DSWActor* actor)
actor->user.ShellNum = 0; // Not Pregnant right now
actor->user.FlagOwner = 0;
actor->spr.clipdist = (150) >> 2;
actor->set_native_clipdist((150) >> 2);
if (actor->spr.pal == PALETTE_PLAYER1)
{

View file

@ -507,7 +507,7 @@ int DoCoolgMatchPlayerZ(DSWActor* actor);
void CoolgCommon(DSWActor* actor)
{
actor->spr.clipdist = (200) >> 2;
actor->set_native_clipdist((200) >> 2);
actor->user.floor_dist = (16);
actor->user.ceiling_dist = (20);

View file

@ -365,7 +365,7 @@ int DoEelMatchPlayerZ(DSWActor* actor);
void EelCommon(DSWActor* actor)
{
actor->spr.clipdist = (100) >> 2;
actor->set_native_clipdist((100) >> 2);
actor->user.floor_dist = (16);
actor->user.floor_dist = (16);
actor->user.ceiling_dist = (20);

View file

@ -314,7 +314,7 @@ int SetupHornet(DSWActor* actor)
actor->user.Flags |= (SPR_NO_SCAREDZ|SPR_XFLIP_TOGGLE);
actor->spr.cstat |= (CSTAT_SPRITE_YCENTER);
actor->spr.clipdist = (100) >> 2;
actor->set_native_clipdist((100) >> 2);
actor->user.floor_dist = (16);
actor->user.ceiling_dist = (16);

View file

@ -475,7 +475,7 @@ int SetupLava(DSWActor* actor)
EnemyDefaults(actor, &LavaActionSet, &LavaPersonality);
actor->spr.xrepeat = actor->spr.yrepeat = 110;
actor->spr.clipdist = (512) >> 2;
actor->set_native_clipdist((512) >> 2);
actor->user.Flags |= (SPR_XFLIP_TOGGLE|SPR_ELECTRO_TOLERANT);
actor->user.loz = actor->spr.pos.Z;

View file

@ -2417,7 +2417,7 @@ void InitPlayerSprite(PLAYER* pp)
actor->spr.picnum = actor->user.State->Pic;
actor->spr.shade = -60; // was 15
actor->spr.clipdist = (256 >> 2);
actor->set_native_clipdist(256 >> 2);
actor->spr.xrepeat = PLAYER_NINJA_XREPEAT;
actor->spr.yrepeat = PLAYER_NINJA_YREPEAT;

View file

@ -727,7 +727,7 @@ int SetupSerp(DSWActor* actor)
actor->spr.xrepeat = 128;
}
actor->spr.clipdist = (512) >> 2;
actor->set_native_clipdist((512) >> 2);
actor->user.Flags |= (SPR_XFLIP_TOGGLE|SPR_ELECTRO_TOLERANT);
actor->user.loz = actor->spr.pos.Z;

View file

@ -232,7 +232,7 @@ int SetupSkull(DSWActor* actor)
actor->user.ID = SKULL_R0;
EnemyDefaults(actor, nullptr, nullptr);
actor->spr.clipdist = (128+64) >> 2;
actor->set_native_clipdist((128+64) >> 2);
actor->user.Flags |= (SPR_XFLIP_TOGGLE);
actor->spr.cstat |= (CSTAT_SPRITE_YCENTER);
@ -650,7 +650,7 @@ int SetupBetty(DSWActor* actor)
actor->user.ID = BETTY_R0;
EnemyDefaults(actor, nullptr, nullptr);
actor->spr.clipdist = (128+64) >> 2;
actor->set_native_clipdist((128+64) >> 2);
actor->user.Flags |= (SPR_XFLIP_TOGGLE);
actor->spr.cstat |= (CSTAT_SPRITE_YCENTER);

View file

@ -624,7 +624,7 @@ int SetupSumo(DSWActor* actor)
EnemyDefaults(actor, &SumoActionSet, &SumoPersonality);
actor->spr.clipdist = (512) >> 2;
actor->set_native_clipdist((512) >> 2);
if (actor->spr.pal == 16)
{
// Mini Sumo

View file

@ -12003,7 +12003,7 @@ int InitSerpRing(DSWActor* actor)
change_actor_stat(actorNew, STAT_SKIP4);
actorNew->spr.extra &= ~(SPRX_PLAYER_OR_ENEMY);
actorNew->spr.clipdist = (128+64) >> 2;
actorNew->set_native_clipdist((128+64) >> 2);
actorNew->user.Flags |= (SPR_XFLIP_TOGGLE);
actorNew->spr.cstat |= (CSTAT_SPRITE_YCENTER);
@ -12729,7 +12729,7 @@ int InitSumoSkull(DSWActor* actor)
EnemyDefaults(actorNew, nullptr, nullptr);
actorNew->spr.extra |= SPRX_PLAYER_OR_ENEMY;
actorNew->spr.clipdist = (128+64) >> 2;
actorNew->set_native_clipdist((128+64) >> 2);
actorNew->user.Flags |= (SPR_XFLIP_TOGGLE);
actorNew->spr.cstat |= (CSTAT_SPRITE_YCENTER);

View file

@ -630,7 +630,7 @@ int SetupZilla(DSWActor* actor)
EnemyDefaults(actor, &ZillaActionSet, &ZillaPersonality);
actor->spr.clipdist = (512) >> 2;
actor->set_native_clipdist((512) >> 2);
actor->spr.xrepeat = 97;
actor->spr.yrepeat = 79;