zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Daveo 2001-08-17 12:42:05 +00:00
parent abf0997133
commit 2582b14d0c
3 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
source/game/game.cpp
View file

@ -737,6 +737,7 @@ void CGameScene::respawnLevel()
CSoundMediator::setCanPlaySfx(false); CSoundMediator::setCanPlaySfx(false);
m_player->respawn(); m_player->respawn();
Level.respawnLevel(); Level.respawnLevel();
m_HealthManager->init();
if(!s_showBossTextOnRespawn) if(!s_showBossTextOnRespawn)
{ {
m_gamestate=GAMESTATE_SHOWING_LIVES; 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) void CGameScene::dropHealth(DVECTOR const &Pos,int Amount,int Vel)
{ {

8
source/level/level.cpp
View file

@ -205,11 +205,6 @@ void CLevel::init(int LevelNo)
// Load it // Load it
sLvlTab *lvlTab=&LvlTable[LevelNo]; sLvlTab *lvlTab=&LvlTable[LevelNo];
m_isFMA=0;
if (lvlTab->Chapter==6)
{
m_isFMA=1;
}
CSoundMediator::setSong((CSoundMediator::SONGID)lvlTab->songId); CSoundMediator::setSong((CSoundMediator::SONGID)lvlTab->songId);
LevelHdr=(sLevelHdr*)CFileIO::loadFile(lvlTab->LevelFilename,"Level"); LevelHdr=(sLevelHdr*)CFileIO::loadFile(lvlTab->LevelFilename,"Level");
@ -637,11 +632,8 @@ void CLevel::initThings(int _respawningLevel)
CThingManager::matchWheelsAndWeights(); CThingManager::matchWheelsAndWeights();
CThingManager::matchPressureSwitches(); CThingManager::matchPressureSwitches();
CThingManager::matchGaryTriggers(); CThingManager::matchGaryTriggers();
if (!m_isFMA) GameScene.initHealth();
} }
/*****************************************************************************/ /*****************************************************************************/
void CLevel::respawnLevel() void CLevel::respawnLevel()
{ {

3
source/level/level.h
View file

@ -88,7 +88,7 @@ static CFmaScene::FMA_SCRIPT_NUMBER getFMAToFollow() {return LvlTable[s_glo
int getMapHeight16() {return(MapSize16.vy);} int getMapHeight16() {return(MapSize16.vy);}
bool GetNextLevel(int &Lvl); bool GetNextLevel(int &Lvl);
int isFMA() {return(m_isFMA);}
void respawnLevel(); void respawnLevel();
static sLevelHdr *getLevelHdr() {return(LevelHdr);} static sLevelHdr *getLevelHdr() {return(LevelHdr);}
@ -135,7 +135,6 @@ static int s_playerFacing;
u8 *m_RGBMap; u8 *m_RGBMap;
u8 *m_RGBTable; u8 *m_RGBTable;
u8 m_isFMA;
static u8 m_isBossRespawn; static u8 m_isBossRespawn;
static s32 m_bossHealth; static s32 m_bossHealth;