This commit is contained in:
Charles 2001-05-03 13:11:45 +00:00
parent a5722bd7e1
commit 504688e4cd
21 changed files with 242 additions and 133 deletions

View file

@ -79,16 +79,13 @@ void CNpcSquidwardFriend::think( int _frames )
void CNpcSquidwardFriend::startConderversation()
{
if ( m_data[this->m_type].canTalk )
if( !CConversation::isActive() )
{
if( !CConversation::isActive() )
{
CConversation::trigger( m_conversation );
CConversation::trigger( m_conversation );
if ( m_conversation == SCRIPTS_CH1L1_01_DAT )
{
m_conversation = SCRIPTS_CH1L1_02_DAT;
}
if ( m_conversation == SCRIPTS_CH1L1_01_DAT )
{
m_conversation = SCRIPTS_CH1L1_02_DAT;
}
}
}