diff options
| author | Max Horn | 2003-09-09 19:30:25 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-09 19:30:25 +0000 |
| commit | d875bb69fe436fe071e9ad5363a203e99e793ed0 (patch) | |
| tree | 84398dca9b91f7191f589520d2ca6b5f11a10ab8 | |
| parent | 70df5b782c07f424920275fcb4defd7b1ee47c49 (diff) | |
| download | scummvm-rg350-d875bb69fe436fe071e9ad5363a203e99e793ed0.tar.gz scummvm-rg350-d875bb69fe436fe071e9ad5363a203e99e793ed0.tar.bz2 scummvm-rg350-d875bb69fe436fe071e9ad5363a203e99e793ed0.zip | |
fix for bug #782086 (COMI: a long walk)
svn-id: r10143
| -rw-r--r-- | scumm/actor.h | 2 | ||||
| -rw-r--r-- | scumm/script_v6.cpp | 2 | ||||
| -rw-r--r-- | scumm/string.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scumm/actor.h b/scumm/actor.h index 47a3f54666..d1ef4d9d07 100644 --- a/scumm/actor.h +++ b/scumm/actor.h @@ -157,7 +157,9 @@ public: byte *getActorName(); void startWalkActor(int x, int y, int dir); void stopActorMoving(); +protected: void startWalkAnim(int cmd, int angle); +public: void startAnimActor(int frame); void remapActorPalette(int r_fact, int g_fact, int b_fact, int threshold); diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 275cde4b51..6206354725 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1167,7 +1167,7 @@ void Scumm_v6::o6_loadRoomWithEgo() { _fullRedraw = 1; - if (x != -1) { + if (x != -1 && x != 0x7FFFFFFF) { a->startWalkActor(x, y, -1); } } diff --git a/scumm/string.cpp b/scumm/string.cpp index 446978dfe6..c7b49e6d9e 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -690,8 +690,6 @@ void Scumm::enqueueText(const byte *text, int x, int y, byte color, byte charset } void Scumm::drawBlastTexts() { - // FIXME - byte *buf; int c; int i; |