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

@ -23,6 +23,10 @@
#include "game\convo.h"
#endif
#ifndef __LEVEL_LEVEL_H__
#include "level\level.h"
#endif
#ifndef __ANIM_PATRICK_HEADER__
#include <ACTOR_PATRICK_Anim.h>
#endif
@ -34,12 +38,12 @@ extern int s_globalLevelSelectThing;
void CNpcPatrickFriend::postInit()
{
/*switch( CLevel::getCurrentChapter() )
switch( CLevel::getCurrentChapter() )
{
case 3:
{*/
{
m_conversation = SCRIPTS_CH3L3_01_DAT;
/*break;
break;
}
default:
@ -47,41 +51,38 @@ void CNpcPatrickFriend::postInit()
m_conversation = SCRIPTS_CH2L2_01_DAT;
break;
}
}*/
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcPatrickFriend::startConderversation()
{
if ( m_data[this->m_type].canTalk )
if( !CConversation::isActive() )
{
if( !CConversation::isActive() )
CConversation::trigger( m_conversation );
switch( CLevel::getCurrentChapter() )
{
CConversation::trigger( m_conversation );
/*switch( CLevel::getCurrentChapter() )
case 3:
{
case 3:
{*/
if ( m_conversation == SCRIPTS_CH3L3_01_DAT )
{
m_conversation = SCRIPTS_CH3L3_02_DAT;
}
/*break;
}
default:
if ( m_conversation == SCRIPTS_CH3L3_01_DAT )
{
if ( m_conversation == SCRIPTS_CH2L2_01_DAT )
{
m_conversation = SCRIPTS_CH2L2_02_DAT;
}
break;
m_conversation = SCRIPTS_CH3L3_02_DAT;
}
}*/
break;
}
default:
{
if ( m_conversation == SCRIPTS_CH2L2_01_DAT )
{
m_conversation = SCRIPTS_CH2L2_02_DAT;
}
break;
}
}
}
}