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

- pass a DVector3 to updatesectorneighbor

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-29 19:29:20 +02:00
parent 07826c7791
commit 23bd9918af
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/core/updatesector.h
View file

@ -82,14 +82,14 @@ int FindSector(double x, double y, double z, Inside checker)
} }
constexpr int MAXUPDATESECTORDIST = 1536; constexpr int MAXUPDATESECTORDIST = 96;
inline void updatesector(int x_, int y_, int* sectnum) inline void updatesector(int x_, int y_, int* sectnum)
{ {
double x = x_ * inttoworld; double x = x_ * inttoworld;
double y = y_ * inttoworld; double y = y_ * inttoworld;
DoUpdateSector(x, y, 0, sectnum, MAXUPDATESECTORDIST * inttoworld, inside0); DoUpdateSector(x, y, 0, sectnum, MAXUPDATESECTORDIST, inside0);
if (*sectnum == -1) *sectnum = FindSector(x, y, 0, inside0); if (*sectnum == -1) *sectnum = FindSector(x, y, 0, inside0);
} }
@ -99,7 +99,7 @@ inline void updatesectorz(int x_, int y_, int z_, int* sectnum)
double y = y_ * inttoworld; double y = y_ * inttoworld;
double z = z_ * zinttoworld; double z = z_ * zinttoworld;
DoUpdateSector(x, y, z, sectnum, MAXUPDATESECTORDIST * inttoworld, insideZ); DoUpdateSector(x, y, z, sectnum, MAXUPDATESECTORDIST, insideZ);
if (*sectnum == -1) *sectnum = FindSector(x, y, z, insideZ); if (*sectnum == -1) *sectnum = FindSector(x, y, z, insideZ);
} }
@ -137,9 +137,9 @@ inline void updatesectorz(const DVector3& pos, sectortype** const sectp)
*sectp = sectno == -1 ? nullptr : &sector[sectno]; *sectp = sectno == -1 ? nullptr : &sector[sectno];
} }
inline void updatesectorneighbor(int x, int y, sectortype** const sect, int maxDistance = MAXUPDATESECTORDIST) inline void updatesectorneighbor(const DVector3& pos, sectortype** const sect, double maxDistance = MAXUPDATESECTORDIST)
{ {
int sectno = *sect? sector.IndexOf(*sect) : -1; int sectno = *sect? sector.IndexOf(*sect) : -1;
DoUpdateSector(x * inttoworld, y * inttoworld, 0, &sectno, maxDistance * inttoworld, inside0); DoUpdateSector(pos.X, pos.Y, 0, &sectno, maxDistance, inside0);
*sect = sectno < 0? nullptr : &sector[sectno]; *sect = sectno < 0? nullptr : &sector[sectno];
} }

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

@ -878,7 +878,7 @@ static void movetripbomb(DDukeActor *actor)
auto const oldSect = actor->sector(); auto const oldSect = actor->sector();
auto curSect = actor->sector(); auto curSect = actor->sector();
updatesectorneighbor(actor->int_pos().X, actor->int_pos().Y, &curSect, 2048); updatesectorneighbor(actor->spr.pos, &curSect, 128);
ChangeActorSect(actor, curSect); ChangeActorSect(actor, curSect);
DDukeActor* hit; DDukeActor* hit;
@ -908,7 +908,7 @@ static void movetripbomb(DDukeActor *actor)
x -= 1024; x -= 1024;
actor->add_int_pos({ bcos(actor->temp_data[5], -4), bsin(actor->temp_data[5], -4), 0 }); actor->add_int_pos({ bcos(actor->temp_data[5], -4), bsin(actor->temp_data[5], -4), 0 });
updatesectorneighbor(actor->int_pos().X, actor->int_pos().Y, &curSect, 2048); updatesectorneighbor(actor->spr.pos, &curSect, 128);
if (curSect == nullptr) if (curSect == nullptr)
break; break;