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

- use Scale wrappers in global code and parts of Duke.

Browse source
This commit is contained in:
Christoph Oelckers 2022-10-06 19:21:19 +02:00
parent 1c82d19d37
commit 520d838a8c
7 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/core/gamefuncs.cpp
View file

@ -1222,8 +1222,7 @@ tspritetype* renderAddTsprite(tspriteArray& tsprites, DCoreActor* actor)
tspr->pal = actor->spr.pal;
tspr->clipdist = 0;
tspr->blend = actor->spr.blend;
tspr->xrepeat = actor->spr.xrepeat;
tspr->yrepeat = actor->spr.yrepeat;
tspr->CopyScale(&actor->spr);
tspr->xoffset = actor->spr.xoffset;
tspr->yoffset = actor->spr.yoffset;
tspr->sectp = actor->spr.sectp;

4
source/core/thingdef_properties.cpp
View file

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

44
source/games/duke/src/actors.cpp
View file

@ -478,17 +478,18 @@ void moveplayers(void)
act->spr.cstat = 0;
if (act->spr.xrepeat < 42)
if (act->spr.ScaleX() < 0.65625)
{
act->spr.xrepeat += 4;
act->spr.AddScaleX(0.0625);
act->spr.cstat |= CSTAT_SPRITE_TRANSLUCENT;
}
else act->spr.xrepeat = 42;
if (act->spr.yrepeat < 36)
act->spr.yrepeat += 4;
else act->spr.SetScaleX(0.65625);
if (act->spr.ScaleY() < 0.5625)
act->spr.AddScaleY(4);
else
{
act->spr.yrepeat = 36;
act->spr.SetScaleY(0.5625);
if (act->sector()->lotag != ST_2_UNDERWATER)
makeitfall(act);
if (act->vel.Z == 0 && act->sector()->lotag == ST_1_ABOVE_WATER)
@ -840,7 +841,7 @@ void movefountain(DDukeActor *actor, int fountain)
void moveflammable(DDukeActor* actor, int pool)
{
int j;
double scale;
if (actor->temp_data[0] == 1)
{
actor->temp_data[1]++;
@ -866,22 +867,22 @@ void moveflammable(DDukeActor* actor, int pool)
}
}
j = actor->spr.xrepeat - (krand() & 7);
if (j < 10)
scale = actor->spr.ScaleX() - (krand() & 7) * REPEAT_SCALE;
if (scale < 0.15625)
{
deletesprite(actor);
return;
}
actor->spr.xrepeat = j;
actor->spr.SetScaleX(scale);
j = actor->spr.yrepeat - (krand() & 7);
if (j < 4)
scale = actor->spr.ScaleY() - (krand() & 7) * REPEAT_SCALE;
if (scale < 0.0625)
{
deletesprite(actor);
return;
}
actor->spr.yrepeat = j;
actor->spr.SetScaleY(scale);
}
if (actorflag(actor, SFLAG_FALLINGFLAMMABLE))
{
@ -2291,16 +2292,16 @@ bool bloodpool(DDukeActor* actor, bool puke)
{
if (actor->spr.ScaleX() < 1 && actor->spr.ScaleY() < 1)
{
actor->spr.xrepeat += krand() & 3;
actor->spr.yrepeat += krand() & 3;
actor->spr.AddScaleX((krand() & 3) * REPEAT_SCALE);
actor->spr.AddScaleY((krand() & 3) * REPEAT_SCALE);
}
}
else
{
if (actor->spr.ScaleX() < 0.5 && actor->spr.ScaleY() < 0.5)
{
actor->spr.xrepeat += krand() & 3;
actor->spr.yrepeat += krand() & 3;
actor->spr.AddScaleX((krand() & 3) * REPEAT_SCALE);
actor->spr.AddScaleY((krand() & 3) * REPEAT_SCALE);
}
}
}
@ -2332,8 +2333,8 @@ bool bloodpool(DDukeActor* actor, bool puke)
if (actor->temp_data[2] == 32)
{
actor->spr.xrepeat -= 6;
actor->spr.yrepeat -= 6;
actor->spr.AddScaleX(-6);
actor->spr.AddScaleY(-6);
}
}
else actor->temp_data[1] = 0;
@ -2416,8 +2417,9 @@ void glasspieces(DDukeActor* actor)
actor->vel.Z = -(3 - actor->temp_data[0]) - krandf(2);
if (sectp->lotag == 2)
actor->vel.Z *= 0.5;
actor->spr.xrepeat >>= 1;
actor->spr.yrepeat >>= 1;
actor->spr.MultScaleX(0.5);
actor->spr.MultScaleY(0.5);
if (rnd(96))
SetActor(actor, actor->spr.pos);
actor->temp_data[0]++;//Number of bounces

8
source/games/duke/src/actors_r.cpp
View file

@ -1848,14 +1848,14 @@ static void rrra_specialstats()
case MAMA:
if (enemysizecheat == 3)
{
act->spr.xrepeat <<= 1;
act->spr.yrepeat <<= 1;
act->spr.MultScaleX(2);
act->spr.MultScaleY(2);
act->setClipDistFromTile();
}
else if (enemysizecheat == 2)
{
act->spr.xrepeat >>= 1;
act->spr.yrepeat >>= 1;
act->spr.MultScaleX(0.5);
act->spr.MultScaleY(0.5);
act->clipdist = MulScale(act->spr.xrepeat, tileHeight(act->spr.picnum), 7) * 0.25;
}
break;

8
source/games/duke/src/player_d.cpp
View file

@ -760,8 +760,8 @@ static void shootrpg(DDukeActor *actor, int p, DVector3 pos, DAngle ang, int atw
else
{
spawned->spr.yint = gs.numfreezebounces;
spawned->spr.xrepeat >>= 1;
spawned->spr.yrepeat >>= 1;
spawned->spr.MultScaleX(0.5);
spawned->spr.MultScaleY(0.5);
spawned->vel.Z -= 0.25;
}
@ -829,8 +829,8 @@ static void shootrpg(DDukeActor *actor, int p, DVector3 pos, DAngle ang, int atw
DVector2 spawnofs(ang.Sin()* 4, ang.Cos() * -4);
spawned->spr.pos += spawnofs;
}
spawned->spr.xrepeat >>= 1;
spawned->spr.yrepeat >>= 1;
spawned->spr.MultScaleX(0.5);
spawned->spr.MultScaleY(0.5);
}
spawned->spr.cstat = CSTAT_SPRITE_YCENTER;

8
source/games/duke/src/player_r.cpp
View file

@ -692,8 +692,8 @@ static void shootrpg(DDukeActor* actor, int p, DVector3 pos, DAngle ang, int atw
else
{
spawned->spr.yint = gs.numfreezebounces;
spawned->spr.xrepeat >>= 1;
spawned->spr.yrepeat >>= 1;
spawned->spr.MultScaleX(0.5);
spawned->spr.MultScaleY(0.5);
spawned->vel.Z -= 0.125;
}
@ -726,8 +726,8 @@ static void shootrpg(DDukeActor* actor, int p, DVector3 pos, DAngle ang, int atw
DVector2 spawnofs(ang.Sin() * 4, ang.Cos() * -4);
spawned->spr.pos += spawnofs;
}
spawned->spr.xrepeat >>= 1;
spawned->spr.yrepeat >>= 1;
spawned->spr.MultScaleX(0.5);
spawned->spr.MultScaleY(0.5);
}
spawned->spr.cstat = CSTAT_SPRITE_YCENTER;

4
source/games/duke/src/spawn_r.cpp
View file

@ -253,8 +253,8 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
rrra_badguy:
if (act->spr.picnum == JIBS6)
{
act->spr.xrepeat >>= 1;
act->spr.yrepeat >>= 1;
act->spr.MultScaleX(0.5);
act->spr.MultScaleY(0.5);
}
else if (isRRRA())
{