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

DRAGONS: Start walking actors along path

Browse Source
This commit is contained in:
Eric Fry 2019-02-23 23:51:03 +11:00 committed by Eugene Sandulenko
parent d9e341f0e1
commit 1ecd63ca02
6 changed files with 142 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
engines/dragons/actor.cpp
View File

@ -21,6 +21,7 @@
*/
#include <common/debug.h>
#include "dragons.h"
#include "dragonini.h"
#include "actorresource.h"
#include "actor.h"
#include "scene.h"
@ -344,7 +345,7 @@ bool Actor::pathfinding_maybe(int16 target_x, int16 target_y, int16 unkTypeMaybe
|| ((target_x != x_pos || target_y != y_pos) && origDistance >= newTargetDiffDistance)) {
//0x80034568
debug(1, "0x80034568");
field_74 = var_c8_1 - 1;
walkPointsIndex = var_c8_1 - 1;
if (var_c8_1 == 0) {
target_x = newTargetX;
@ -352,12 +353,20 @@ bool Actor::pathfinding_maybe(int16 target_x, int16 target_y, int16 unkTypeMaybe
field_76 = -1;
field_78 = -1;
} else {
uint16 pointId = field_34[field_74];
uint16 pointId = walkPointsTbl[walkPointsIndex];
Common::Point point = getEngine()->_scene->getPoint(pointId);
target_x = point.x;
target_y = point.y;
}
//TODO continue here
int16 newSeqId = pathfindingUpdateTarget(target_x, target_y);
if (newSeqId != -1 && !(flags & ACTOR_FLAG_800)) {
_sequenceID2 = newSeqId;
}
if (_sequenceID != _sequenceID2 + 8 && !(flags & ACTOR_FLAG_800)) {
updateSequence(_sequenceID2 + 8);
}
setFlag(ACTOR_FLAG_10);
return true;
} else {
//0x80034470
debug(1, "0x80034470");
@ -367,16 +376,12 @@ bool Actor::pathfinding_maybe(int16 target_x, int16 target_y, int16 unkTypeMaybe
debug(1, "0x800341f0");
}
//FIXME
x_pos = target_x;
y_pos = target_y;
return false;
}
void Actor::pathfindingCleanup() {
clearFlag(Dragons::ACTOR_FLAG_10);
field_74 = 0;
walkPointsIndex = 0;
target_x_pos = x_pos;
target_y_pos = y_pos;
field_76 = -1;
@ -418,6 +423,10 @@ void Actor::setFlag(uint32 flag) {
flags |= flag;
}
bool Actor::isFlagSet(uint32 flag) {
return (flags & flag) == flag;
}
uint16 Actor::pathfindingUnk(int16 actor_x, int16 actor_y, int16 target_x, int16 target_y, int16 unkType) {
debug(1, "pathfindingUnk. (%X,%X) -> (%X,%X) %d", x_pos, y_pos, target_x, target_y, unkType);
@ -501,4 +510,102 @@ uint16 Actor::pathfindingUnk(int16 actor_x, int16 actor_y, int16 target_x, int16
}
}
int16 Actor::pathfindingUpdateTarget(int16 newTargetX, int16 newTargetY) {
field_24_x = x_pos << 0x10;
field_28_y = y_pos << 0x10;
int16 diffX = newTargetX - x_pos;
int16 diffY = newTargetY - y_pos;
int16 absDiffX = abs(diffX);
int16 absDiffY = abs(diffY) * 2;
int16 t2 = 0;
int16 newSequenceId = -1;
if (diffX == 0) {
if (diffY == 0) {
return -1;
}
field_2c = 0;
field_30 = 0x10000;
} else {
if (diffY == 0) {
field_2c = 0x10000;
field_30 = 0;
} else {
if (absDiffX >= absDiffY) {
field_2c = 0x10000;
field_30 = (absDiffY << 0x10) / absDiffX;
} else {
field_2c = (absDiffX << 0x10) / absDiffY;
field_30 = 0x10000;
}
}
}
field_30 = ((field_30 >> 5) * field_7c) >> 0xb;
field_2c = ((field_2c >> 5) * field_7c) >> 0xb;
if (diffX < 0) {
field_2c = -field_2c;
t2 = 2;
}
if (diffY < 0) {
field_30 = -field_30;
t2++;
}
switch (t2) {
case 0 :
newSequenceId = absDiffX < (absDiffY * 2) ? 2 : 0;
break;
case 1 :
error("TODO t2 == 1 0x80035138");
case 2 :
newSequenceId = absDiffX < (absDiffY * 2) ? 2 : 4;
break;
case 3 :
newSequenceId = absDiffX < (absDiffY * 2) ? 6 : 4;
break;
default :
break;
}
field_30 = field_30 / 2;
if (getEngine()->_dragonINIResource->isFlicker(_actorID)) {
// TODO 0x8003523c
error("FIXME 0x8003523c");
}
target_x_pos = newTargetX;
target_y_pos = newTargetY;
return newSequenceId;
}
void Actor::walkPath() {
if (isFlagClear(Dragons::ACTOR_FLAG_400) && isFlagSet(Dragons::ACTOR_FLAG_40) && isFlagSet(Dragons::ACTOR_FLAG_10)) {
field_24_x += (((field_e * field_2c) / 256) * 5) / 4;
field_28_y += (((field_e * field_30) / 256) * 5) / 4;
if ( (field_2c >= 0 && target_x_pos < (field_24_x >> 0x10))
|| (field_2c < 0 && (field_24_x >> 0x10) < target_x_pos)) {
field_24_x = target_x_pos << 0x10;
}
if ( (field_30 >= 0 && target_y_pos < (field_28_y >> 0x10))
|| (field_30 < 0 && (field_28_y >> 0x10) < target_y_pos)) {
field_28_y = target_y_pos << 0x10;
}
x_pos = field_24_x >> 0x10;
y_pos = field_28_y >> 0x10;
if (x_pos == target_x_pos && y_pos == target_y_pos) { //TODO temp logic
clearFlag(ACTOR_FLAG_10);
}
}
}
} // End of namespace Dragons

19
engines/dragons/actor.h
View File

@ -37,7 +37,7 @@ enum ActorFlags {
ACTOR_FLAG_2 = 2,
ACTOR_FLAG_4 = 4,
ACTOR_FLAG_8 = 8,
ACTOR_FLAG_10 = 0x10,
ACTOR_FLAG_10 = 0x10, //actor is walking a path
ACTOR_FLAG_20 = 0x20,
ACTOR_FLAG_40 = 0x40,
ACTOR_FLAG_80 = 0x80,
@ -94,12 +94,12 @@ public:
int16 y_pos;
int16 target_x_pos;
int16 target_y_pos;
uint32 field_24;
uint32 field_28;
uint32 field_2c;
uint32 field_30;
uint16 field_34[32];
int16 field_74;
int32 field_24_x;
int32 field_28_y;
int32 field_2c;
int32 field_30;
uint16 walkPointsTbl[32];
int16 walkPointsIndex;
int16 field_76;
int16 field_78;
uint16 field_7a;
@ -121,14 +121,19 @@ public:
void loadFrame(uint16 frameOffset);
void reset_maybe();
bool pathfinding_maybe(int16 target_x, int16 target_y, int16 isNotFlicker);
void walkPath();
void waitUntilFlag8IsSet();
void waitUntilFlag8And4AreSet();
void clearFlag(uint32 flag);
void setFlag(uint32 flag);
bool isFlagSet(uint32 flag);
bool isFlagClear(uint32 flag) { return !isFlagSet(flag); }
private:
void pathfindingCleanup();
uint16 pathfindingUnk(int16 actor_x, int16 actor_y, int16 target_x, int16 target_y, int16 unkType);
int16 pathfindingUpdateTarget(int16 newTargetX, int16 newTargetY);
};
} // End of namespace Dragons

10
engines/dragons/dragons.cpp
View File

@ -247,6 +247,8 @@ void DragonsEngine::updateHandler() {
if (_flags & Dragons::ENGINE_FLAG_20) {
engineFlag0x20UpdateFunction();
}
updatePathfindingActors(); //TODO find exact location for this logic.
}
const char *DragonsEngine::getSavegameFilename(int num) {
@ -475,6 +477,7 @@ void DragonsEngine::waitForFrames(uint16 numFrames) {
_scene->draw();
_screen->updateScreen();
updateEvents();
}
}
@ -482,4 +485,11 @@ void DragonsEngine::playSound(uint16 soundId) {
debug(3, "TODO: play sound %d", soundId);
}
void DragonsEngine::updatePathfindingActors() {
for (uint16 i = 0; i < 0x17; i++) {
Actor *actor = _actorManager->getActor(i);
actor->walkPath();
}
}
} // End of namespace Dragons

1
engines/dragons/dragons.h
View File

@ -157,6 +157,7 @@ public:
private:
void gameLoop();
void updateHandler();
void updatePathfindingActors();
uint32 calulateTimeLeft();
void wait();
uint16 getIniFromImg();

4
engines/dragons/screen.cpp
View File

@ -104,12 +104,12 @@ Common::Rect Screen::clipRectToScreen(int destX, int destY, const Common::Rect r
if (destX < 0) {
w += destX;
x += destX;
x += -destX;
}
if (destY < 0) {
h += destY;
y += destY;
y += -destY;
}
if (w > 0 && destX + w >= 320) {

4
engines/dragons/scriptopcodes.cpp
View File

@ -432,7 +432,7 @@ void ScriptOpcodes::opUnkE(ScriptOpCall &scriptOpCall) {
ini->actor->flags |= Dragons::ACTOR_FLAG_800;
ini->actor->updateSequence(field6 & 0x7fff);
}
ini->actor->field_7c = field4 & 0x8000 ? (field4 & 0x7fff) << 0x10 : (field4 & 0x7fff) << 7;
ini->actor->field_7c = field4 & 0x8000 ? (field4 & 0x7fff) << 7 : field4 << 0x10;
}
bool isFlicker = _vm->_dragonINIResource->isFlicker(ini);
@ -486,7 +486,7 @@ void ScriptOpcodes::opUnkF(ScriptOpCall &scriptOpCall) {
ini->actor->flags |= Dragons::ACTOR_FLAG_800;
ini->actor->updateSequence(field6 & 0x7fff);
}
ini->actor->field_7c = field4 & 0x8000 ? (field4 & 0x7fff) << 0x10 : (field4 & 0x7fff) << 7;
ini->actor->field_7c = field4 & 0x8000 ? (field4 & 0x7fff) << 7 : field4 << 0x10;
}
bool isFlicker = _vm->_dragonINIResource->isFlicker(ini);
ini->actor->pathfinding_maybe(field8, fieldA, isFlicker ? 0 : 1);