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

- handled a few easy to change distance calculations and nearby assignments.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-11 20:46:21 +02:00
parent 4cb214f3ab
commit b467e6c6cf
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1718,13 +1718,13 @@ void recon(DDukeActor *actor, int explosion, int firelaser, int attacksnd, int p
if (actor->temp_data[0] == 1 || actor->temp_data[0] == 4) // Found a locator and going with it
{
l = dist(Owner, actor);
double dist = (Owner->spr.pos - actor->spr.pos).Length();
if (l <= 1524) { if (actor->temp_data[0] == 1) actor->temp_data[0] = 0; else actor->temp_data[0] = 5; }
if (dist <= 1524/16.) { if (actor->temp_data[0] == 1) actor->temp_data[0] = 0; else actor->temp_data[0] = 5; }
else
{
// Control speed here
if (l > 1524) { if (actor->int_xvel() < 256) actor->vel.X += 2.; }
if (dist > 1524 / 16.) { if (actor->vel.X < 16) actor->vel.X += 2.; }
else
{
if(actor->vel.X > 0) actor->vel.X -= 1;

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

@ -1541,7 +1541,7 @@ static void weaponcommon_d(DDukeActor* proj)
MulScale(k, bsin(proj->int_ang()), 14), ll, CLIPMASK1, coll);
if (proj->spr.picnum == RPG && proj->temp_actor != nullptr)
if (FindDistance2D(proj->int_pos().vec2 - proj->temp_actor->int_pos().vec2) < 256)
if ((proj->spr.pos.XY() - proj->temp_actor->spr.pos.XY()).Length() < 16)
coll.setSprite(proj->temp_actor);
if (!proj->insector())
@ -3178,9 +3178,9 @@ void handle_se06_d(DDukeActor* actor)
DukeStatIterator it(STAT_EFFECTOR);
while (auto act2 = it.Next())
{
if ((act2->spr.lotag == 14) && (sh == act2->spr.hitag) && (act2->temp_data[0] == actor->temp_data[0]))
if ((act2->spr.lotag == SE_14_SUBWAY_CAR) && (sh == act2->spr.hitag) && (act2->temp_data[0] == actor->temp_data[0]))
{
act2->set_int_xvel(actor->int_xvel());
act2->vel.X = actor->vel.X;
//if( actor->temp_data[4] == 1 )
{
if (act2->temp_data[5] == 0)
@ -3188,7 +3188,7 @@ void handle_se06_d(DDukeActor* actor)
int x = Sgn(dist(act2, actor) - act2->temp_data[5]);
if (act2->spr.extra)
x = -x;
actor->add_int_xvel( x);
actor->vel.X += x / 16.;
}
act2->temp_data[4] = actor->temp_data[4];
}

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

@ -1232,7 +1232,7 @@ static void weaponcommon_r(DDukeActor *proj)
MulScale(k, bsin(proj->int_ang()), 14), ll, CLIPMASK1, coll);
if ((proj->spr.picnum == RPG || (isRRRA() && isIn(proj->spr.picnum, RPG2, RRTILE1790))) && proj->temp_actor != nullptr)
if (FindDistance2D(proj->int_pos().vec2 - proj->temp_actor->int_pos().vec2) < 256)
if ((proj->spr.pos.XY() - proj->temp_actor->spr.pos.XY()).Length() < 16)
coll.setSprite(proj->temp_actor);
if (!proj->insector()) // || (isRR() && proj->sector()->filler == 800))
@ -3218,16 +3218,16 @@ void handle_se06_r(DDukeActor *actor)
DukeStatIterator it(STAT_EFFECTOR);
while (auto act2 = it.Next())
{
if ((act2->spr.lotag == 14) && (sh == act2->spr.hitag) && (act2->temp_data[0] == actor->temp_data[0]))
if ((act2->spr.lotag == SE_14_SUBWAY_CAR) && (sh == act2->spr.hitag) && (act2->temp_data[0] == actor->temp_data[0]))
{
act2->set_int_xvel(actor->int_xvel());
// if( actor->temp_data[4] == 1 )
act2->vel.X = actor->vel.X;
//if( actor->temp_data[4] == 1 )
{
if (act2->temp_data[5] == 0)
act2->temp_data[5] = dist(act2, actor);
int x = Sgn(dist(act2, actor) - act2->temp_data[5]);
if (act2->spr.extra) x = -x;
actor->add_int_xvel( x);
actor->vel.X += x / 16.;
}
act2->temp_data[4] = actor->temp_data[4];
}

2
source/games/duke/src/player.cpp
View file

@ -390,7 +390,7 @@ void dokneeattack(int snum, const std::initializer_list<int> & respawnlist)
p->holster_weapon = 0;
if (p->weapon_pos < 0)
p->weapon_pos = -p->weapon_pos;
if (p->actorsqu != nullptr && dist(p->GetActor(), p->actorsqu) < 1400)
if (p->actorsqu != nullptr && (p->GetActor()->spr.pos - p->actorsqu->spr.pos).Length() < 1400/16.)
{
fi.guts(p->actorsqu, TILE_JIBS6, 7, myconnectindex);
spawn(p->actorsqu, TILE_BLOODPOOL);

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

@ -67,7 +67,7 @@ BEGIN_DUKE_NS
void GameInterface::UpdateCameras(double smoothratio)
{
const int VIEWSCREEN_ACTIVE_DISTANCE = 8192;
const int VIEWSCREEN_ACTIVE_DISTANCE = 512;
if (camsprite == nullptr)
return;
@ -75,7 +75,7 @@ void GameInterface::UpdateCameras(double smoothratio)
auto p = &ps[screenpeek];
if (p->newOwner != nullptr) camsprite->SetOwner(p->newOwner);
if (camsprite->GetOwner() && dist(p->GetActor(), camsprite) < VIEWSCREEN_ACTIVE_DISTANCE)
if (camsprite->GetOwner() && (p->GetActor()->spr.pos - camsprite->spr.pos).Length() < VIEWSCREEN_ACTIVE_DISTANCE)
{
auto tex = tileGetTexture(camsprite->spr.picnum);
TileFiles.MakeCanvas(TILE_VIEWSCR, (int)tex->GetDisplayWidth(), (int)tex->GetDisplayHeight());