[Scummvm-cvs-logs] SF.net SVN: scummvm:[54897] scummvm/trunk/engines/mohawk

[fuzzie at users.sourceforge.net]

Revision: 54897
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54897&view=rev
Author:   fuzzie
Date:     2010-12-13 00:03:15 +0000 (Mon, 13 Dec 2010)

Log Message:
-----------
MOHAWK: Use named constants for LB control modes

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/livingbooks.cpp
    scummvm/trunk/engines/mohawk/livingbooks.h

Modified: scummvm/trunk/engines/mohawk/livingbooks.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/livingbooks.cpp	2010-12-12 23:59:46 UTC (rev 54896)
+++ scummvm/trunk/engines/mohawk/livingbooks.cpp	2010-12-13 00:03:15 UTC (rev 54897)
@@ -1594,7 +1594,7 @@
 	_timingMode = kLBAutoNone;
 	_periodMin = 0;
 	_periodMax = 0;
-	_controlMode = 0;
+	_controlMode = kLBControlNone;
 	_soundMode = 0;
 
 	_neverEnabled = true;
@@ -2037,12 +2037,12 @@
 			else
 				_loops = _loopMode;
 
-			if (_controlMode >= 1) {
+			if (_controlMode >= kLBControlHideMouse) {
 				debug(2, "Hiding cursor");
 				_vm->_cursor->hideCursor();
 				// TODO: lock sound?
 
-				if (_controlMode >= 2) {
+				if (_controlMode >= kLBControlPauseItems) {
 					debug(2, "Disabling all");
 					_vm->setEnableForAll(false, this);
 				}
@@ -2075,12 +2075,12 @@
 	_loops = 0;
 	_startTime = 0;
 
-	if (_controlMode >= 1) {
+	if (_controlMode >= kLBControlHideMouse) {
 		debug(2, "Showing cursor");
 		_vm->_cursor->showCursor();
 		// TODO: unlock sound?
 
-		if (_controlMode >= 2) {
+		if (_controlMode >= kLBControlPauseItems) {
 			debug(2, "Enabling all");
 			_vm->setEnableForAll(true, this);
 		}

Modified: scummvm/trunk/engines/mohawk/livingbooks.h
===================================================================
--- scummvm/trunk/engines/mohawk/livingbooks.h	2010-12-12 23:59:46 UTC (rev 54896)
+++ scummvm/trunk/engines/mohawk/livingbooks.h	2010-12-13 00:03:15 UTC (rev 54897)
@@ -67,7 +67,14 @@
 	kLBAutoLoad = 7
 };
 
+// control modes used in _controlMode
 enum {
+	kLBControlNone = 0,
+	kLBControlHideMouse = 1,
+	kLBControlPauseItems = 2
+};
+
+enum {
 	kLBStaticTextItem = 0x1,
 	kLBPictureItem = 0x2,
 	kLBEditTextItem = 0x14,


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