[Scummvm-cvs-logs] scummvm master -> 1266fd95c536fdd81e60476e510a378e4899859d

[eriktorbjorn]

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:
1266fd95c5 SHERLOCK: Fix comment typo and remove unnecessary semicolon


Commit: 1266fd95c536fdd81e60476e510a378e4899859d
    https://github.com/scummvm/scummvm/commit/1266fd95c536fdd81e60476e510a378e4899859d
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-06-29T07:25:24+02:00

Commit Message:
SHERLOCK: Fix comment typo and remove unnecessary semicolon

Changed paths:
    engines/sherlock/fonts.cpp
    engines/sherlock/tattoo/tattoo_user_interface.cpp



diff --git a/engines/sherlock/fonts.cpp b/engines/sherlock/fonts.cpp
index 50d05de..440e319 100644
--- a/engines/sherlock/fonts.cpp
+++ b/engines/sherlock/fonts.cpp
@@ -82,7 +82,7 @@ void Fonts::setFont(int fontNum) {
 
 	_charCount = _font->size();
 		
-	// Iterate through the frames to find the widest aand tallest font characters
+	// Iterate through the frames to find the widest and tallest font characters
 	_fontHeight = _widestChar = 0;
 	for (uint idx = 0; idx < _charCount; ++idx) {
 		_fontHeight = MAX((uint16)_fontHeight, (*_font)[idx]._frame.h);
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 9f9b6f1..2ebf238 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -181,7 +181,7 @@ void TattooUserInterface::printObjectDesc(const Common::String &str, bool firstT
 			events._oldButtons = 0;
 		}
 	} else {
-		events._pressed = events._released = events._rightReleased = false;;
+		events._pressed = events._released = events._rightReleased = false;
 
 		// Show text dialog
 		_textWidget.load(str);