[Scummvm-cvs-logs] scummvm master -> 15c8917c01aca6b5ff2d20c3a2678e284dce648a

dreammaster dreammaster at scummvm.org
Wed Jul 22 04:40:48 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:
15c8917c01 SHERLOCK: RT: Fix compiler warnings


Commit: 15c8917c01aca6b5ff2d20c3a2678e284dce648a
    https://github.com/scummvm/scummvm/commit/15c8917c01aca6b5ff2d20c3a2678e284dce648a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-21T22:36:05-04:00

Commit Message:
SHERLOCK: RT: Fix compiler warnings

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



diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index 57b80ff..2e78fd5 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -394,7 +394,7 @@ void TattooEngine::doHangManPuzzle() {
 		lines[line].x += paperBounds.left;
 		lines[line].y += paperBounds.top;
 
-		for (int i = 0; i <= numWide; ++i)
+		for (i = 0; i <= numWide; ++i)
 			answers[line][i] = 0;
 	}
 
@@ -519,6 +519,9 @@ void TattooEngine::doHangManPuzzle() {
 				case Common::KEYCODE_DELETE:
 					answers[line][i] = ' ';
 					break;
+
+				default:
+					break;
 				}
 			}
 
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index ec1ba13..ae09ba5 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -648,7 +648,6 @@ void TattooUserInterface::setupBGArea(const byte cMap[PALETTE_SIZE]) {
 	}
 }
 
-
 void TattooUserInterface::doBgAnimEraseBackground() {
 	TattooEngine &vm = *((TattooEngine *)_vm);
 	People &people = *_vm->_people;






More information about the Scummvm-git-logs mailing list