From e9be88c4446e2ad3412edb5bacf7d8ba62021c6a Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 20 Aug 2006 00:43:34 +0000
Subject: Rename VAR_MOUSEPRESENT to VAR_INPUTMODE and set the default input
 type to mouse mode. Fighting uses mouse mode by default in FOA now, just like
 the original game.

svn-id: r23727
---
 engines/scumm/scumm.cpp | 2 +-
 engines/scumm/scumm.h   | 2 +-
 engines/scumm/vars.cpp  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 0763196c12..a7add0ef84 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -498,7 +498,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 	VAR_SOUNDPARAM = 0xFF;
 	VAR_SOUNDPARAM2 = 0xFF;
 	VAR_SOUNDPARAM3 = 0xFF;
-	VAR_MOUSEPRESENT = 0xFF;
+	VAR_INPUTMODE = 0xFF;
 	VAR_MEMORY_PERFORMANCE = 0xFF;
 
 	VAR_VIDEO_PERFORMANCE = 0xFF;
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 0540fb14ec..5dad7be022 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -1303,7 +1303,7 @@ public:
 	byte VAR_SOUNDPARAM;
 	byte VAR_SOUNDPARAM2;
 	byte VAR_SOUNDPARAM3;
-	byte VAR_MOUSEPRESENT;
+	byte VAR_INPUTMODE;
 	byte VAR_MEMORY_PERFORMANCE;
 	byte VAR_VIDEO_PERFORMANCE;
 	byte VAR_ROOM_FLAG;
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp
index 7e2cde25db..0064b50d77 100644
--- a/engines/scumm/vars.cpp
+++ b/engines/scumm/vars.cpp
@@ -97,7 +97,7 @@ void ScummEngine::setupScummVars() {
 		VAR_SOUNDPARAM = 64;
 		VAR_SOUNDPARAM2 = 65;
 		VAR_SOUNDPARAM3 = 66;
-		VAR_MOUSEPRESENT = 67;
+		VAR_INPUTMODE = 67;	// 1 is keyboard, 2 is joystick, 3 is mouse
 		VAR_MEMORY_PERFORMANCE = 68;
 		VAR_VIDEO_PERFORMANCE = 69;
 		VAR_ROOM_FLAG = 70;
@@ -749,7 +749,7 @@ void ScummEngine::resetScummVars() {
 		if (_game.version >= 4)
 			VAR(VAR_FIXEDDISK) = 1;
 		if (_game.version >= 5)
-			VAR(VAR_MOUSEPRESENT) = 1;
+			VAR(VAR_INPUTMODE) = 3;
 		if (_game.version == 6)
 			VAR(VAR_V6_EMSSPACE) = 10000;
 
-- 
cgit v1.2.3