[Scummvm-cvs-logs] scummvm master -> c72d826b7b538e2e1f825c43d3d4a19a6cceefe0

dreammaster dreammaster at scummvm.org
Sat Aug 1 23:04:12 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:
c72d826b7b SHERLOCK: SS: Fix return type of dartHit


Commit: c72d826b7b538e2e1f825c43d3d4a19a6cceefe0
    https://github.com/scummvm/scummvm/commit/c72d826b7b538e2e1f825c43d3d4a19a6cceefe0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-01T17:03:15-04:00

Commit Message:
SHERLOCK: SS: Fix return type of dartHit

Changed paths:
    engines/sherlock/scalpel/darts.cpp
    engines/sherlock/scalpel/darts.h



diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index a24af4e..8b5d02f 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -422,16 +422,16 @@ int Darts::doPowerBar(const Common::Point &pt, byte color, int goToPower, bool i
 	return MIN(idx * 100 / DARTBARSIZE, 100);
 }
 
-bool Darts::dartHit() {
+int Darts::dartHit() {
 	Events &events = *_vm->_events;
 
 	// Process pending events
 	events.pollEventsAndWait();
 
 	if (events.kbHit()) {
-		// Key was pressed, so discard it and return true
-		events.clearKeyboard();
-		return true;
+		// Key was pressed, so return it
+		Common::KeyState keyState = events.getKey();
+		return keyState.keycode;
 	}
 
 	_oldDartButtons = events._pressed;
diff --git a/engines/sherlock/scalpel/darts.h b/engines/sherlock/scalpel/darts.h
index 4368954..bf327b6 100644
--- a/engines/sherlock/scalpel/darts.h
+++ b/engines/sherlock/scalpel/darts.h
@@ -97,7 +97,7 @@ private:
 	/**
 	 * Returns true if a mouse button or key is pressed.
 	 */
-	bool dartHit();
+	int dartHit();
 	
 	/**
 	 * Return the score of the given location on the dart-board






More information about the Scummvm-git-logs mailing list