libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-19 08:25:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA8: Update gravity process for Crusader

Browse Source
This commit is contained in:
Matthew Duggan 2020-11-23 17:12:23 +09:00
parent 394455e9eb
commit 6ead0fedf8
3 changed files with 85 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
engines/ultima/ultima8/world/gravity_process.cpp
View File

@ -20,13 +20,16 @@
*
*/
#include "ultima/ultima8/world/gravity_process.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/world/gravity_process.h"
#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/world/actors/actor_anim_process.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/get_object.h"
@ -302,7 +305,14 @@ void GravityProcess::fallStopped() {
Actor *actor = getActor(_itemNum);
if (actor && !actor->isDead()) {
int height = actor->getFallStart() - actor->getZ();
if (GAME_IS_U8)
actorFallStoppedU8(actor, height);
else
actorFallStoppedCru(actor, height);
}
}
void GravityProcess::actorFallStoppedU8(Actor *actor, int height) {
if (height >= 80) {
int damage = 0;
@ -323,20 +333,55 @@ void GravityProcess::fallStopped() {
}
if (!actor->isDead() && actor->getLastAnim() != Animation::die) {
Kernel *kernel = Kernel::get_instance();
// play land animation, overriding other animations
Kernel::get_instance()->killProcesses(_itemNum, 0xF0, false); // CONSTANT!
kernel->killProcesses(_itemNum, ActorAnimProcess::ACTOR_ANIM_PROC_TYPE, false); // CONSTANT!
ProcId lpid = actor->doAnim(Animation::land, dir_current);
if (actor->isInCombat()) {
// need to get back to a combat stance to prevent weapon from
// being drawn again
ProcId spid = actor->doAnim(Animation::combatStand, dir_current);
Process *sp = Kernel::get_instance()->getProcess(spid);
Process *sp = kernel->getProcess(spid);
sp->waitFor(lpid);
}
}
}
void GravityProcess::actorFallStoppedCru(Actor *actor, int height) {
Animation::Sequence lastanim = actor->getLastAnim();
Kernel *kernel = Kernel::get_instance();
if (height / 8 > 2 &&
(lastanim != Animation::anotherJump &&
lastanim != Animation::slowCombatRollLeft &&
lastanim != Animation::slowCombatRollRight &&
lastanim != Animation::combatRollLeft &&
lastanim != Animation::combatRollRight &&
lastanim != Animation::run &&
lastanim != Animation::jumpForward &&
lastanim != Animation::unknownAnim30 &&
lastanim != Animation::runWithLargeWeapon)) {
// play land animation, overriding other animations
kernel->killProcesses(_itemNum, ActorAnimProcess::ACTOR_ANIM_PROC_TYPE, false); // CONSTANT!
ProcId lpid = actor->doAnim(Animation::jumpLanding, dir_current);
Animation::Sequence nextanim = actor->isInCombat() ? Animation::combatStand : Animation::stand;
ProcId spid = actor->doAnim(nextanim, dir_current);
Process *sp = kernel->getProcess(spid);
sp->waitFor(lpid);
// 'ooof' (Note: same sound no is used in No Remorse and No Regret)
AudioProcess *audioproc = AudioProcess::get_instance();
if (audioproc) audioproc->playSFX(0x8f, 250, _itemNum, 0); // CONSTANT!
} else {
Process *currentanim = kernel->findProcess(_itemNum, ActorAnimProcess::ACTOR_ANIM_PROC_TYPE);
if (currentanim) {
// TODO: Is this the right thing?
currentanim->wakeUp(0);
}
}
}
void GravityProcess::dumpInfo() const {

4
engines/ultima/ultima8/world/gravity_process.h
View File

@ -29,6 +29,7 @@ namespace Ultima {
namespace Ultima8 {
class Item;
class Actor;
class GravityProcess : public Process {
public:
@ -55,6 +56,9 @@ public:
protected:
void fallStopped();
void actorFallStoppedU8(Actor *actor, int height);
void actorFallStoppedCru(Actor *actor, int height);
int _gravity;
int _xSpeed, _ySpeed, _zSpeed;
};

8
engines/ultima/ultima8/world/item.cpp
View File

@ -1893,13 +1893,17 @@ GravityProcess *Item::ensureGravityProcess() {
}
void Item::fall() {
if (_flags & FLG_HANGING || getShapeInfo()->is_fixed()) {
const ShapeInfo *info = getShapeInfo();
if (_flags & FLG_HANGING || info->is_fixed() ||
(info->_weight == 0 && GAME_IS_CRUSADER)) {
// can't fall
return;
}
int gravity = GAME_IS_CRUSADER ? 2 : 4; //!! constants
GravityProcess *p = ensureGravityProcess();
p->setGravity(4); //!! constant
p->setGravity(gravity);
}
void Item::grab() {