[Scummvm-cvs-logs] SF.net SVN: scummvm: [23727] scummvm/trunk/engines/scumm

[kirben at users.sourceforge.net]

Revision: 23727
Author:   kirben
Date:     2006-08-19 17:43:34 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23727&view=rev

Log Message:
-----------
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.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm.cpp
    scummvm/trunk/engines/scumm/scumm.h
    scummvm/trunk/engines/scumm/vars.cpp
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-08-19 11:11:18 UTC (rev 23726)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-08-20 00:43:34 UTC (rev 23727)
@@ -498,7 +498,7 @@
 	VAR_SOUNDPARAM = 0xFF;
 	VAR_SOUNDPARAM2 = 0xFF;
 	VAR_SOUNDPARAM3 = 0xFF;
-	VAR_MOUSEPRESENT = 0xFF;
+	VAR_INPUTMODE = 0xFF;
 	VAR_MEMORY_PERFORMANCE = 0xFF;
 
 	VAR_VIDEO_PERFORMANCE = 0xFF;

Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h	2006-08-19 11:11:18 UTC (rev 23726)
+++ scummvm/trunk/engines/scumm/scumm.h	2006-08-20 00:43:34 UTC (rev 23727)
@@ -1303,7 +1303,7 @@
 	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;

Modified: scummvm/trunk/engines/scumm/vars.cpp
===================================================================
--- scummvm/trunk/engines/scumm/vars.cpp	2006-08-19 11:11:18 UTC (rev 23726)
+++ scummvm/trunk/engines/scumm/vars.cpp	2006-08-20 00:43:34 UTC (rev 23727)
@@ -97,7 +97,7 @@
 		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 @@
 		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;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.