This commit is contained in:
parent
0a9837d6e2
commit
6da5211f7b
1 changed files with 2 additions and 1 deletions
|
@ -570,7 +570,8 @@ void CGameScene::think_playing(int _frames)
|
||||||
|
|
||||||
|
|
||||||
// Auto-timer stuff
|
// Auto-timer stuff
|
||||||
if(m_levelHasTimer)
|
if(m_levelHasTimer&&
|
||||||
|
!CConversation::isActive()&&!m_pauseMenu->isActive())
|
||||||
{
|
{
|
||||||
m_timer-=_frames;
|
m_timer-=_frames;
|
||||||
if(m_timer<0)
|
if(m_timer<0)
|
||||||
|
|
Loading…
Add table
Reference in a new issue