[Scummvm-cvs-logs] scummvm master -> 751183a2698398f8b25f85d189d91151be90549c

[Strangerke]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9d6ae42f65 MORTEVIELLE: Reduce the scope of a variable
751183a269 CGE2: Silent a CppCheck warning


Commit: 9d6ae42f655bd1c3797f949763c73ecf8cbf6b53
    https://github.com/scummvm/scummvm/commit/9d6ae42f655bd1c3797f949763c73ecf8cbf6b53
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-11-27T15:05:41+01:00

Commit Message:
MORTEVIELLE: Reduce the scope of a variable

Changed paths:
    engines/mortevielle/utils.cpp



diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index cbc22e4..651bd5b 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -1728,12 +1728,12 @@ void MortevielleEngine::showMoveMenuAlert() {
 void MortevielleEngine::showConfigScreen() {
 	// FIXME: need a DOS palette, index 9 (light blue). Also we should show DOS font here
 	Common::String tmpStr;
-	int width, cy = 0;
+	int cy = 0;
 	clearScreen();
  	do {
  		++cy;
  		tmpStr = getString(cy + kStartingScreenStringIndex);
- 		width = _screenSurface->getStringWidth(tmpStr);
+ 		int width = _screenSurface->getStringWidth(tmpStr);
  		_text->displayStr(tmpStr, 320 - width / 2, cy * 8, 80, 1, 2);
  	} while (cy != 20);
 


Commit: 751183a2698398f8b25f85d189d91151be90549c
    https://github.com/scummvm/scummvm/commit/751183a2698398f8b25f85d189d91151be90549c
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-11-27T15:06:10+01:00

Commit Message:
CGE2: Silent a CppCheck warning

Changed paths:
    engines/cge2/sound.h



diff --git a/engines/cge2/sound.h b/engines/cge2/sound.h
index 6673b67..02afe61 100644
--- a/engines/cge2/sound.h
+++ b/engines/cge2/sound.h
@@ -68,7 +68,7 @@ class Sound {
 public:
 	SmpInfo _smpinf;
 
-	Sound(CGE2Engine *vm);
+	explicit Sound(CGE2Engine *vm);
 	~Sound();
 	void open();
 	void close();
@@ -116,7 +116,7 @@ private:
 	// Stop MIDI File
 	void sndMidiStop();
 public:
-	MusicPlayer(CGE2Engine *vm);
+	explicit MusicPlayer(CGE2Engine *vm);
 	~MusicPlayer();
 
 	void loadMidi(int ref);