From aa338a4dc674128db4899942bc92e03539f8f53f Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 25 Oct 2014 01:00:40 +0200
Subject: [PATCH] - fixed: G_FinishTravel must synchronize the CF_FLY flag with
 MF2_FLY.

---
 src/g_level.cpp       | 9 +++++++++
 src/p_interaction.cpp | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/g_level.cpp b/src/g_level.cpp
index d84a487768..525f673185 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -1183,6 +1183,15 @@ void G_FinishTravel ()
 			pawn->AddToHash ();
 			pawn->SetState(pawn->SpawnState);
 			pawn->player->SendPitchLimits();
+			// Sync the FLY flags.
+			if (pawn->flags2 & MF2_FLY)
+			{
+				pawn->player->cheats |= CF_FLY;
+			}
+			else
+			{
+				pawn->player->cheats &= ~CF_FLY;
+			}
 
 			for (inv = pawn->Inventory; inv != NULL; inv = inv->Inventory)
 			{
diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp
index 4a960cc17d..5e1fbd49f6 100644
--- a/src/p_interaction.cpp
+++ b/src/p_interaction.cpp
@@ -1237,7 +1237,7 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
 				}
 			}
 			
-			if (damage >= player->health && damage < TELEFRAG_DAMAGE &&
+			if (damage >= player->health && damage < TELEFRAG_DAMAGE
 				&& (G_SkillProperty(SKILLP_AutoUseHealth) || deathmatch)
 				&& !player->morphTics)
 			{ // Try to use some inventory health