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

- unwrapped vector SetScale.

Browse source
This commit is contained in:
Christoph Oelckers 2022-10-07 23:48:36 +02:00
parent 15db7a7143
commit da523eb8e3
4 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/core/maptypes.h
View file

@ -481,11 +481,6 @@ struct spritetypebase
{
scale = { x, y };
}
void SetScale(const DVector2& p)
{
scale = p;
}
};

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

@ -1414,7 +1414,7 @@ DExhumedActor* BuildSpark(DExhumedActor* pActor, int nVal)
}
else
{
pSpark->spr.SetScale(pActor->spr.scale + DVector2(0.234375, 0.234375));
pSpark->spr.scale = pActor->spr.scale + DVector2(0.234375, 0.234375);
}
}
else

4
source/games/sw/src/draw.cpp
View file

@ -349,7 +349,7 @@ void DoShadows(tspriteArray& tsprites, tspritetype* tsp, double viewz)
double scaleofs = (ground_dist - view_dist) * REPEAT_SCALE;
scale.X = clamp(scale.X + scaleofs, 0.0625, 4.);
scale.Y = clamp(scale.Y + scaleofs, 0.0625, 4.);
tSpr->SetScale(scale);
tSpr->scale = scale;
if (tilehasmodelorvoxel(tsp->picnum,tsp->pal))
{
@ -428,7 +428,7 @@ void DoMotionBlur(tspriteArray& tsprites, tspritetype const * const tsp)
tSpr->pos += dpos;
dpos += npos;
tSpr->SetScale(scale);
tSpr->scale = scale;
scale.X -= repeat_adj;
scale.Y -= repeat_adj;

4
source/games/sw/src/weapon.cpp
View file

@ -3811,7 +3811,7 @@ int DoVomit(DSWActor* actor)
actor->user.Counter = NORM_ANGLE(actor->user.Counter + (30*MISSILEMOVETICS));
// notreallypos
auto v = actor->user.pos + mapangle(actor->user.Counter).ToVector() * 12 * REPEAT_SCALE;
actor->spr.SetScale(v);
actor->spr.scale = v;
if (actor->user.Flags & (SPR_JUMPING))
{
DoJump(actor);
@ -18353,7 +18353,7 @@ void QueueGeneric(DSWActor* actor, short pic)
}
actor->spr.picnum = pic;
actor->spr.SetScale(scale);
actor->spr.scale = scale;
actor->spr.cstat = 0;
switch (actor->spr.picnum)
{