libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-10 11:51:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA8: Fix attacking backwards by turning to direction first

Browse Source
This commit is contained in:
Matthew Jimenez 2022-12-20 22:41:41 -06:00
parent da5e76ff68
commit 4c0191c22d
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
View File

@ -81,34 +81,38 @@ void AvatarMoverProcess::run() {
bool AvatarMoverProcess::checkTurn(Direction direction, bool moving) {
Actor *avatar = getControlledActor();
Direction curdir = avatar->getDir();
bool combat = avatar->isInCombat() && !avatar->hasActorFlags(Actor::ACT_COMBATRUN);
// Note: don't need to turn if moving backward in combat stance
// CHECKME: currently, first turn in the right direction
if (direction != curdir && !(combat && Direction_Invert(direction) == curdir)) {
Animation::Sequence lastanim = avatar->getLastAnim();
if (moving &&
(lastanim == Animation::walk || lastanim == Animation::run ||
lastanim == Animation::combatStand ||
(GAME_IS_CRUSADER && (lastanim == Animation::startRunSmallWeapon ||
lastanim == Animation::combatRunSmallWeapon))) &&
(ABS(direction - curdir) + 2) % 16 <= 4) {
// don't need to explicitly do a turn animation
return false;
}
if (moving && lastanim == Animation::run) {
// slow down to a walk first
waitFor(avatar->doAnim(Animation::walk, curdir));
return true;
}
if (direction == curdir)
return false;
if (!moving) {
turnToDirection(direction);
return true;
}
return false;
// Do not turn if moving backward in combat stance
bool combat = avatar->isInCombat() && !avatar->hasActorFlags(Actor::ACT_COMBATRUN);
if (combat && Direction_Invert(direction) == curdir)
return false;
Animation::Sequence lastanim = avatar->getLastAnim();
// Check if we don't need to explicitly do a turn animation
if ((lastanim == Animation::walk || lastanim == Animation::run ||
lastanim == Animation::combatStand ||
(GAME_IS_CRUSADER && (lastanim == Animation::startRunSmallWeapon ||
lastanim == Animation::combatRunSmallWeapon))) &&
(ABS(direction - curdir) + 2) % 16 <= 4) {
return false;
}
if (lastanim == Animation::run) {
// slow down to a walk first
waitFor(avatar->doAnim(Animation::walk, curdir));
return true;
}
turnToDirection(direction);
return true;
}
void AvatarMoverProcess::turnToDirection(Direction direction) {

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

@ -150,7 +150,7 @@ void U8AvatarMoverProcess::handleCombatMode() {
// double left click = attack
// pout << "AvatarMover: combat attack" << Std::endl;
if (checkTurn(mousedir, true))
if (checkTurn(mousedir, false))
return;
waitFor(avatar->doAnim(Animation::attack, mousedir));