This commit is contained in:
parent
6f6b54fd0f
commit
f37209b515
22 changed files with 403 additions and 71 deletions
|
@ -426,5 +426,41 @@ void CConversation::dumpConversationScripts()
|
|||
}
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------
|
||||
Function:
|
||||
Purpose:
|
||||
Params:
|
||||
Returns:
|
||||
---------------------------------------------------------------------- */
|
||||
void CConversation::registerConversationLevelScripts(int level)
|
||||
{
|
||||
switch( level )
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
CConversation::registerConversationScript(SCRIPTS_CH1L1_01_DAT);
|
||||
CConversation::registerConversationScript(SCRIPTS_CH1L1_02_DAT);
|
||||
|
||||
// temporary
|
||||
//CConversation::registerConversationScript(SCRIPTS_CH1L2_01_DAT);
|
||||
//CConversation::registerConversationScript(SCRIPTS_CH1L2_02_DAT);
|
||||
//CConversation::registerConversationScript(SCRIPTS_CH1L2_03_DAT);
|
||||
//CConversation::registerConversationScript(SCRIPTS_CH1L4_01_DAT);
|
||||
//CConversation::registerConversationScript(SCRIPTS_CH1L4_02_DAT);
|
||||
//CConversation::registerConversationScript(SCRIPTS_CH2L1_01_DAT);
|
||||
//CConversation::registerConversationScript(SCRIPTS_CH2L1_02_DAT);
|
||||
//CConversation::registerConversationScript(SCRIPTS_CH2L2_01_DAT);
|
||||
//CConversation::registerConversationScript(SCRIPTS_CH2L2_02_DAT);
|
||||
//CConversation::registerConversationScript(SCRIPTS_CH3L3_01_DAT);
|
||||
//CConversation::registerConversationScript(SCRIPTS_CH3L3_02_DAT);
|
||||
CConversation::registerConversationScript(SCRIPTS_CH4L3_01_DAT);
|
||||
CConversation::registerConversationScript(SCRIPTS_CH4L3_02_DAT);
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
/*===========================================================================
|
||||
end */
|
||||
|
|
|
@ -43,6 +43,7 @@ public:
|
|||
static void think(int _frames);
|
||||
static void render();
|
||||
|
||||
static void registerConversationLevelScripts(int level);
|
||||
static void registerConversationScript(FileEquate _feScript);
|
||||
static void trigger(FileEquate _feScript);
|
||||
static int isActive();
|
||||
|
|
|
@ -297,7 +297,7 @@ void CGameScene::initLevel()
|
|||
CThingManager::init();
|
||||
|
||||
CConversation::init();
|
||||
CConversation::registerConversationScript(SCRIPTS_SPEECHTEST_DAT); // Register one script for testing..
|
||||
CConversation::registerConversationLevelScripts( s_globalLevelSelectThing );
|
||||
|
||||
s_levelFinished=false;
|
||||
Level.init(s_globalLevelSelectThing);
|
||||
|
@ -337,6 +337,7 @@ void CGameScene::initLevel()
|
|||
CNpcFriend *friendNpc;
|
||||
friendNpc=CNpcFriend::Create(ThisActor);
|
||||
friendNpc->setLayerCollision( Level.getCollisionLayer() );
|
||||
friendNpc->postInit();
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue