From 69b1485a22dc2b8a2cfe0bd10edcbaad0da0cf6e Mon Sep 17 00:00:00 2001
From: strangerke
Date: Thu, 12 May 2011 01:13:57 +0200
Subject: GIT: Clean up: Suppress SVN tags, now useless

---
 engines/scumm/input.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'engines/scumm/input.cpp')

diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index ab5357f1dd..e9272a8170 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"
-- 
cgit v1.2.3


From b37463fe5921420a9081aa6c5cf7588d52b41e78 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 11 May 2011 16:03:50 +0200
Subject: SCUMM: Move class ResourceManager to its own header

---
 engines/scumm/input.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines/scumm/input.cpp')

diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index e9272a8170..1a4ed91f1c 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -35,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"
-- 
cgit v1.2.3


From eea482fa4304cab0e23ca4abffdec3651e45f01d Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Wed, 25 May 2011 10:31:37 -0400
Subject: ALL: behaviour -> behavior

---
 engines/scumm/input.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/scumm/input.cpp')

diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 1a4ed91f1c..ff85bd0a61 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -303,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);
-- 
cgit v1.2.3