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

Browse source
This commit is contained in:
Paul 2001-01-16 17:34:38 +00:00
parent 8da90f27df
commit b5a6ee1573
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
source/game/game.cpp
View file

@ -60,13 +60,13 @@ void CGameScene::init()
m_conversation.init(); m_conversation.init();
Level.init(); Level.init();
m_player=new ("player") CPlayer();
m_player->init();
C2dEnemy *enemy; C2dEnemy *enemy;
enemy=new ("test enemy") C2dEnemy; enemy=new ("test enemy") C2dEnemy;
enemy->init(); enemy->init();
m_player=new ("player") CPlayer();
m_player->init();
CAnimDB::LoadAnims(); CAnimDB::LoadAnims();
SetIdentNoTrans(&CamMtx); SetIdentNoTrans(&CamMtx);
@ -80,6 +80,7 @@ void CGameScene::init()
void CGameScene::shutdown() void CGameScene::shutdown()
{ {
m_player->shutdown(); delete m_player; m_player->shutdown(); delete m_player;
CThing::shutdownAndDeleteAllThings();
Level.shutdown(); Level.shutdown();
m_conversation.shutdown(); m_conversation.shutdown();
@ -99,17 +100,20 @@ void CGameScene::render()
/*****************************************************************************/ /*****************************************************************************/
void CGameScene::think(int _frames) void CGameScene::think(int _frames)
{ {
m_conversation.think(_frames); #ifdef __USER_paul__
if(!m_conversation.isActive()&&PadGetDown(0)&PAD_START)
{
m_conversation.trigger(SCRIPTS_SPEECHTEST_DAT);
}
#endif
m_conversation.think(_frames);
if(!m_conversation.isActive())
{
CThing::thinkAllThings(_frames); CThing::thinkAllThings(_frames);
Level.setCameraCentre(m_player->getPos()); Level.setCameraCentre(m_player->getPos());
Level.think(_frames); Level.think(_frames);
}
#ifdef __USER_paul__
if(!m_conversation.isActive()&&PadGetDown(0)&PAD_START)
{
m_conversation.trigger(SCRIPTS_SPEECHTEST_DAT);
}
#endif
} }
/*****************************************************************************/ /*****************************************************************************/