[Scummvm-cvs-logs] scummvm master -> d4653b15a4f7651eded7855bac465c0acae91bde
dreammaster
dreammaster at scummvm.org
Tue Aug 4 03:59:49 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:
d4653b15a4 SHERLOCK: RT: Further fixes for darts minigame
Commit: d4653b15a4f7651eded7855bac465c0acae91bde
https://github.com/scummvm/scummvm/commit/d4653b15a4f7651eded7855bac465c0acae91bde
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-03T21:57:40-04:00
Commit Message:
SHERLOCK: RT: Further fixes for darts minigame
Changed paths:
engines/sherlock/tattoo/tattoo_darts.cpp
diff --git a/engines/sherlock/tattoo/tattoo_darts.cpp b/engines/sherlock/tattoo/tattoo_darts.cpp
index 732a976..e2fa4f6 100644
--- a/engines/sherlock/tattoo/tattoo_darts.cpp
+++ b/engines/sherlock/tattoo/tattoo_darts.cpp
@@ -72,6 +72,7 @@ Darts::Darts(SherlockEngine *vm) : _vm(vm) {
void Darts::playDarts(GameType gameType) {
Events &events = *_vm->_events;
+ Scene &scene = *_vm->_scene;
Screen &screen = *_vm->_screen;
int oldFontType = screen.fontNumber();
int playerNum = 0;
@@ -89,7 +90,7 @@ void Darts::playDarts(GameType gameType) {
loadDarts();
initDarts();
- while (!_vm->shouldQuit()) {
+ while (!done && !_vm->shouldQuit()) {
roundStart = score = (playerNum == 0) ? _score1 : _score2;
showNames(playerNum);
@@ -237,6 +238,9 @@ void Darts::playDarts(GameType gameType) {
closeDarts();
screen.fadeToBlack();
screen.setFont(oldFontType);
+
+ // Flag to return to the Billard's Academy scene
+ scene._goToScene = 26;
}
void Darts::initDarts() {
@@ -390,7 +394,7 @@ void Darts::erasePowerBars() {
Screen &screen = *_vm->_screen;
// Erase the old power bars and replace them with empty ones
- screen.fillRect(Common::Rect(DART_BAR_VX, DART_HEIGHT_Y, DART_BAR_VX + 9, DART_HEIGHT_Y + DART_BAR_SIZE), 0);
+ screen._backBuffer1.fillRect(Common::Rect(DART_BAR_VX, DART_HEIGHT_Y, DART_BAR_VX + 9, DART_HEIGHT_Y + DART_BAR_SIZE), 0);
screen._backBuffer1.transBlitFrom((*_dartGraphics)[0], Common::Point(DART_BAR_VX - 1, DART_HEIGHT_Y - 1));
screen.slamArea(DART_BAR_VX - 1, DART_HEIGHT_Y - 1, 10, DART_BAR_SIZE + 2);
}
More information about the Scummvm-git-logs
mailing list