zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-01-22 20:57:39 +00:00
parent 69c516ecbf
commit 97a30e89cd
5 changed files with 67 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

10
source/enemy/npc.cpp
View file

@ -41,6 +41,10 @@
#include "utils\utils.h"
#endif
#ifndef __GAME_CONVO_H__
#include "game\convo.h"
#endif
CNpc::NPC_DATA CNpc::m_data[NPC_UNIT_TYPE_MAX] =
{
@ -955,8 +959,6 @@ void CNpc::render()
void CNpc::processEvent( GAME_EVENT evt, CThing *sourceThing )
{
CConversation *currentConversation = GameScene.getConversation();
if ( m_data[this->m_type].canTalk )
{
DVECTOR sourcePos;
@ -974,9 +976,9 @@ void CNpc::processEvent( GAME_EVENT evt, CThing *sourceThing )
if ( xDiffSqr + yDiffSqr < 250 )
{
if( !currentConversation->isActive() )
if( !CConversation::isActive() )
{
currentConversation->trigger( SCRIPTS_SPEECHTEST_DAT );
CConversation::trigger( SCRIPTS_SPEECHTEST_DAT );
}
}
}