libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-13 07:14:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA8: Allow attack in current direction during movement

Browse Source
This commit is contained in:
Matthew Jimenez 2024-01-28 18:01:36 -06:00
parent eb7cd9675c
commit 6b2bfe3b07
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
View File

@ -156,12 +156,14 @@ void U8AvatarMoverProcess::handleCombatMode() {
if (canAttack()) {
// double left click = attack
// debugC(kDebugActor, "AvatarMover: combat attack");
if (hasMovementFlags(MOVE_ANY_DIRECTION)) {
waitFor(avatar->doAnim(Animation::attack, direction));
} else {
if (checkTurn(mousedir, false))
return;
if (checkTurn(mousedir, false))
return;
waitFor(avatar->doAnim(Animation::attack, mousedir));
waitFor(avatar->doAnim(Animation::attack, mousedir));
}
_lastAttack = Kernel::get_instance()->getFrameNum();
// attacking gives str/dex
@ -188,12 +190,14 @@ void U8AvatarMoverProcess::handleCombatMode() {
if (canAttack()) {
// double right click = kick
// debugC(kDebugActor, "AvatarMover: combat kick");
if (hasMovementFlags(MOVE_ANY_DIRECTION)) {
waitFor(avatar->doAnim(Animation::kick, direction));
} else {
if (checkTurn(mousedir, false))
return;
if (checkTurn(mousedir, false))
return;
waitFor(avatar->doAnim(Animation::kick, mousedir));
waitFor(avatar->doAnim(Animation::kick, mousedir));
}
_lastAttack = Kernel::get_instance()->getFrameNum();
// kicking gives str/dex