teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-03-11 03:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- GetOverlapSector internals.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-24 23:34:28 +01:00
parent 4d5c255b08
commit 11d3a660ad
2 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
source/games/sw/src/player.cpp
View file

@ -175,7 +175,7 @@ void PlayerWarpUpdatePos(PLAYERp pp);
void DoPlayerBeginDiveNoWarp(PLAYERp pp);
int PlayerCanDiveNoWarp(PLAYERp pp);
void DoPlayerCurrent(PLAYERp pp);
int GetOverlapSector2(int x, int y, short *over, short *under);
int GetOverlapSector2(int x, int y, sectortype** over, sectortype** under);
void PlayerToRemote(PLAYERp pp);
void PlayerRemoteInit(PLAYERp pp);
void PlayerSpawnPosition(PLAYERp pp);
@ -3906,12 +3906,12 @@ int PlayerCanDiveNoWarp(PLAYERp pp)
}
int GetOverlapSector(int x, int y, short *over, short *under)
int GetOverlapSector(int x, int y, sectortype** over, sectortype** under)
{
int i, found = 0;
short sf[2]= {0,0}; // sectors found
auto secto = &sector[*over];
auto sectu = &sector[*under];
sectortype* sf[2]= {nullptr,nullptr}; // sectors found
auto secto = *over;
auto sectu = *under;
if ((sectu->hasU() && sectu->number >= 30000) || (secto->hasU() && secto->number >= 30000))
return GetOverlapSector2(x,y,over,under);
@ -3932,11 +3932,11 @@ int GetOverlapSector(int x, int y, short *over, short *under)
// if nothing was found, check them all
if (found == 0)
{
for (found = 0, i = 0; i < numsectors; i++)
for (auto& sect : sectors())
{
if (inside(x, y, i))
if (inside(x, y, &sect))
{
sf[found] = i;
sf[found] = &sect;
found++;
PRODUCTION_ASSERT(found <= 2);
}
@ -3945,7 +3945,7 @@ int GetOverlapSector(int x, int y, short *over, short *under)
if (!found)
{
I_Error("GetOverlapSector x = %d, y = %d, over %d, under %d", x, y, *over, *under);
I_Error("GetOverlapSector x = %d, y = %d, over %d, under %d", x, y, sectnum(*over), sectnum(*under));
}
PRODUCTION_ASSERT(found != 0);
@ -3954,7 +3954,7 @@ int GetOverlapSector(int x, int y, short *over, short *under)
// the are overlaping - check the z coord
if (found == 2)
{
if (sector[sf[0]].floorz > sector[sf[1]].floorz)
if (sf[0]->floorz > sf[1]->floorz)
{
*under = sf[0];
*over = sf[1];
@ -3969,16 +3969,16 @@ int GetOverlapSector(int x, int y, short *over, short *under)
// the are NOT overlaping
{
*over = sf[0];
*under = -1;
*under = nullptr;
}
return found;
}
int GetOverlapSector2(int x, int y, short *over, short *under)
int GetOverlapSector2(int x, int y, sectortype** over, sectortype** under)
{
int found = 0;
short sf[2]= {0,0}; // sectors found
sectortype* sf[2]= {nullptr, nullptr}; // sectors found
unsigned stat;
static short UnderStatList[] = {STAT_UNDERWATER, STAT_UNDERWATER2};
@ -4006,9 +4006,9 @@ int GetOverlapSector2(int x, int y, short *over, short *under)
while (auto actor = it.Next())
{
auto sp = &actor->s();
if (inside(x, y, sp->sectnum))
if (inside(x, y, sp->sector()))
{
sf[found] = sp->sectnum;
sf[found] = sp->sector();
found++;
PRODUCTION_ASSERT(found <= 2);
}
@ -4024,9 +4024,9 @@ int GetOverlapSector2(int x, int y, short *over, short *under)
if (sp->lotag == 0)
continue;
if (inside(x, y, sp->sectnum))
if (inside(x, y, sp->sector()))
{
sf[found] = sp->sectnum;
sf[found] = sp->sector();
found++;
PRODUCTION_ASSERT(found <= 2);
}
@ -4036,7 +4036,7 @@ int GetOverlapSector2(int x, int y, short *over, short *under)
if (!found)
{
I_Error("GetOverlapSector x = %d, y = %d, over %d, under %d", x, y, *over, *under);
I_Error("GetOverlapSector x = %d, y = %d, over %d, under %d", x, y, sectnum(*over), sectnum(*under));
}
PRODUCTION_ASSERT(found != 0);
@ -4045,7 +4045,7 @@ int GetOverlapSector2(int x, int y, short *over, short *under)
// the are overlaping - check the z coord
if (found == 2)
{
if (sector[sf[0]].floorz > sector[sf[1]].floorz)
if (sf[0]->floorz > sf[1]->floorz)
{
*under = sf[0];
*over = sf[1];
@ -4060,7 +4060,7 @@ int GetOverlapSector2(int x, int y, short *over, short *under)
// the are NOT overlaping
{
*over = sf[0];
*under = -1;
*under = nullptr;
}
return found;

13
source/games/sw/src/weapon.h
View file

@ -169,7 +169,18 @@ bool SpriteOverlap(short, short);
DSWActor* SpawnShotgunSparks(PLAYERp pp, sectortype* hit_sect, walltype* hit_wall, int hit_x, int hit_y, int hit_z, short hit_ang);
int DoActorBeginSlide(DSWActor* actor, int ang, int vel, int dec);
int GetOverlapSector(int x, int y, short *over, short *under);
int GetOverlapSector(int x, int y, sectortype** over, sectortype** under);
[[deprecated]]
inline int GetOverlapSector(int x, int y, short* over, short* under)
{
auto o = &sector[*over];
auto u = &sector[*under];
int res = GetOverlapSector(x, y, &o, &u);
*over = sectnum(o);
*under = sectnum(u);
return res;
}
bool MissileHitDiveArea(DSWActor*);
int DoDamageTest(DSWActor*);