From 2582b14d0c573c0717ed29f53f50162efabe0963 Mon Sep 17 00:00:00 2001
From: Daveo <daveo@localhost>
Date: Fri, 17 Aug 2001 12:42:05 +0000
Subject: [PATCH]

---
 source/game/game.cpp   | 7 +------
 source/level/level.cpp | 8 --------
 source/level/level.h   | 3 +--
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/source/game/game.cpp b/source/game/game.cpp
index 3620448ab..5f9884763 100644
--- a/source/game/game.cpp
+++ b/source/game/game.cpp
@@ -737,6 +737,7 @@ void	CGameScene::respawnLevel()
 	CSoundMediator::setCanPlaySfx(false);
 	m_player->respawn();
 	Level.respawnLevel();
+	m_HealthManager->init();
 	if(!s_showBossTextOnRespawn)
 	{
 		m_gamestate=GAMESTATE_SHOWING_LIVES;
@@ -839,12 +840,6 @@ void	CGameScene::initLevel()
 }
 
 
-/*****************************************************************************/
-void	CGameScene::initHealth()
-{
-	m_HealthManager->init();
-}
-
 /*****************************************************************************/
 void	CGameScene::dropHealth(DVECTOR const &Pos,int Amount,int Vel)
 {
diff --git a/source/level/level.cpp b/source/level/level.cpp
index 6ffe29ef2..9bb0d0abc 100644
--- a/source/level/level.cpp
+++ b/source/level/level.cpp
@@ -205,11 +205,6 @@ void 	CLevel::init(int LevelNo)
 // Load it
 sLvlTab *lvlTab=&LvlTable[LevelNo];
 
-		m_isFMA=0;
-		if (lvlTab->Chapter==6)
-		{
-			m_isFMA=1;
-		}
 		CSoundMediator::setSong((CSoundMediator::SONGID)lvlTab->songId);
 
 		LevelHdr=(sLevelHdr*)CFileIO::loadFile(lvlTab->LevelFilename,"Level");
@@ -637,11 +632,8 @@ void	CLevel::initThings(int _respawningLevel)
 	CThingManager::matchWheelsAndWeights();
 	CThingManager::matchPressureSwitches();
 	CThingManager::matchGaryTriggers();
-	if (!m_isFMA) GameScene.initHealth();
 }
 
-
-
 /*****************************************************************************/
 void	CLevel::respawnLevel()
 {
diff --git a/source/level/level.h b/source/level/level.h
index a6196ef06..a9677fb12 100644
--- a/source/level/level.h
+++ b/source/level/level.h
@@ -88,7 +88,7 @@ static CFmaScene::FMA_SCRIPT_NUMBER getFMAToFollow()						{return LvlTable[s_glo
 		int				getMapHeight16()						{return(MapSize16.vy);}
 
 		bool			GetNextLevel(int &Lvl);
-		int				isFMA()									{return(m_isFMA);}
+
 		void			respawnLevel();
 static	sLevelHdr		*getLevelHdr()							{return(LevelHdr);}
 
@@ -135,7 +135,6 @@ static	int				s_playerFacing;
 
 		u8				*m_RGBMap;
 		u8				*m_RGBTable;
-		u8				m_isFMA;
 
 static	u8				m_isBossRespawn;
 static	s32				m_bossHealth;