This commit is contained in:
Charles 2001-01-31 16:26:40 +00:00
parent 6b7c0d80ac
commit 4e993180a5
2 changed files with 8 additions and 8 deletions

View File

@ -85,9 +85,9 @@ CNpc::NPC_DATA CNpc::m_data[NPC_UNIT_TYPE_MAX] =
}, },
{ // NPC_DUST_DEVIL { // NPC_DUST_DEVIL
NPC_INIT_DUST_DEVIL, NPC_INIT_RETURNING_HAZARD,
NPC_SENSOR_NONE, NPC_SENSOR_NONE,
NPC_MOVEMENT_DUST_DEVIL, NPC_MOVEMENT_RETURNING_HAZARD,
NPC_MOVEMENT_MODIFIER_NONE, NPC_MOVEMENT_MODIFIER_NONE,
NPC_CLOSE_NONE, NPC_CLOSE_NONE,
NPC_TIMER_NONE, NPC_TIMER_NONE,
@ -669,7 +669,7 @@ void CNpc::init()
break; break;
} }
case NPC_INIT_DUST_DEVIL: case NPC_INIT_RETURNING_HAZARD:
{ {
m_npcPath.initPath(); m_npcPath.initPath();
@ -1205,9 +1205,9 @@ void CNpc::processMovement(int _frames)
break; break;
} }
case NPC_MOVEMENT_DUST_DEVIL: case NPC_MOVEMENT_RETURNING_HAZARD:
{ {
processDustDevilMovement( _frames ); processReturningHazardMovement( _frames );
break; break;
} }

View File

@ -94,7 +94,7 @@ protected:
NPC_INIT_FISH_HOOK, NPC_INIT_FISH_HOOK,
NPC_INIT_PENDULUM, NPC_INIT_PENDULUM,
NPC_INIT_FIREBALL, NPC_INIT_FIREBALL,
NPC_INIT_DUST_DEVIL, NPC_INIT_RETURNING_HAZARD,
}; };
enum NPC_CONTROL_FUNC enum NPC_CONTROL_FUNC
@ -159,7 +159,7 @@ protected:
NPC_MOVEMENT_IRON_DOGFISH, NPC_MOVEMENT_IRON_DOGFISH,
NPC_MOVEMENT_PENDULUM, NPC_MOVEMENT_PENDULUM,
NPC_MOVEMENT_FIREBALL, NPC_MOVEMENT_FIREBALL,
NPC_MOVEMENT_DUST_DEVIL, NPC_MOVEMENT_RETURNING_HAZARD,
}; };
enum NPC_MOVEMENT_MODIFIER_FUNC enum NPC_MOVEMENT_MODIFIER_FUNC
@ -310,7 +310,7 @@ protected:
void processCloseFishHookRise( int _frames ); void processCloseFishHookRise( int _frames );
void processPendulumMovement( int _frames ); void processPendulumMovement( int _frames );
void processFireballMovement( int _frames ); void processFireballMovement( int _frames );
void processDustDevilMovement( int _frames ); void processReturningHazardMovement( int _frames );
// data // data