|
|
|
|
@ -1362,7 +1362,7 @@ void CheckNewPath(Player &player, bool pmWillBeCalled)
|
|
|
|
|
if (x < 2 && y < 2) { |
|
|
|
|
ClrPlrPath(player); |
|
|
|
|
if (player.destAction == ACTION_ATTACKMON && monster->talkMsg != TEXT_NONE && monster->talkMsg != TEXT_VILE14) { |
|
|
|
|
TalktoMonster(*monster); |
|
|
|
|
TalktoMonster(player, *monster); |
|
|
|
|
} else { |
|
|
|
|
StartAttack(player, d); |
|
|
|
|
} |
|
|
|
|
@ -1428,7 +1428,7 @@ void CheckNewPath(Player &player, bool pmWillBeCalled)
|
|
|
|
|
if (x <= 1 && y <= 1) { |
|
|
|
|
d = GetDirection(player.position.future, monster->position.future); |
|
|
|
|
if (monster->talkMsg != TEXT_NONE && monster->talkMsg != TEXT_VILE14) { |
|
|
|
|
TalktoMonster(*monster); |
|
|
|
|
TalktoMonster(player, *monster); |
|
|
|
|
} else { |
|
|
|
|
StartAttack(player, d); |
|
|
|
|
} |
|
|
|
|
@ -1449,7 +1449,7 @@ void CheckNewPath(Player &player, bool pmWillBeCalled)
|
|
|
|
|
case ACTION_RATTACKMON: |
|
|
|
|
d = GetDirection(player.position.future, monster->position.future); |
|
|
|
|
if (monster->talkMsg != TEXT_NONE && monster->talkMsg != TEXT_VILE14) { |
|
|
|
|
TalktoMonster(*monster); |
|
|
|
|
TalktoMonster(player, *monster); |
|
|
|
|
} else { |
|
|
|
|
StartRangeAttack(player, d, monster->position.future.x, monster->position.future.y); |
|
|
|
|
} |
|
|
|
|
|