zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: some simple wall stuff

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-18 00:54:40 +01:00
parent 7b1345d3e5
commit e6682f4489
2 changed files with 13 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1258,11 +1258,9 @@ Collision AngleChase(DExhumedActor* pActor, DExhumedActor* pActor2, int ebx, int
int GetWallNormal(int nWall)
{
nWall &= kMaxWalls-1;
auto delta = wall[nWall].delta();
int nWall2 = wall[nWall].point2;
int nAngle = GetMyAngle(wall[nWall2].x - wall[nWall].x, wall[nWall2].y - wall[nWall].y);
int nAngle = GetMyAngle(delta.x, delta.y);
return (nAngle + 512) & kAngleMask;
}

36
source/games/exhumed/src/object.cpp
View file

@ -395,19 +395,12 @@ void InitElev()
// done
DExhumedActor* BuildWallSprite(int nSector)
{
int nWall = sector[nSector].wallptr;
int x = wall[nWall].x;
int y = wall[nWall].y;
int x2 = wall[nWall + 1].x;
int y2 = wall[nWall + 1].y;
auto wal = sector[nSector].firstWall();
auto pActor = insertActor(nSector, 401);
auto pSprite = &pActor->s();
pSprite->x = (x + x2) / 2;
pSprite->y = (y + y2) / 2;
pSprite->pos.vec2 = wal->center();
pSprite->z = (sector[nSector].floorz + sector[nSector].ceilingz) / 2;
pSprite->cstat = 0x8000;
@ -420,33 +413,26 @@ DExhumedActor* FindWallSprites(int nSector)
int var_24 = 0x7FFFFFFF;
int ecx = 0x7FFFFFFF;
int nWall = sector[nSector].wallptr;
int nWallCount = sector[nSector].wallnum;
int esi = 0x80000002;
int edi = 0x80000002;
int i;
for (i = 0; i < nWallCount; i++)
for (auto& wal : wallsofsector(nSector))
{
if (wall[nWall].x < var_24) {
var_24 = wall[nWall].x;
if (wal.x < var_24) {
var_24 = wal.x;
}
if (esi < wall[nWall].x) {
esi = wall[nWall].x;
if (esi < wal.x) {
esi = wal.x;
}
if (ecx > wall[nWall].y) {
ecx = wall[nWall].y;
if (ecx > wal.y) {
ecx = wal.y;
}
if (edi < wall[nWall].y) {
edi = wall[nWall].y;
if (edi < wal.y) {
edi = wal.y;
}
nWall++;
}
ecx -= 5;