zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-04 23:12:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added ScaleY method to spritetype and used it to get rid of a large amount of 'yrepeat * REPEAT_SCALE'

Browse source
This commit is contained in:
Christoph Oelckers 2022-10-05 20:06:24 +02:00
parent 8d1626de02
commit 8c308c8d3e
30 changed files with 70 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/core/actorlist.cpp
View file

@ -490,7 +490,7 @@ int DCoreActor::GetOffsetAndHeight(int& height)
double DCoreActor::GetOffsetAndHeight(double& height)
{
double yrepeat = spr.yrepeat * REPEAT_SCALE;
double yrepeat = spr.ScaleY();
height = tileHeight(spr.picnum) * yrepeat;
double zofs = (spr.cstat & CSTAT_SPRITE_YCENTER) ? height * 0.5 : 0;
return zofs - tileTopOffset(spr.picnum) * yrepeat;

2
source/core/automap.cpp
View file

@ -672,7 +672,7 @@ void DrawAutomapAlignmentWall(const spritetype& spr, const DVector2& bpos, const
void DrawAutomapAlignmentFloor(const spritetype& spr, const DVector2& bpos, const DVector2& cangvect, const double czoom, const DVector2& xydim, const PalEntry& col)
{
auto xrep = spr.xrepeat * REPEAT_SCALE;
auto yrep = spr.yrepeat * REPEAT_SCALE;
auto yrep = spr.ScaleY();
auto xspan = tileWidth(spr.picnum);
auto yspan = tileHeight(spr.picnum);
auto xoff = tileLeftOffset(spr.picnum);

2
source/core/gamefuncs.cpp
View file

@ -250,7 +250,7 @@ void TGetFlatSpritePosition(const spritetypebase* spr, const DVector2& pos, DVec
double width, height, leftofs, topofs;
double sloperatio = sqrt(heinum * heinum + SLOPEVAL_FACTOR * SLOPEVAL_FACTOR) * (1. / SLOPEVAL_FACTOR);
double xrepeat = spr->xrepeat * REPEAT_SCALE;
double yrepeat = spr->yrepeat * REPEAT_SCALE;
double yrepeat = spr->ScaleY();
int xo = heinum ? 0 : spr->xoffset;
int yo = heinum ? 0 : spr->yoffset;

5
source/core/maptypes.h
View file

@ -479,6 +479,11 @@ struct spritetypebase
xrepeat = uint8_t(x * (1 / REPEAT_SCALE));
yrepeat = uint8_t(y * (1 / REPEAT_SCALE));
}
double ScaleY() const
{
return yrepeat * REPEAT_SCALE;
}
};

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

@ -2573,7 +2573,7 @@ static void ConcussSprite(DBloodActor* source, DBloodActor* actor, const DVector
if (mass > 0)
{
double size = (tileWidth(actor->spr.picnum) * actor->spr.xrepeat * REPEAT_SCALE * tileHeight(actor->spr.picnum) * actor->spr.yrepeat * REPEAT_SCALE) / 0x20000;
double size = (tileWidth(actor->spr.picnum) * actor->spr.xrepeat * REPEAT_SCALE * tileHeight(actor->spr.picnum) * actor->spr.ScaleY()) / 0x20000;
actor->vel += vect * Scale(damage, size, mass);
}
}

4
source/games/blood/src/ai.cpp
View file

@ -1501,7 +1501,7 @@ void aiThinkTarget(DBloodActor* actor)
double nDist = dvec.Length();
if (nDist > pDudeInfo->SeeDist() && nDist > pDudeInfo->HearDist())
continue;
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (!cansee(ppos, pSector, actor->spr.pos.plusZ(-height), actor->sector()))
continue;
@ -1546,7 +1546,7 @@ void aiLookForTarget(DBloodActor* actor)
double nDist = dvec.Length();
if (nDist > pDudeInfo->SeeDist() && nDist > pDudeInfo->HearDist())
continue;
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (!cansee(ppos, pSector, actor->spr.pos.plusZ(-height), actor->sector()))
continue;
DAngle nDeltaAngle = absangle(actor->spr.angle, dvec.Angle());

12
source/games/blood/src/aibat.cpp
View file

@ -70,8 +70,8 @@ void batBiteSeqCallback(int, DBloodActor* actor)
DUDEINFO* pDudeInfo = getDudeInfo(actor->spr.type);
DUDEINFO* pDudeInfoT = getDudeInfo(pTarget->spr.type);
double height = (actor->spr.yrepeat * pDudeInfo->eyeHeight) * REPEAT_SCALE;
double height2 = (pTarget->spr.yrepeat * pDudeInfoT->eyeHeight) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
double height2 = (pDudeInfoT->eyeHeight * pTarget->spr.ScaleY());
actFireVector(actor, 0., 0., DVector3(actor->spr.angle.ToVector() * 64, height2 - height), kVectorBatBite);
}
@ -104,7 +104,7 @@ static void batThinkTarget(DBloodActor* actor)
double nDist = dvec.Length();
if (nDist > pDudeInfo->SeeDist() && nDist > pDudeInfo->HearDist())
continue;
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (!cansee(ppos, pSector, actor->spr.pos.plusZ(-height), actor->sector()))
continue;
DAngle nDeltaAngle = absangle(actor->spr.angle, dvec.Angle());
@ -166,7 +166,7 @@ static void batThinkPonder(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, dvec.Angle());
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
double height2 = (getDudeInfo(pTarget->spr.type)->eyeHeight * pTarget->spr.yrepeat) * REPEAT_SCALE;
double top, bottom;
GetActorExtents(actor, &top, &bottom);
@ -260,9 +260,9 @@ static void batThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, dvec.Angle());
double height = pDudeInfo->eyeHeight * actor->spr.yrepeat * REPEAT_SCALE;
double height = pDudeInfo->eyeHeight * actor->spr.ScaleY();
// Should be dudeInfo[pTarget->spr.type-kDudeBase]
double height2 = pDudeInfo->eyeHeight * pTarget->spr.yrepeat * REPEAT_SCALE;
double height2 = pDudeInfo->eyeHeight * pTarget->spr.ScaleY();
double top, bottom;
GetActorExtents(actor, &top, &bottom);
if (cansee(pTarget->spr.pos, pTarget->sector(), actor->spr.pos.plusZ(-height), actor->sector()))

4
source/games/blood/src/aibeast.cpp
View file

@ -233,7 +233,7 @@ static void beastThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, dv.Angle());
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDist < pDudeInfo->SeeDist() && nDeltaAngle <= pDudeInfo->Periphery())
@ -364,7 +364,7 @@ static void beastThinkSwimChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDist < pDudeInfo->SeeDist() && nDeltaAngle <= pDudeInfo->Periphery())

10
source/games/blood/src/aiboneel.cpp
View file

@ -80,8 +80,8 @@ void eelBiteSeqCallback(int, DBloodActor* actor)
assert(actor->spr.type >= kDudeBase && actor->spr.type < kDudeMax);
DUDEINFO* pDudeInfo = getDudeInfo(actor->spr.type);
DUDEINFO* pDudeInfoT = getDudeInfo(target->spr.type);
double height = (actor->spr.yrepeat * pDudeInfo->eyeHeight) * REPEAT_SCALE;
double height2 = (target->spr.yrepeat * pDudeInfoT->eyeHeight) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
double height2 = (pDudeInfoT->eyeHeight * target->spr.ScaleY());
DVector3 vect(actor->spr.angle.ToVector() * 1024, height2 - height);
actFireVector(actor, 0., 0., vect, kVectorBoneelBite);
@ -115,7 +115,7 @@ static void eelThinkTarget(DBloodActor* actor)
double nDist = dvect.Length();
if (nDist > pDudeInfo->SeeDist() && nDist > pDudeInfo->HearDist())
continue;
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (!cansee(ppos, pSector, actor->spr.pos.plusZ(-height), actor->sector()))
continue;
DAngle nDeltaAngle = absangle(actor->spr.angle, dvect.Angle());
@ -181,7 +181,7 @@ static void eelThinkPonder(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
double height2 = (getDudeInfo(target->spr.type)->eyeHeight * target->spr.yrepeat) * REPEAT_SCALE;
double top, bottom;
GetActorExtents(actor, &top, &bottom);
@ -276,7 +276,7 @@ static void eelThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
double top, bottom;
double top2, bottom2;
GetActorExtents(actor, &top, &bottom);

2
source/games/blood/src/aiburn.cpp
View file

@ -195,7 +195,7 @@ static void burnThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDist < pDudeInfo->SeeDist() && nDeltaAngle <= pDudeInfo->Periphery())

4
source/games/blood/src/aicaleb.cpp
View file

@ -152,7 +152,7 @@ static void calebThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDist < pDudeInfo->SeeDist() && nDeltaAngle <= pDudeInfo->Periphery())
@ -251,7 +251,7 @@ static void calebThinkSwimChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{

8
source/games/blood/src/aicerber.cpp
View file

@ -78,7 +78,7 @@ void cerberusBiteSeqCallback(int, DBloodActor* actor)
void cerberusBurnSeqCallback(int, DBloodActor* actor)
{
DUDEINFO* pDudeInfo = getDudeInfo(actor->spr.type);
double height = pDudeInfo->eyeHeight * actor->spr.yrepeat * REPEAT_SCALE * 0.25;
double height = pDudeInfo->eyeHeight * actor->spr.ScaleY() * 0.25;
if (!actor->ValidateTarget(__FUNCTION__)) return;
DVector3 pos(actor->spr.pos.XY(), height);
@ -140,7 +140,7 @@ void cerberusBurnSeqCallback2(int, DBloodActor* actor)
{
if (!actor->ValidateTarget(__FUNCTION__)) return;
DUDEINFO* pDudeInfo = getDudeInfo(actor->spr.type);
double height = pDudeInfo->eyeHeight * actor->spr.yrepeat * REPEAT_SCALE * 0.25;
double height = pDudeInfo->eyeHeight * actor->spr.ScaleY() * 0.25;
DVector3 pos(actor->spr.pos.XY(), height);
//auto pos = actor->spr.pos.plusZ(height); // what it probably should be
@ -246,7 +246,7 @@ static void cerberusThinkTarget(DBloodActor* actor)
double nDist = dvect.Length();
if (nDist > pDudeInfo->SeeDist() && nDist > pDudeInfo->HearDist())
continue;
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (!cansee(ppos, pSector, actor->spr.pos.plusZ(-height), actor->sector()))
continue;
DAngle nDeltaAngle = absangle(actor->spr.angle, dvect.Angle());
@ -352,7 +352,7 @@ static void cerberusThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDist < pDudeInfo->SeeDist() && nDeltaAngle <= pDudeInfo->Periphery())

2
source/games/blood/src/aicult.cpp
View file

@ -264,7 +264,7 @@ static void cultThinkChase(DBloodActor* actor)
if (nDist > 0 && nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDist < pDudeInfo->SeeDist() && nDeltaAngle <= pDudeInfo->Periphery())

10
source/games/blood/src/aigarg.cpp
View file

@ -81,8 +81,8 @@ void SlashFSeqCallback(int, DBloodActor* actor)
auto target = actor->GetTarget();
DUDEINFO* pDudeInfo = getDudeInfo(actor->spr.type);
DUDEINFO* pDudeInfoT = getDudeInfo(target->spr.type);
double height = (actor->spr.yrepeat * pDudeInfo->eyeHeight) * REPEAT_SCALE;
double height2 = (target->spr.yrepeat * pDudeInfoT->eyeHeight) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
double height2 = (pDudeInfoT->eyeHeight * target->spr.ScaleY());
DVector3 vec(actor->spr.angle.ToVector() * 64, height - height2);
actFireVector(actor, 0, 0, vec, kVectorGargSlash);
@ -202,7 +202,7 @@ static void gargThinkTarget(DBloodActor* actor)
double nDist = dvect.Length();
if (nDist > pDudeInfo->SeeDist() && nDist > pDudeInfo->HearDist())
continue;
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (!cansee(ppos, pSector, actor->spr.pos.plusZ(-height), actor->sector()))
continue;
DAngle nDeltaAngle = absangle(actor->spr.angle, dvect.Angle());
@ -321,9 +321,9 @@ static void gargThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, dxyAngle);
double height = pDudeInfo->eyeHeight * actor->spr.yrepeat * REPEAT_SCALE;
double height = pDudeInfo->eyeHeight * actor->spr.ScaleY();
// Should be dudeInfo[target->spr.type-kDudeBase]
double height2 = pDudeInfo->eyeHeight * target->spr.yrepeat * REPEAT_SCALE;
double height2 = pDudeInfo->eyeHeight * target->spr.ScaleY();
double top, bottom;
GetActorExtents(actor, &top, &bottom);
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))

10
source/games/blood/src/aighost.cpp
View file

@ -66,8 +66,8 @@ void ghostSlashSeqCallback(int, DBloodActor* actor)
auto target = actor->GetTarget();
DUDEINFO* pDudeInfo = getDudeInfo(actor->spr.type);
DUDEINFO* pDudeInfoT = getDudeInfo(target->spr.type);
double height = (actor->spr.yrepeat * pDudeInfo->eyeHeight) * REPEAT_SCALE;
double height2 = (target->spr.yrepeat * pDudeInfoT->eyeHeight) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
double height2 = (pDudeInfoT->eyeHeight * target->spr.ScaleY());
DVector3 dv(actor->spr.angle.ToVector() * 64, height - height2);
sfxPlay3DSound(actor, 1406, 0, 0);
@ -183,7 +183,7 @@ static void ghostThinkTarget(DBloodActor* actor)
double nDist = dvect.Length();
if (nDist > pDudeInfo->SeeDist() && nDist > pDudeInfo->HearDist())
continue;
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (!cansee(ppos, pSector, actor->spr.pos.plusZ(-height), actor->sector()))
continue;
DAngle nDeltaAngle = absangle(actor->spr.angle, dvect.Angle());
@ -300,9 +300,9 @@ static void ghostThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, dxyAngle);
double height = pDudeInfo->eyeHeight * actor->spr.yrepeat * REPEAT_SCALE;
double height = pDudeInfo->eyeHeight * actor->spr.ScaleY();
// Should be dudeInfo[target->spr.type-kDudeBase]
double height2 = pDudeInfo->eyeHeight * target->spr.yrepeat * REPEAT_SCALE;
double height2 = pDudeInfo->eyeHeight * target->spr.ScaleY();
double top, bottom;
GetActorExtents(actor, &top, &bottom);
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))

4
source/games/blood/src/aigilbst.cpp
View file

@ -137,7 +137,7 @@ static void gillThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDist < pDudeInfo->SeeDist() && nDeltaAngle <= pDudeInfo->Periphery())
@ -235,7 +235,7 @@ static void gillThinkSwimChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
double top, bottom;
GetActorExtents(actor, &top, &bottom);
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))

2
source/games/blood/src/aihand.cpp
View file

@ -104,7 +104,7 @@ static void handThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDist < pDudeInfo->SeeDist() && abs(nDeltaAngle) <= pDudeInfo->Periphery())

2
source/games/blood/src/aihound.cpp
View file

@ -116,7 +116,7 @@ static void houndThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDist < pDudeInfo->SeeDist() && abs(nDeltaAngle) <= pDudeInfo->Periphery())

2
source/games/blood/src/aiinnoc.cpp
View file

@ -89,7 +89,7 @@ static void innocThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDist < pDudeInfo->SeeDist() && abs(nDeltaAngle) <= pDudeInfo->Periphery())

2
source/games/blood/src/aipod.cpp
View file

@ -199,7 +199,7 @@ static void aiPodChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDist < pDudeInfo->SeeDist() && abs(nDeltaAngle) <= pDudeInfo->Periphery())

2
source/games/blood/src/airat.cpp
View file

@ -101,7 +101,7 @@ static void ratThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDist < pDudeInfo->SeeDist() && abs(nDeltaAngle) <= pDudeInfo->Periphery())

2
source/games/blood/src/aispid.cpp
View file

@ -209,7 +209,7 @@ static void spidThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDist < pDudeInfo->SeeDist() && nDeltaAngle <= pDudeInfo->Periphery())

4
source/games/blood/src/aitchern.cpp
View file

@ -209,7 +209,7 @@ static void sub_725A4(DBloodActor* actor)
if (nDist > pDudeInfo->SeeDist() && nDist > pDudeInfo->HearDist())
continue;
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(ppos, pSector, actor->spr.pos.plusZ(-height), actor->sector()))
continue;
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
@ -281,7 +281,7 @@ static void tchernobogThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDist < pDudeInfo->SeeDist() && abs(nDeltaAngle) <= pDudeInfo->Periphery())

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

@ -192,12 +192,12 @@ void punchCallback(int, DBloodActor* actor)
auto const target = actor->GetTarget();
if (target != nullptr)
{
double nZOffset1 = getDudeInfo(actor->spr.type)->eyeHeight * actor->spr.yrepeat * REPEAT_SCALE;
double nZOffset1 = getDudeInfo(actor->spr.type)->eyeHeight * actor->spr.ScaleY();
double nZOffset2 = 0;
if (target->IsDudeActor())
nZOffset2 = getDudeInfo(target->spr.type)->eyeHeight * target->spr.yrepeat * REPEAT_SCALE;
nZOffset2 = getDudeInfo(target->spr.type)->eyeHeight * target->spr.ScaleY();
if (!playGenDudeSound(actor, kGenDudeSndAttackMelee))
sfxPlay3DSound(actor, 530, 1, 0);
@ -513,7 +513,7 @@ static void unicultThinkChase(DBloodActor* actor)
DUDEINFO* pDudeInfo = getDudeInfo(actor->spr.type);
DAngle losAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (dist > pDudeInfo->SeeDist() || !cansee(target->spr.pos, target->sector(),
actor->spr.pos.plusZ(-height), actor->sector()))

10
source/games/blood/src/aizomba.cpp
View file

@ -67,8 +67,8 @@ void HackSeqCallback(int, DBloodActor* actor)
DVector3 dv;
dv.XY() = (actor->xspr.TargetPos.XY() - actor->spr.pos.XY()).Resized(64);
double height = (actor->spr.yrepeat * pDudeInfo->eyeHeight) * REPEAT_SCALE;
double height2 = (target->spr.yrepeat * pDudeInfoT->eyeHeight) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
double height2 = (pDudeInfoT->eyeHeight * target->spr.ScaleY());
dv.Z = height - height2;
sfxPlay3DSound(actor, 1101, 1, 0);
@ -134,7 +134,7 @@ static void zombaThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDeltaAngle <= pDudeInfo->Periphery())
@ -181,7 +181,7 @@ static void zombaThinkPonder(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDeltaAngle <= pDudeInfo->Periphery())
@ -219,7 +219,7 @@ static void myThinkTarget(DBloodActor* actor)
double nDist = dvect.Length();
if (nDist > pDudeInfo->SeeDist() && nDist > pDudeInfo->HearDist())
continue;
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (!cansee(ppos, pSector, actor->spr.pos.plusZ(-height), actor->sector()))
continue;
DAngle nDeltaAngle = absangle(actor->spr.angle, dvect.Angle());

6
source/games/blood/src/aizombf.cpp
View file

@ -67,8 +67,8 @@ void PukeSeqCallback(int, DBloodActor* actor)
DVector2 dv = (actor->xspr.TargetPos.XY() - actor->spr.pos.XY()).Resized(64);
double height = (actor->spr.yrepeat * pDudeInfo->eyeHeight) * REPEAT_SCALE;
double height2 = (target->spr.yrepeat * pDudeInfoT->eyeHeight) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
double height2 = (pDudeInfoT->eyeHeight * target->spr.ScaleY());
double z = (height - height2) * 0.25;
sfxPlay3DSound(actor, 1203, 1, 0);
@ -128,7 +128,7 @@ static void zombfThinkChase(DBloodActor* actor)
if (nDist <= pDudeInfo->SeeDist())
{
DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double height = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{
if (nDeltaAngle <= pDudeInfo->Periphery())

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

@ -390,7 +390,7 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF
pNSprite->pal = 5;
int height = tileHeight(pNSprite->picnum);
int center = height / 2 + tileTopOffset(pNSprite->picnum);
pNSprite->pos.Z -= (pNSprite->yrepeat * REPEAT_SCALE) * (height - center);
pNSprite->pos.Z -= (pNSprite->ScaleY()) * (height - center);
break;
}
case kViewEffectFlareHalo:

4
source/games/blood/src/db.h
View file

@ -87,8 +87,8 @@ void GetSpriteExtents(spritetypebase const* const pSprite, double* top, double*
{
int height = tileHeight(pSprite->picnum);
int center = height / 2 + tileTopOffset(pSprite->picnum);
*top -= pSprite->yrepeat * REPEAT_SCALE * center;
*bottom += pSprite->yrepeat * REPEAT_SCALE * (height - center);
*top -= pSprite->ScaleY() * center;
*bottom += pSprite->ScaleY() * (height - center);
}
}

6
source/games/blood/src/nnexts.cpp
View file

@ -3326,7 +3326,7 @@ void useEffectGen(DBloodActor* sourceactor, DBloodActor* actor)
pos = bottom;
break;
case 2: // middle
pos = actor->spr.pos.Z + (tileHeight(actor->spr.picnum) / 2 + tileTopOffset(actor->spr.picnum)) * actor->spr.yrepeat * REPEAT_SCALE;
pos = actor->spr.pos.Z + (tileHeight(actor->spr.picnum) / 2 + tileTopOffset(actor->spr.picnum)) * actor->spr.ScaleY();
break;
case 3:
case 4:
@ -3769,7 +3769,7 @@ void useSeqSpawnerGen(DBloodActor* sourceactor, int objType, sectortype* pSector
break;
case 4:
// this had no value shift and no yrepeat handling, which looks like a bug.
pos.Z += (tileHeight(iactor->spr.picnum) / 2 + tileTopOffset(iactor->spr.picnum)) * iactor->spr.yrepeat * REPEAT_SCALE;
pos.Z += (tileHeight(iactor->spr.picnum) / 2 + tileTopOffset(iactor->spr.picnum)) * iactor->spr.ScaleY();
break;
case 5:
case 6:
@ -8422,7 +8422,7 @@ DBloodActor* aiPatrolSearchTargets(DBloodActor* actor)
if (nDistf <= seeDistf)
{
double scratch;
double eyeAboveZ = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
double eyeAboveZ = (pDudeInfo->eyeHeight * actor->spr.ScaleY());
if (nDistf < seeDistf / 8) GetActorExtents(pPlayer->actor, &pos.Z, &scratch); //use ztop of the target sprite
if (!cansee(pos, plActor->sector(), actor->spr.pos - eyeAboveZ, actor->sector()))
continue;

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

@ -402,7 +402,7 @@ Collision movespritez(DExhumedActor* pActor, double z, double height, double cli
double GetActorHeight(DExhumedActor* actor)
{
return tileHeight(actor->spr.picnum) * actor->spr.yrepeat * REPEAT_SCALE;
return tileHeight(actor->spr.picnum) * actor->spr.ScaleY();
}
DExhumedActor* insertActor(sectortype* s, int st)