[Scummvm-cvs-logs] scummvm master -> 3e0ba9feee2a9b1be641d8310ee7ee500ad2f554
dreammaster
dreammaster at scummvm.org
Sun Jul 26 21:32:47 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:
3e0ba9feee SHERLOCK: RT: Fix showing Journal when in a scrolled scene
Commit: 3e0ba9feee2a9b1be641d8310ee7ee500ad2f554
https://github.com/scummvm/scummvm/commit/3e0ba9feee2a9b1be641d8310ee7ee500ad2f554
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-26T15:31:42-04:00
Commit Message:
SHERLOCK: RT: Fix showing Journal when in a scrolled scene
Changed paths:
engines/sherlock/tattoo/tattoo_journal.cpp
diff --git a/engines/sherlock/tattoo/tattoo_journal.cpp b/engines/sherlock/tattoo/tattoo_journal.cpp
index 6df5ee7..6c33971 100644
--- a/engines/sherlock/tattoo/tattoo_journal.cpp
+++ b/engines/sherlock/tattoo/tattoo_journal.cpp
@@ -49,6 +49,9 @@ void TattooJournal::show() {
Screen &screen = *_vm->_screen;
TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui;
byte palette[PALETTE_SIZE];
+
+ Common::Point oldScroll = screen._currentScroll;
+ screen._currentScroll = Common::Point(0, 0);
// Load journal images
_journalImages = new ImageFile("journal.vgs");
@@ -95,6 +98,9 @@ void TattooJournal::show() {
// Free the images
delete _journalImages;
+
+ // Reset back to whatever scroll was active for the screen
+ screen._currentScroll = oldScroll;
}
void TattooJournal::handleKeyboardEvents() {
More information about the Scummvm-git-logs
mailing list