diff options
| author | Gregory Montoir | 2004-10-03 21:34:39 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2004-10-03 21:34:39 +0000 |
| commit | e681049e560a2efcc59e26073479e06c1030e1bc (patch) | |
| tree | 727721755d7e025c478b868fb0fe74b9f78c0931 /queen/walk.cpp | |
| parent | fbe5b94137bb73ad238df6d24ca48237ed493047 (diff) | |
| download | scummvm-rg350-e681049e560a2efcc59e26073479e06c1030e1bc.tar.gz scummvm-rg350-e681049e560a2efcc59e26073479e06c1030e1bc.tar.bz2 scummvm-rg350-e681049e560a2efcc59e26073479e06c1030e1bc.zip | |
merged FRAMES_JOE and FRAMES_JOE_XTRA
svn-id: r15398
Diffstat (limited to 'queen/walk.cpp')
| -rw-r--r-- | queen/walk.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/queen/walk.cpp b/queen/walk.cpp index 686d028510..f36c367180 100644 --- a/queen/walk.cpp +++ b/queen/walk.cpp @@ -67,9 +67,9 @@ void Walk::animateJoePrepare() { WalkData *pwd = &_walkData[i]; if (pwd->dx < 0) { - pwd->anim.set(11, 16 + FRAMES_JOE_XTRA, DIR_LEFT); + pwd->anim.set(11, 18, DIR_LEFT); } else { - pwd->anim.set(11, 16 + FRAMES_JOE_XTRA, DIR_RIGHT); + pwd->anim.set(11, 18, DIR_RIGHT); } int16 k = ABS(pwd->dy); @@ -81,15 +81,15 @@ void Walk::animateJoePrepare() { if (ABS(pwd->dx) < k) { if (pwd->dy < 0) { if (ds < 0) { - pwd->anim.set(17 + FRAMES_JOE_XTRA, 22 + FRAMES_JOE_XTRA, DIR_FRONT); + pwd->anim.set(19, 24, DIR_FRONT); } else { - pwd->anim.set(23 + FRAMES_JOE_XTRA, 28 + FRAMES_JOE_XTRA, DIR_BACK); + pwd->anim.set(25, 30, DIR_BACK); } } else if (pwd->dy > 0) { if (ds < 0) { - pwd->anim.set(23 + FRAMES_JOE_XTRA, 28 + FRAMES_JOE_XTRA, DIR_BACK); + pwd->anim.set(25, 30, DIR_BACK); } else { - pwd->anim.set(17 + FRAMES_JOE_XTRA, 22 + FRAMES_JOE_XTRA, DIR_FRONT); + pwd->anim.set(19, 24, DIR_FRONT); } } } @@ -340,7 +340,7 @@ int16 Walk::movePerson(const Person *pp, int16 endx, int16 endy, uint16 curImage can = -1; } - uint16 standingFrame = 29 + FRAMES_JOE_XTRA + bobNum; + uint16 standingFrame = 31 + bobNum; // make other person face the right direction BobSlot *pbs = _vm->graphics()->bob(bobNum); |