[Scummvm-cvs-logs] scummvm master -> 543f655bec7c068d6c4091ca57107c9ba201ed00

dreammaster dreammaster at scummvm.org
Mon Jul 27 04:59:41 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:
543f655bec SHERLOCK: RT: Fix vertical spacing in journal


Commit: 543f655bec7c068d6c4091ca57107c9ba201ed00
    https://github.com/scummvm/scummvm/commit/543f655bec7c068d6c4091ca57107c9ba201ed00
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-26T22:58:36-04:00

Commit Message:
SHERLOCK: RT: Fix vertical spacing in journal

Changed paths:
    engines/sherlock/journal.cpp



diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 19fc4af..dcb7641 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -30,6 +30,12 @@
 
 namespace Sherlock {
 
+static const int TATTOO_LINE_SPACING[17] = {
+	21, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 20, 20, 20, 21
+};
+
+/*----------------------------------------------------------------*/
+
 Journal *Journal::init(SherlockEngine *vm) {
 	if (vm->getGameID() == GType_SerratedScalpel)
 		return new Scalpel::ScalpelJournal(vm);
@@ -283,8 +289,8 @@ bool Journal::drawJournal(int direction, int howFar) {
 
 		if (inc) {
 			// Move to next line
+			yp += IS_SERRATED_SCALPEL ? 13 : TATTOO_LINE_SPACING[lineNum];
 			++lineNum;
-			yp += 13;
 		}
 	} while (lineNum < LINES_PER_PAGE && !endFlag);
 






More information about the Scummvm-git-logs mailing list