This commit is contained in:
parent
174c47da1a
commit
731ac49770
3 changed files with 60 additions and 36 deletions
|
@ -385,9 +385,15 @@ void CGameScene::think(int _frames)
|
|||
m_pauseMenu->select();
|
||||
}
|
||||
|
||||
// Conversation think ( with pad debounce stuff.. )
|
||||
if(CConversation::isActive())m_player->ignoreNewlyPressedButtonsOnPadThisThink();
|
||||
CConversation::think(_frames);
|
||||
|
||||
// Pause menu think ( with pad debounce stuff.. )
|
||||
if(m_pauseMenu->isActive())m_player->ignoreNewlyPressedButtonsOnPadThisThink();
|
||||
m_pauseMenu->think(_frames);
|
||||
if(!CConversation::isActive()&& !m_pauseMenu->isActive())
|
||||
|
||||
if(!CConversation::isActive()&&!m_pauseMenu->isActive())
|
||||
{
|
||||
DVECTOR camPos;
|
||||
CJellyfishGenerator::think( _frames, &Level );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue