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

- floatified PlotCourseToSprite's return

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-11 00:02:17 +02:00
parent 7b8b4a48f7
commit 3709b61fd1
10 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/exhumed/src/aistuff.h
View file

@ -222,7 +222,7 @@ void FuncCreatureChunk(int a, int, int nRun);
DExhumedActor* FindPlayer(DExhumedActor* nSprite, int nDistance, bool dontengage = false);
DExhumedActor* BuildCreatureChunk(DExhumedActor* pSrc, int nPic, bool bSpecial = false);
int PlotCourseToSprite(DExhumedActor* nSprite1, DExhumedActor* nSprite2);
double PlotCourseToSprite(DExhumedActor* nSprite1, DExhumedActor* nSprite2);
void CheckSectorFloor(sectortype* pSector, double z, DVector2& xy);
DAngle GetAngleToSprite(DExhumedActor* nSprite1, DExhumedActor* nSprite2);
DAngle GetWallNormal(walltype* nWall);

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

@ -233,7 +233,7 @@ void AIAnubis::Tick(RunListEvent* ev)
}
else
{
if (PlotCourseToSprite(ap, pTarget) >= 768)
if (PlotCourseToSprite(ap, pTarget) >= 48)
{
ap->nAction = 1;
}

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

@ -380,7 +380,7 @@ void AIFish::Tick(RunListEvent* ev)
pActor->vel.Y = 0;
}
pActor->set_int_zvel(int((pTargetActor->spr.pos.Z - pActor->spr.pos.Z) * zworldtoint / 8));
pActor->vel.Z = (pTargetActor->spr.pos.Z - pActor->spr.pos.Z) / 8.;
}
break;
}

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

@ -333,7 +333,7 @@ void AILion::Tick(RunListEvent* ev)
}
else
{
if (PlotCourseToSprite(pActor, pTarget) >= 768)
if (PlotCourseToSprite(pActor, pTarget) >= 48)
{
pActor->nAction = 2;
}

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

@ -550,14 +550,14 @@ DAngle GetAngleToSprite(DExhumedActor* a1, DExhumedActor* a2)
return VecToAngle(a2->spr.pos - a1->spr.pos);
}
int PlotCourseToSprite(DExhumedActor* pActor1, DExhumedActor* pActor2)
double PlotCourseToSprite(DExhumedActor* pActor1, DExhumedActor* pActor2)
{
if (pActor1 == nullptr || pActor2 == nullptr)
return -1;
auto vect = pActor2->spr.pos.XY() - pActor1->spr.pos.XY();
pActor1->spr.angle = VecToAngle(vect);
return int(vect.Length() * worldtoint);
return vect.Length();
}

6
source/games/exhumed/src/mummy.cpp
View file

@ -224,14 +224,14 @@ void AIMummy::Tick(RunListEvent* ev)
{
if (pActor->vel.X > 0)
{
pActor->add_int_xvel(-1024);
pActor->vel.X -= 64;
if (pActor->vel.X < 0) {
pActor->vel.X = 0;
}
}
else if (pActor->vel.X < 0)
{
pActor->add_int_xvel( 1024);
pActor->vel.X += 64;
if (pActor->vel.X > 0) {
pActor->vel.X = 0;
}
@ -292,7 +292,7 @@ void AIMummy::Tick(RunListEvent* ev)
}
else
{
if (PlotCourseToSprite(pActor, pTarget) >= 1024)
if (PlotCourseToSprite(pActor, pTarget) >= 64)
{
pActor->nAction = 1;
pActor->nFrame = 0;

4
source/games/exhumed/src/rex.cpp
View file

@ -251,7 +251,7 @@ void AIRex::Tick(RunListEvent* ev)
}
else
{
if (((PlotCourseToSprite(pActor, pTarget) >> 8) >= 60) || pActor->nCount > 0)
if ((PlotCourseToSprite(pActor, pTarget) >= 60*16) || pActor->nCount > 0)
{
pActor->vel.XY() = pActor->spr.angle.ToVector() * 256;
}
@ -374,7 +374,7 @@ void AIRex::Tick(RunListEvent* ev)
{
if (pTarget != nullptr)
{
if (PlotCourseToSprite(pActor, pTarget) < 768)
if (PlotCourseToSprite(pActor, pTarget) < 48)
{
if (nFlag & 0x80)
{

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

@ -279,7 +279,7 @@ void AIScorp::Tick(RunListEvent* ev)
}
else
{
if (PlotCourseToSprite(pActor, pTarget) >= 768)
if (PlotCourseToSprite(pActor, pTarget) >= 48)
{
pActor->nAction = 1;
}

8
source/games/exhumed/src/set.cpp
View file

@ -343,7 +343,7 @@ void AISet::Tick(RunListEvent* ev)
SetQuake(pActor, 100);
}
int nCourse = PlotCourseToSprite(pActor, pTarget);
double nCourse = PlotCourseToSprite(pActor, pTarget);
if ((pActor->nPhase & 0x1F) == (totalmoves & 0x1F))
{
@ -374,7 +374,7 @@ void AISet::Tick(RunListEvent* ev)
}
default:
{
if (nCourse <= 100)
if (nCourse <= 100/16.)
{
pActor->nIndex2 = 0;
}
@ -462,7 +462,7 @@ void AISet::Tick(RunListEvent* ev)
}
else
{
if (PlotCourseToSprite(pActor, pTarget) >= 768)
if (PlotCourseToSprite(pActor, pTarget) >= 48)
{
pActor->nAction = 3;
}
@ -513,7 +513,7 @@ void AISet::Tick(RunListEvent* ev)
}
else
{
pActor->set_int_zvel(-(PlotCourseToSprite(pActor, pTarget)));
pActor->vel.Z = -(PlotCourseToSprite(pActor, pTarget)) / 16.;
}
pActor->nAction = 8;

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

@ -245,7 +245,7 @@ void AISpider::Tick(RunListEvent* ev)
D3PlayFX(StaticSound[kSound38], spp);
}
if (PlotCourseToSprite(spp, pTarget) < 1024) {
if (PlotCourseToSprite(spp, pTarget) < 64) {
return;
}