Merge remote branch 'upstream/master' into t7g-ios

Conflicts:
	engines/groovie/script.cpp

1 files changed, 3 insertions, 5 deletions

diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index ab5357f1dd..ff85bd0a61 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/config-manager.h"
@@ -38,6 +35,7 @@
 #include "scumm/he/intern_he.h"
 #include "scumm/he/logic_he.h"
 #endif
+#include "scumm/resource.h"
 #include "scumm/scumm_v0.h"
 #include "scumm/scumm_v6.h"
 #include "scumm/scumm_v8.h"
@@ -305,14 +303,14 @@ void ScummEngine::processInput() {
 	if ((_leftBtnPressed & msClicked) && (_rightBtnPressed & msClicked) && _game.version >= 4) {
 		// Pressing both mouse buttons is treated as if you pressed
 		// the cutscene exit key (ESC) in V4+ games. That mimicks
-		// the behaviour of the original engine where pressing both
+		// the behavior of the original engine where pressing both
 		// mouse buttons also skips the current cutscene.
 		_mouseAndKeyboardStat = 0;
 		lastKeyHit = Common::KeyState(Common::KEYCODE_ESCAPE);
 	} else if ((_rightBtnPressed & msClicked) && (_game.version <= 3 && _game.id != GID_LOOM)) {
 		// Pressing right mouse button is treated as if you pressed
 		// the cutscene exit key (ESC) in V0-V3 games. That mimicks
-		// the behaviour of the original engine where pressing right
+		// the behavior of the original engine where pressing right
 		// mouse button also skips the current cutscene.
 		_mouseAndKeyboardStat = 0;
 		lastKeyHit = Common::KeyState(Common::KEYCODE_ESCAPE);