[Scummvm-cvs-logs] scummvm master -> b8e3376099e21bb4029a48c8401fcd94355e3cb8
dreammaster
dreammaster at scummvm.org
Sat Oct 17 18:10:56 CEST 2015
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b8e3376099 SHERLOCK: RT: Increase darts hand/power speed, computer text fix
Commit: b8e3376099e21bb4029a48c8401fcd94355e3cb8
https://github.com/scummvm/scummvm/commit/b8e3376099e21bb4029a48c8401fcd94355e3cb8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-17T12:10:16-04:00
Commit Message:
SHERLOCK: RT: Increase darts hand/power speed, computer text fix
Changed paths:
engines/sherlock/tattoo/tattoo_darts.cpp
engines/sherlock/tattoo/tattoo_fixed_text.cpp
diff --git a/engines/sherlock/tattoo/tattoo_darts.cpp b/engines/sherlock/tattoo/tattoo_darts.cpp
index cf5f39f..640872e 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 c12ed3a..8d33e00 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",
More information about the Scummvm-git-logs
mailing list