This commit is contained in:
parent
10ac8430a0
commit
835bf18151
@ -91,6 +91,7 @@ void CPlayerStateDance::enter(CPlayerModeBase *_playerMode)
|
|||||||
{
|
{
|
||||||
_playerMode->setAnimNo(ANIM_SPONGEBOB_JUMP);
|
_playerMode->setAnimNo(ANIM_SPONGEBOB_JUMP);
|
||||||
m_hitGround=false;
|
m_hitGround=false;
|
||||||
|
m_startedConversation=false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -117,11 +118,22 @@ void CPlayerStateDance::think(CPlayerModeBase *_playerMode)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if(_playerMode->advanceAnimFrameAndCheckForEndOfAnim())
|
if(!m_startedConversation)
|
||||||
{
|
{
|
||||||
CConversation::trigger(s_celebrationScripts[GameScene.getChapterNumber()-1][GameScene.getLevelNumber()-1]);
|
if(_playerMode->advanceAnimFrameAndCheckForEndOfAnim())
|
||||||
// GameScene.getPlayer()->setCanExitLevelNow();
|
{
|
||||||
_playerMode->setState(STATE_IDLE);
|
_playerMode->setAnimNo(ANIM_SPONGEBOB_IDLEBREATH);
|
||||||
|
CConversation::trigger(s_celebrationScripts[GameScene.getChapterNumber()-1][GameScene.getLevelNumber()-1]);
|
||||||
|
m_startedConversation=true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if(!CConversation::isActive())
|
||||||
|
{
|
||||||
|
GameScene.getPlayer()->setCanExitLevelNow();
|
||||||
|
_playerMode->setState(STATE_IDLE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -40,6 +40,7 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
int m_hitGround;
|
int m_hitGround;
|
||||||
|
int m_startedConversation;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user