This commit is contained in:
parent
e77ef80771
commit
62d68e2da0
@ -343,6 +343,7 @@ void CNpc::detectCollisionWithPlayer()
|
|||||||
{
|
{
|
||||||
// close enough for collision
|
// close enough for collision
|
||||||
|
|
||||||
|
m_oldControlFunc = m_controlFunc;
|
||||||
m_controlFunc = NPC_CONTROL_COLLISION;
|
m_controlFunc = NPC_CONTROL_COLLISION;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -953,6 +954,8 @@ void CNpc::processCollision()
|
|||||||
CPlayer *player = GameScene.getPlayer();
|
CPlayer *player = GameScene.getPlayer();
|
||||||
|
|
||||||
//player->takeDamage( m_data[m_type].damageToUserType );
|
//player->takeDamage( m_data[m_type].damageToUserType );
|
||||||
|
|
||||||
|
m_controlFunc = m_oldControlFunc;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CNpc::processTimer(int _frames)
|
void CNpc::processTimer(int _frames)
|
||||||
|
@ -357,6 +357,7 @@ protected:
|
|||||||
|
|
||||||
NPC_UNIT_TYPE m_type;
|
NPC_UNIT_TYPE m_type;
|
||||||
NPC_CONTROL_FUNC m_controlFunc;
|
NPC_CONTROL_FUNC m_controlFunc;
|
||||||
|
NPC_CONTROL_FUNC m_oldControlFunc;
|
||||||
NPC_TIMER_FUNC m_timerFunc;
|
NPC_TIMER_FUNC m_timerFunc;
|
||||||
NPC_SENSOR_FUNC m_sensorFunc;
|
NPC_SENSOR_FUNC m_sensorFunc;
|
||||||
CNpcPath m_npcPath;
|
CNpcPath m_npcPath;
|
||||||
|
Loading…
Reference in New Issue
Block a user