thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Introduced ActorOldWalk subclass of Actor (for V1-V3 walk code)

Browse source 
svn-id: r24924
This commit is contained in:
Max Horn 2006-12-25 17:21:54 +00:00
parent ba991e3b3a
commit ae4ea4d989
4 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
engines/scumm/actor.cpp
View file

@ -207,14 +207,9 @@ void Actor::setupActorScale() {
void ScummEngine::walkActors() { void ScummEngine::walkActors() {
int i; for (int i = 1; i < _numActors; ++i) {
for (i = 1; i < _numActors; i++) {
if (_actors[i]->isInCurrentRoom()) if (_actors[i]->isInCurrentRoom())
if (_game.version <= 3) _actors[i]->walkActor();
_actors[i]->walkActorOld();
else
_actors[i]->walkActor();
} }
} }
@ -576,7 +571,7 @@ void Actor::walkActorV12() {
} }
*/ */
void Actor::walkActorOld() { void ActorOldWalk::walkActor() {
Common::Point p2, p3; // Gate locations Common::Point p2, p3; // Gate locations
int new_dir, next_box; int new_dir, next_box;

16
engines/scumm/actor.h
View file

@ -211,8 +211,7 @@ public:
void setDirection(int direction); void setDirection(int direction);
void faceToObject(int obj); void faceToObject(int obj);
void turnToDirection(int newdir); void turnToDirection(int newdir);
void walkActor(); virtual void walkActor();
void walkActorOld();
void drawActorToBackBuf(int x, int y); void drawActorToBackBuf(int x, int y);
void drawActorCostume(bool hitTestMode = false); void drawActorCostume(bool hitTestMode = false);
void animateCostume(); void animateCostume();
@ -315,16 +314,25 @@ protected:
bool isPlayer(); bool isPlayer();
bool findPathTowards(byte box, byte box2, byte box3, Common::Point &foundPath); bool findPathTowards(byte box, byte box2, byte box3, Common::Point &foundPath);
};
class ActorOldWalk : public Actor {
public:
ActorOldWalk(int id) : Actor(id) {}
virtual void walkActor();
protected:
void findPathTowardsOld(byte box, byte box2, byte box3, Common::Point &p2, Common::Point &p3); void findPathTowardsOld(byte box, byte box2, byte box3, Common::Point &p2, Common::Point &p3);
}; };
class ActorC64 : public Actor { class ActorC64 : public ActorOldWalk {
public: public:
// FIXME: This flag is never saved, which might lead to broken save states. // FIXME: This flag is never saved, which might lead to broken save states.
byte _miscflags; byte _miscflags;
public: public:
ActorC64(int id) : Actor(id) {} ActorC64(int id) : ActorOldWalk(id) {}
virtual void initActor(int mode) { virtual void initActor(int mode) {
if (mode == -1) { if (mode == -1) {
_miscflags = 0; _miscflags = 0;

2
engines/scumm/boxes.cpp
View file

@ -1135,7 +1135,7 @@ bool ScummEngine::areBoxesNeighbours(int box1nr, int box2nr) {
return false; return false;
} }
void Actor::findPathTowardsOld(byte box1, byte box2, byte finalBox, Common::Point &p2, Common::Point &p3) { void ActorOldWalk::findPathTowardsOld(byte box1, byte box2, byte finalBox, Common::Point &p2, Common::Point &p3) {
Common::Point pt; Common::Point pt;
Common::Point gateA[2]; Common::Point gateA[2];
Common::Point gateB[2]; Common::Point gateB[2];

2
engines/scumm/scumm.cpp
View file

@ -1248,6 +1248,8 @@ void ScummEngine::resetScumm() {
for (i = 0; i < _numActors; ++i) { for (i = 0; i < _numActors; ++i) {
if (_game.version == 0) if (_game.version == 0)
_actors[i] = new ActorC64(i); _actors[i] = new ActorC64(i);
else if (_game.version <= 3)
_actors[i] = new ActorOldWalk(i);
else else
_actors[i] = new Actor(i); _actors[i] = new Actor(i);
_actors[i]->initActor(1); _actors[i]->initActor(1);