OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Revert "Added SECMF_HURTMONSTERS, SECMF_HARMINAIR and NOSECTORDAMAGE."

Browse source 
This reverts commit 391f496512.
This commit is contained in:
Rachael Alexanderson 2024-10-19 10:25:03 -04:00
commit 5fb83d4762
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
13 changed files with 58 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/playsim/p_3dfloors.cpp
View file

@ -198,15 +198,15 @@ void P_Add3DFloor(sector_t* sec, sector_t* sec2, line_t* master, int flags, int
//==========================================================================
//
// P_ActorOnSpecial3DFloor
// Checks to see if an actor is standing on or is inside a 3D floor (water)
// P_PlayerOnSpecial3DFloor
// Checks to see if a player is standing on or is inside a 3D floor (water)
// and applies any specials..
//
//==========================================================================
void P_ActorOnSpecial3DFloor(AActor* victim)
void P_PlayerOnSpecial3DFloor(player_t* player)
{
for(auto rover : victim->Sector->e->XFloor.ffloors)
for(auto rover : player->mo->Sector->e->XFloor.ffloors)
{
if (!(rover->flags & FF_EXISTS)) continue;
if (rover->flags & FF_FIX) continue;
@ -215,22 +215,22 @@ void P_ActorOnSpecial3DFloor(AActor* victim)
if(rover->flags & FF_SOLID)
{
// Player must be on top of the floor to be affected...
if(victim->Z() != rover->top.plane->ZatPoint(victim)) continue;
if(player->mo->Z() != rover->top.plane->ZatPoint(player->mo)) continue;
}
else
{
//Water and DEATH FOG!!! heh
if ((rover->flags & FF_NODAMAGE) ||
victim->Z() > rover->top.plane->ZatPoint(victim) ||
victim->Top() < rover->bottom.plane->ZatPoint(victim))
player->mo->Z() > rover->top.plane->ZatPoint(player->mo) ||
player->mo->Top() < rover->bottom.plane->ZatPoint(player->mo))
continue;
}
// Apply sector specials
P_ActorInSpecialSector(victim, rover->model);
P_PlayerInSpecialSector(player, rover->model);
// Apply flat specials (using the ceiling!)
P_ActorOnSpecialFlat(victim, rover->model->GetTerrain(rover->top.isceiling));
P_PlayerOnSpecialFlat(player, rover->model->GetTerrain(rover->top.isceiling));
break;
}