zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-07 22:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- the really final ones.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-25 19:41:01 +01:00
parent 7dd2f79676
commit e526686d1e
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/games/sw/src/sector.cpp
View file

@ -2363,7 +2363,7 @@ void PlayerOperateEnv(PLAYERp pp)
DoSlidorOperate(pp, pp->cursector()); DoSlidorOperate(pp, pp->cursector());
break; break;
case TAG_SPRING_BOARD: case TAG_SPRING_BOARD:
DoSpringBoard(pp/*, pp->cursectnum*/); DoSpringBoard(pp);
pp->KeyPressBits &= ~SB_OPEN; pp->KeyPressBits &= ~SB_OPEN;
break; break;
case TAG_DOOR_ROTATE: case TAG_DOOR_ROTATE:
@ -2386,7 +2386,7 @@ void PlayerOperateEnv(PLAYERp pp)
// //////////////////////////// // ////////////////////////////
SECTORp sectp = pp->cursector(); SECTORp sectp = pp->cursector();
if (pp->cursectnum >= 0 && sectp->hasU() && sectp->damage) if (pp->insector() && sectp->hasU() && sectp->damage)
{ {
if (TEST(sectp->flags, SECTFU_DAMAGE_ABOVE_SECTOR)) if (TEST(sectp->flags, SECTFU_DAMAGE_ABOVE_SECTOR))
{ {
@ -2413,11 +2413,11 @@ void PlayerOperateEnv(PLAYERp pp)
OperateContinuousTrigger(pp); OperateContinuousTrigger(pp);
// just changed sectors // just changed sectors
if (pp->lastcursectnum != pp->cursectnum) if (pp->lastcursector() != pp->cursector())
{ {
OperateTripTrigger(pp); OperateTripTrigger(pp);
if (pp->cursectnum >= 0 && TEST(pp->cursector()->extra, SECTFX_WARP_SECTOR)) if (pp->insector() && TEST(pp->cursector()->extra, SECTFX_WARP_SECTOR))
{ {
if (!TEST(pp->Flags2, PF2_TELEPORTED)) if (!TEST(pp->Flags2, PF2_TELEPORTED))
{ {

1
source/games/sw/src/track.cpp
View file

@ -1635,7 +1635,6 @@ void MovePlayer(PLAYERp pp, SECTOR_OBJECTp sop, int nx, int ny)
// THIS WAS CAUSING PROLEMS!!!! // THIS WAS CAUSING PROLEMS!!!!
// Sectors are still being manipulated so you can end up in a void (-1) sector // Sectors are still being manipulated so you can end up in a void (-1) sector
//updatesector(pp->posx, pp->posy, &pp->cursectnum);
// New angle is formed by taking last known angle and // New angle is formed by taking last known angle and
// adjusting by the delta angle // adjusting by the delta angle

4
source/games/sw/src/weapon.cpp
View file

@ -2760,9 +2760,9 @@ int DoLavaErupt(DSWActor* actor)
TRAVERSE_CONNECT(pnum) TRAVERSE_CONNECT(pnum)
{ {
pp = Player + pnum; pp = Player + pnum;
if (pp->cursectnum >= 0 && TEST(pp->cursector()->extra, SECTFX_TRIGGER)) if (pp->insector() && TEST(pp->cursector()->extra, SECTFX_TRIGGER))
{ {
SWSectIterator it(pp->cursectnum); SWSectIterator it(pp->cursector());
while (auto itActor = it.Next()) while (auto itActor = it.Next())
{ {
tsp = &itActor->s(); tsp = &itActor->s();

2
source/games/sw/src/zombie.cpp
View file

@ -784,7 +784,7 @@ void SpawnZombie(PLAYERp pp, DSWActor* weaponActor)
auto actorNew = SpawnActor(STAT_ENEMY, ZOMBIE_RUN_R0, s_ZombieRun[0], pp->cursector(), pp->posx, pp->posy, pp->posz, pp->angle.ang.asbuild(), 0); auto actorNew = SpawnActor(STAT_ENEMY, ZOMBIE_RUN_R0, s_ZombieRun[0], pp->cursector(), pp->posx, pp->posy, pp->posz, pp->angle.ang.asbuild(), 0);
np = &actorNew->s(); np = &actorNew->s();
nu = actorNew->u(); nu = actorNew->u();
np->sectnum = pp->cursectnum; np->setsector(pp->cursector());
SetOwner(actorNew, ownerActor); SetOwner(actorNew, ownerActor);
np->pal = nu->spal = ownerActor->u()->spal; np->pal = nu->spal = ownerActor->u()->spal;
np->ang = RANDOM_P2(2048); np->ang = RANDOM_P2(2048);