Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-02-07 17:40:56 +00:00
parent e77ef80771
commit 62d68e2da0
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/enemy/npc.cpp
View File

@ -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)

1
source/enemy/npc.h
View File

@ -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;