OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed compiler errors and warnings from TFlags.

Browse source
This commit is contained in:
Edoardo Prezioso 2015-04-30 12:35:29 +02:00
commit cda4fece1b
4 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/p_interaction.cpp
View file

@ -660,7 +660,7 @@ void AActor::Die (AActor *source, AActor *inflictor, int dmgflags)
FState *diestate = NULL;
int gibhealth = GibHealth();
int iflags4 = inflictor == NULL ? 0 : inflictor->flags4;
ActorFlags4 iflags4 = inflictor == NULL ? ActorFlags4::FromInt(0) : inflictor->flags4;
bool extremelydead = ((health < gibhealth || iflags4 & MF4_EXTREMEDEATH) && !(iflags4 & MF4_NOEXTREMEDEATH));
// Special check for 'extreme' damage type to ensure that it gets recorded properly as an extreme death for subsequent checks.