zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-20 18:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- more walls in sectors_d.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-17 23:02:36 +01:00
parent 7268e779a7
commit 530c29973e
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/games/duke/src/sectors_d.cpp
View file

@ -692,7 +692,8 @@ void checkhitwall_d(DDukeActor* spr, int dawallnum, int x, int y, int z, int atw
}
spawned->s->cstat |= 18 + 128;
spawned->s->ang = getangle(wal->x - wall[wal->point2].x, wal->y - wall[wal->point2].y) - 512;
auto delta = wal->delta();
spawned->s->ang = getangle(-delta.x, -delta.y) - 512;
S_PlayActorSound(SOMETHINGHITFORCE, spawned);
@ -909,10 +910,10 @@ void checkplayerhurt_d(struct player_struct* p, const Collision& coll)
}
if (coll.type != kHitWall) return;
int j = coll.index;
auto wal = coll.wall();
if (p->hurt_delay > 0) p->hurt_delay--;
else if (wall[j].cstat & 85) switch (wall[j].overpicnum)
else if (wal->cstat & 85) switch (wal->overpicnum)
{
case W_FORCEFIELD:
case W_FORCEFIELD + 1:
@ -926,7 +927,7 @@ void checkplayerhurt_d(struct player_struct* p, const Collision& coll)
p->posyv = -p->angle.ang.bsin(8);
S_PlayActorSound(DUKE_LONGTERM_PAIN, p->GetActor());
fi.checkhitwall(p->GetActor(), j,
fi.checkhitwall(p->GetActor(), wallnum(wal),
p->pos.x + p->angle.ang.bcos(-9),
p->pos.y + p->angle.ang.bsin(-9),
p->pos.z, -1);
@ -935,7 +936,7 @@ void checkplayerhurt_d(struct player_struct* p, const Collision& coll)
case BIGFORCE:
p->hurt_delay = 26;
fi.checkhitwall(p->GetActor(), j,
fi.checkhitwall(p->GetActor(), wallnum(wal),
p->pos.x + p->angle.ang.bcos(-9),
p->pos.y + p->angle.ang.bsin(-9),
p->pos.z, -1);