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-04-09 23:22:29 +00:00
parent 308f06a726
commit 1e0e21be9f
2 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
source/enemy/npc.cpp
View file

@ -90,6 +90,7 @@ void CNpcFriend::shutdown()
{
//m_spriteBank->dump(); delete m_spriteBank;
delete m_actorGfx;
CNpcThing::shutdown();
}
@ -610,7 +611,9 @@ void CNpcEnemy::shutdown()
m_positionHistory = NULL;
delete m_actorGfx;
CEnemyThing::shutdown();
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

32
source/game/game.cpp
View file

@ -115,9 +115,8 @@ void CGameScene::init()
s_readyToExit=false;
CFader::setFadingIn();
initLevel();
CFileIO::EnableASync(true);
// CFileIO::EnableASync(true);
}
@ -141,7 +140,7 @@ int CGameScene::canPause()
void CGameScene::shutdown()
{
CFileIO::EnableASync(false);
// CFileIO::EnableASync(false);
shutdownLevel(true);
CSoundMediator::dumpSong();
@ -170,7 +169,7 @@ void CGameScene::think(int _frames)
// }
//#endif
CFileIO::LoadASyncFiles();
// CFileIO::LoadASyncFiles();
if(s_readyToExit)
{
@ -182,7 +181,7 @@ void CGameScene::think(int _frames)
s_globalLevelSelectThing=Level.GetNextLevel(s_globalLevelSelectThing);
shutdownLevel(s_globalLevelSelectThing%12==0);
initLevel();
s_levelFinished=false;
s_levelFinished=false;
}
@ -191,29 +190,30 @@ void CGameScene::think(int _frames)
m_pauseMenu->select();
}
CConversation::think(_frames);
m_pauseMenu->think(_frames);
if(!CConversation::isActive()&&
!m_pauseMenu->isActive())
/* if (!s_levelFinished) */CConversation::think(_frames);
/* if (!s_levelFinished) */m_pauseMenu->think(_frames);
if(!CConversation::isActive()&& !m_pauseMenu->isActive())
{
DVECTOR camPos;
CThingManager::thinkAllThings(_frames);
camPos=m_player->getCameraPos();
/* if (!s_levelFinished) */CThingManager::thinkAllThings(_frames);
/* if (!s_levelFinished) */camPos=m_player->getCameraPos();
//PKG
// if(camPos.vx<0){camPos.vx=0;PAUL_DBGMSG("cx<0");}
// if(camPos.vy<0){camPos.vy=0;PAUL_DBGMSG("cy<0");}
//PKG
CBubicleFactory::setMapOffset(&camPos);
Level.setCameraCentre(camPos);
Level.think(_frames);
/* if (!s_levelFinished) */CBubicleFactory::setMapOffset(&camPos);
/* if (!s_levelFinished) */Level.setCameraCentre(camPos);
/* if (!s_levelFinished) */Level.think(_frames);
if(PadGetDown(0)&PAD_R2)
{
levelFinished();
}
}
// s_levelFinished=false;
}
/*****************************************************************************/
int CGameScene::readyToShutdown()
{
@ -237,6 +237,7 @@ void CGameScene::sendEvent( GAME_EVENT evt, CThing *sourceThing )
/*****************************************************************************/
void CGameScene::initLevel()
{
printf("InitLevel\n");
CThingManager::init();
CConversation::init();
@ -375,12 +376,15 @@ void CGameScene::initLevel()
platform->addWaypoint( newXPos, newYPos );
}
}
}
}
// Song is loaded/dumped by the level, and played from here. This just gives some
// better timing over when it starts (pkg)
CSoundMediator::playSong();
printf("InitLevelDone\n");
}