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

[bgK]

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:
b51589e993 MOHAWK: Make sure the cursor is visible after loading in Myst
15cc188abe CREATE_PROJECT: Fix MSVC compilation


Commit: b51589e99385bea99e06b3feb184d3b516ecee8a
    https://github.com/scummvm/scummvm/commit/b51589e99385bea99e06b3feb184d3b516ecee8a
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2016-07-24T14:17:45+02:00

Commit Message:
MOHAWK: Make sure the cursor is visible after loading in Myst

Fixes #7164.

Changed paths:
    engines/mohawk/myst_state.cpp



diff --git a/engines/mohawk/myst_state.cpp b/engines/mohawk/myst_state.cpp
index 4324d6b..213a976 100644
--- a/engines/mohawk/myst_state.cpp
+++ b/engines/mohawk/myst_state.cpp
@@ -120,6 +120,7 @@ bool MystGameState::load(int slot) {
 	_vm->changeToStack(kIntroStack, 5, 0, 0);
 
 	// Set our default cursor
+	_vm->_cursor->showCursor();
 	if (_globals.heldPage == 0 || _globals.heldPage > 13)
 		_vm->setMainCursor(kDefaultMystCursor);
 	else if (_globals.heldPage < 7)


Commit: 15cc188abe2301787295912948403438dc7c5cec
    https://github.com/scummvm/scummvm/commit/15cc188abe2301787295912948403438dc7c5cec
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2016-07-24T14:18:10+02:00

Commit Message:
CREATE_PROJECT: Fix MSVC compilation

Fixes #7173.

Changed paths:
    devtools/create_project/cmake.cpp



diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp
index d443bba..1423e68 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -26,6 +26,7 @@
 #include <algorithm>
 #include <cstring>
 #include <fstream>
+#include <iterator>
 
 namespace CreateProjectTool {