teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-01 05:20:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- more repeats replaced by SetScale.

Browse source
This commit is contained in:
Christoph Oelckers 2022-10-06 00:01:01 +02:00
parent b004de9fb0
commit 2589e7030c
4 changed files with 34 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/core/thingdef_properties.cpp
View file

@ -444,20 +444,20 @@ DEFINE_PROPERTY(clipdist, I, CoreActor)
//========================================================================== //==========================================================================
// //
//========================================================================== //==========================================================================
DEFINE_PROPERTY(xrepeat, I, CoreActor) DEFINE_PROPERTY(scalex, I, CoreActor)
{ {
PROP_INT_PARM(i, 0); PROP_INT_PARM(i, 0);
bag.Info->ActorInfo()->defsprite.xrepeat = i; bag.Info->ActorInfo()->defsprite.xrepeat = i / REPEAT_SCALE;
bag.Info->ActorInfo()->DefaultFlags |= DEFF_XREPEAT; bag.Info->ActorInfo()->DefaultFlags |= DEFF_XREPEAT;
} }
//========================================================================== //==========================================================================
// //
//========================================================================== //==========================================================================
DEFINE_PROPERTY(yrepeat, I, CoreActor) DEFINE_PROPERTY(scaley, I, CoreActor)
{ {
PROP_INT_PARM(i, 0); PROP_INT_PARM(i, 0);
bag.Info->ActorInfo()->defsprite.yrepeat = i; bag.Info->ActorInfo()->defsprite.yrepeat = i / REPEAT_SCALE;
bag.Info->ActorInfo()->DefaultFlags |= DEFF_YREPEAT; bag.Info->ActorInfo()->DefaultFlags |= DEFF_YREPEAT;
} }

7
source/games/blood/src/aiunicult.cpp
View file

@ -337,7 +337,7 @@ static void ThrowThing(DBloodActor* actor, bool impact)
switch (curWeapon) { switch (curWeapon) {
case kThingNapalmBall: case kThingNapalmBall:
spawned->spr.xrepeat = spawned->spr.yrepeat = 24; spawned->spr.SetScale(0.375, 0.375);
spawned->xspr.data4 = 3 + gGameOptions.nDifficulty; spawned->xspr.data4 = 3 + gGameOptions.nDifficulty;
impact = true; impact = true;
break; break;
@ -1405,9 +1405,8 @@ void removeLeech(DBloodActor* actLeech, bool delSprite)
{ {
effectactor->spr.cstat = CSTAT_SPRITE_ALIGNMENT_FACING; effectactor->spr.cstat = CSTAT_SPRITE_ALIGNMENT_FACING;
effectactor->spr.pal = 6; effectactor->spr.pal = 6;
int repeat = 64 + Random(50); double repeat = 1 + Random(50) * REPEAT_SCALE;
effectactor->spr.xrepeat = repeat; effectactor->spr.SetScale(repeat, repeat);
effectactor->spr.yrepeat = repeat;
} }
sfxPlay3DSoundCP(actLeech, 490, -1, 0, 60000); sfxPlay3DSoundCP(actLeech, 490, -1, 0, 60000);

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

@ -110,6 +110,7 @@ static const WEAPONICON gWeaponIcon[] = {
static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFFECT nViewEffect) static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFFECT nViewEffect)
{ {
double s;
assert(nViewEffect >= 0 && nViewEffect < kViewEffectMax); assert(nViewEffect >= 0 && nViewEffect < kViewEffectMax);
auto pTSprite = tsprites.get(nTSprite); auto pTSprite = tsprites.get(nTSprite);
auto owneractor = static_cast<DBloodActor*>(pTSprite->ownerActor); auto owneractor = static_cast<DBloodActor*>(pTSprite->ownerActor);
@ -178,7 +179,7 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF
pNSprite->pal = 0; pNSprite->pal = 0;
pNSprite->pos.Z = top; pNSprite->pos.Z = top;
if (nViewEffect == kViewEffectFlag) if (nViewEffect == kViewEffectFlag)
pNSprite->xrepeat = pNSprite->yrepeat = 24; pNSprite->SetScale(0.375, 0.375);
else else
pNSprite->SetScale(1, 1); pNSprite->SetScale(1, 1);
pNSprite->picnum = 3558; pNSprite->picnum = 3558;
@ -235,7 +236,7 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF
pNSprite->shade = 26; pNSprite->shade = 26;
pNSprite->pal = 0; pNSprite->pal = 0;
pNSprite->cstat |= CSTAT_SPRITE_TRANSLUCENT; pNSprite->cstat |= CSTAT_SPRITE_TRANSLUCENT;
pNSprite->xrepeat = pNSprite->yrepeat = 24; pNSprite->SetScale(0.375, 0.375);
pNSprite->picnum = 626; pNSprite->picnum = 626;
break; break;
} }
@ -287,7 +288,8 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF
pNSprite->pos.Z = pTSprite->pos.Z; pNSprite->pos.Z = pTSprite->pos.Z;
pNSprite->picnum = 908; pNSprite->picnum = 908;
pNSprite->statnum = kStatDecoration; pNSprite->statnum = kStatDecoration;
pNSprite->xrepeat = pNSprite->yrepeat = (tileWidth(pTSprite->picnum) * pTSprite->xrepeat) / 64; s = (tileWidth(pTSprite->picnum) * pTSprite->ScaleX()) / 64.;
pNSprite->SetScale(s, s);
break; break;
} }
case kViewEffectSmokeHigh: case kViewEffectSmokeHigh:
@ -339,7 +341,8 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF
pNSprite->pos.Z = top; pNSprite->pos.Z = top;
pNSprite->picnum = 2101; pNSprite->picnum = 2101;
pNSprite->shade = -128; pNSprite->shade = -128;
pNSprite->xrepeat = pNSprite->yrepeat = (tileWidth(pTSprite->picnum) * pTSprite->xrepeat) / 32; s = (tileWidth(pTSprite->picnum) * pTSprite->ScaleX()) / 32.;
pNSprite->SetScale(s, s);
break; break;
} }
case kViewEffectTorchLow: case kViewEffectTorchLow:
@ -353,7 +356,8 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF
pNSprite->pos.Z = bottom; pNSprite->pos.Z = bottom;
pNSprite->picnum = 2101; pNSprite->picnum = 2101;
pNSprite->shade = -128; pNSprite->shade = -128;
pNSprite->xrepeat = pNSprite->yrepeat = (tileWidth(pTSprite->picnum) * pTSprite->xrepeat) / 32; s = (tileWidth(pTSprite->picnum) * pTSprite->ScaleX()) / 32.;
pNSprite->SetScale(s, s);
break; break;
} }
case kViewEffectShadow: case kViewEffectShadow:
@ -438,7 +442,7 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF
uint8_t nShade = (uint8_t)clamp(pSector->floorz - pTSprite->pos.Z, 0., 255.); uint8_t nShade = (uint8_t)clamp(pSector->floorz - pTSprite->pos.Z, 0., 255.);
pNSprite->shade = nShade - 32; pNSprite->shade = nShade - 32;
pNSprite->pal = 2; pNSprite->pal = 2;
pNSprite->xrepeat = pNSprite->yrepeat = nShade; pNSprite->SetScale(nShade * REPEAT_SCALE, nShade * REPEAT_SCALE);
pNSprite->cstat |= CSTAT_SPRITE_ONE_SIDE | CSTAT_SPRITE_ALIGNMENT_FLOOR | CSTAT_SPRITE_TRANSLUCENT; pNSprite->cstat |= CSTAT_SPRITE_ONE_SIDE | CSTAT_SPRITE_ALIGNMENT_FLOOR | CSTAT_SPRITE_TRANSLUCENT;
pNSprite->angle = pTSprite->angle; pNSprite->angle = pTSprite->angle;
pNSprite->ownerActor = pTSprite->ownerActor; pNSprite->ownerActor = pTSprite->ownerActor;

43
source/games/duke/src/spawn_d.cpp
View file

@ -321,8 +321,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
break; break;
} }
act->spr.xrepeat = 4; act->spr.SetScale(0.0625, 0.078125);
act->spr.yrepeat = 5;
act->SetOwner(act); act->SetOwner(act);
ud.bomb_tag = (ud.bomb_tag + 1) & 32767; ud.bomb_tag = (ud.bomb_tag + 1) & 32767;
@ -517,7 +516,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
if (act->spr.picnum == RESPAWNMARKERRED) if (act->spr.picnum == RESPAWNMARKERRED)
{ {
act->spr.xrepeat = act->spr.yrepeat = 24; act->spr.SetScale(0.375, 0.375);
if (actj) act->spr.pos.Z = actj->floorz; // -(1<<4); if (actj) act->spr.pos.Z = actj->floorz; // -(1<<4);
} }
else else
@ -537,7 +536,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
case SPOTLITE: case SPOTLITE:
break; break;
case BULLETHOLE: case BULLETHOLE:
act->spr.xrepeat = act->spr.yrepeat = 3; act->spr.SetScale(0.046875, 0.046875);
act->spr.cstat = CSTAT_SPRITE_ALIGNMENT_WALL | randomFlip(); act->spr.cstat = CSTAT_SPRITE_ALIGNMENT_WALL | randomFlip();
insertspriteq(act); insertspriteq(act);
[[fallthrough]]; [[fallthrough]];
@ -548,7 +547,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
{ {
act->temp_data[0] = krand() & 2047; act->temp_data[0] = krand() & 2047;
act->spr.cstat = randomFlip(); act->spr.cstat = randomFlip();
act->spr.xrepeat = act->spr.yrepeat = 8; act->spr.SetScale(0.125, 0.125);
act->spr.angle = randomAngle(); act->spr.angle = randomAngle();
} }
ChangeActorStat(act, STAT_MISC); ChangeActorStat(act, STAT_MISC);
@ -614,13 +613,11 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
else if (act->spr.picnum == SMALLSMOKE || act->spr.picnum == ONFIRE) else if (act->spr.picnum == SMALLSMOKE || act->spr.picnum == ONFIRE)
{ {
// 64 "money" // 64 "money"
act->spr.xrepeat = 24; act->spr.SetScale(0.375, 0.375);
act->spr.yrepeat = 24;
} }
else if (act->spr.picnum == BURNING || act->spr.picnum == BURNING2) else if (act->spr.picnum == BURNING || act->spr.picnum == BURNING2)
{ {
act->spr.xrepeat = 4; act->spr.SetScale(0.0625, 0.0625);
act->spr.yrepeat = 4;
} }
if (actj) if (actj)
@ -673,7 +670,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
{ {
if (actj) if (actj)
act->spr.angle = actj->spr.angle; act->spr.angle = actj->spr.angle;
act->spr.xrepeat = act->spr.yrepeat = 4; act->spr.SetScale(0.0625, 0.0625);
} }
else act->spr.SetScale(0.5, 0.5); else act->spr.SetScale(0.5, 0.5);
@ -695,16 +692,13 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
case WATERDRIPSPLASH: case WATERDRIPSPLASH:
act->spr.xrepeat = 24; act->spr.SetScale(0.375, 0.375);
act->spr.yrepeat = 24; ChangeActorStat(act, STAT_STANDABLE);
ChangeActorStat(act, 6);
break; break;
case PLUG: case PLUG:
act->spr.lotag = 9999; act->spr.lotag = 9999;
ChangeActorStat(act, 6); ChangeActorStat(act, STAT_STANDABLE);
break; break;
case TOUCHPLATE: case TOUCHPLATE:
act->temp_pos.Z = sectp->floorz; act->temp_pos.Z = sectp->floorz;
@ -829,8 +823,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
} }
else else
{ {
act->spr.xrepeat = 80; act->spr.SetScale(1.25, 1.25);
act->spr.yrepeat = 80;
act->clipdist = 41; act->clipdist = 41;
} }
} }
@ -843,8 +836,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
} }
else else
{ {
act->spr.xrepeat = 60; act->spr.SetScale(0.9375, 0.9375);
act->spr.yrepeat = 60;
act->clipdist = 10; act->clipdist = 10;
} }
} }
@ -926,10 +918,9 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
getglobalz(act); getglobalz(act);
int j = int((act->floorz - act->ceilingz) * 0.5); double j = ((act->floorz - act->ceilingz) / 128.);
act->spr.yrepeat = j; act->spr.SetScale(max(0., 0.390625 - j * 0.5), j);
act->spr.xrepeat = 25 - (j >> 1);
if (krand() & 4) act->spr.cstat |= CSTAT_SPRITE_XFLIP; if (krand() & 4) act->spr.cstat |= CSTAT_SPRITE_XFLIP;
break; break;
@ -938,7 +929,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
if (actj) act->SetOwner(actj); if (actj) act->SetOwner(actj);
else act->SetOwner(act); else act->SetOwner(act);
act->spr.xrepeat = act->spr.yrepeat = 9; act->spr.SetScale(0.140625, 0.140625);
act->spr.yint = 4; act->spr.yint = 4;
[[fallthrough]]; [[fallthrough]];
case REACTOR2: case REACTOR2:
@ -1058,7 +1049,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
case BOUNCEMINE: case BOUNCEMINE:
act->SetOwner(act); act->SetOwner(act);
act->spr.cstat |= CSTAT_SPRITE_BLOCK_ALL; //Make it hitable act->spr.cstat |= CSTAT_SPRITE_BLOCK_ALL; //Make it hitable
act->spr.xrepeat = act->spr.yrepeat = 24; act->spr.SetScale(0.375, 0.375);
act->spr.shade = -127; act->spr.shade = -127;
act->spr.extra = gs.impact_damage << 2; act->spr.extra = gs.impact_damage << 2;
ChangeActorStat(act, STAT_ZOMBIEACTOR); ChangeActorStat(act, STAT_ZOMBIEACTOR);
@ -1094,7 +1085,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
{ {
act->spr.angle = actj->spr.angle; act->spr.angle = actj->spr.angle;
act->spr.cstat = CSTAT_SPRITE_ALIGNMENT_WALL | CSTAT_SPRITE_YCENTER | CSTAT_SPRITE_TRANSLUCENT; act->spr.cstat = CSTAT_SPRITE_ALIGNMENT_WALL | CSTAT_SPRITE_YCENTER | CSTAT_SPRITE_TRANSLUCENT;
act->spr.xrepeat = act->spr.yrepeat = 1; act->spr.SetScale(REPEAT_SCALE, REPEAT_SCALE);
act->vel.X = -0.5; act->vel.X = -0.5;
ssp(act, CLIPMASK0); ssp(act, CLIPMASK0);
} }