diff options
| author | Paul Gilbert | 2015-10-17 12:10:16 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-10-17 12:10:16 -0400 |
| commit | b8e3376099e21bb4029a48c8401fcd94355e3cb8 (patch) | |
| tree | 56bba7565cf99eabaa3782a0a445884581710203 /engines/sherlock/tattoo | |
| parent | 120e763f719d1b49165462d07bb5766443f04922 (diff) | |
| download | scummvm-rg350-b8e3376099e21bb4029a48c8401fcd94355e3cb8.tar.gz scummvm-rg350-b8e3376099e21bb4029a48c8401fcd94355e3cb8.tar.bz2 scummvm-rg350-b8e3376099e21bb4029a48c8401fcd94355e3cb8.zip | |
SHERLOCK: RT: Increase darts hand/power speed, computer text fix
Diffstat (limited to 'engines/sherlock/tattoo')
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_darts.cpp | 16 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_fixed_text.cpp | 4 |
2 files changed, 7 insertions, 13 deletions
diff --git a/engines/sherlock/tattoo/tattoo_darts.cpp b/engines/sherlock/tattoo/tattoo_darts.cpp index cf5f39fd5d..640872ed9e 100644 --- a/engines/sherlock/tattoo/tattoo_darts.cpp +++ b/engines/sherlock/tattoo/tattoo_darts.cpp @@ -416,7 +416,7 @@ void Darts::erasePowerBars() { bool Darts::dartHit() { Events &events = *_vm->_events; - events.pollEventsAndWait(); + events.pollEvents(); events.setButtonState(); // Keyboard check @@ -441,10 +441,7 @@ int Darts::doPowerBar(const Common::Point &pt, byte color, int goToPower, int or events.clearEvents(); events.delay(100); - while (!_vm->shouldQuit()) { - if (idx >= DART_BAR_SIZE) - break; - + while (!_vm->shouldQuit() && idx < DART_BAR_SIZE) { if ((goToPower - 1) == idx) break; else if (goToPower == 0) { @@ -492,11 +489,8 @@ int Darts::drawHand(int goToPower, int computer) { Common::Point pt(DARTBOARD_LEFT - HAND_OFFSET[hand], SHERLOCK_SCREEN_HEIGHT - _handSize.y); int x = 0; - while (!_vm->shouldQuit()) { - if (x >= DARTBOARD_WIDTH) - break; - - if ((goToPower - 1) == x) + while (!_vm->shouldQuit() && x < DARTBOARD_WIDTH) { + if (computer && x >= (goToPower - 1)) break; else if (goToPower == 0) { if (dartHit()) @@ -903,7 +897,7 @@ int Darts::throwDart(int dartNum, int computer) { if (!computer) { // Wait for a hit while (!dartHit() && !_vm->shouldQuit()) - ; + events.wait(1); if (_escapePressed) return 0; } else { diff --git a/engines/sherlock/tattoo/tattoo_fixed_text.cpp b/engines/sherlock/tattoo/tattoo_fixed_text.cpp index c12ed3a00a..8d33e00ce4 100644 --- a/engines/sherlock/tattoo/tattoo_fixed_text.cpp +++ b/engines/sherlock/tattoo/tattoo_fixed_text.cpp @@ -80,8 +80,8 @@ static const char *const fixedTextEN[] = { "GAME OVER", "BUSTED", "Wins", - "Scored %d points", - "points", // ?? + "Scored", + "points", "Hit %s %d", "Double", "Triple", |