[Scummvm-cvs-logs] SF.net SVN: scummvm:[46256] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 46256
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46256&view=rev
Author:   m_kiewitz
Date:     2009-12-04 18:02:48 +0000 (Fri, 04 Dec 2009)

Log Message:
-----------
SCI: Renamed "buckybits" to "modifiers" in SciEvent

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kevent.cpp
    scummvm/trunk/engines/sci/event.cpp
    scummvm/trunk/engines/sci/event.h

Modified: scummvm/trunk/engines/sci/engine/kevent.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kevent.cpp	2009-12-04 17:58:26 UTC (rev 46255)
+++ scummvm/trunk/engines/sci/engine/kevent.cpp	2009-12-04 18:02:48 UTC (rev 46256)
@@ -75,11 +75,11 @@
 		break;
 
 	case SCI_EVENT_KEYBOARD:
-		if ((curEvent.buckybits & SCI_KEYMOD_LSHIFT) && (curEvent.buckybits & SCI_KEYMOD_RSHIFT) && (curEvent.data == '-')) {
+		if ((curEvent.modifiers & SCI_KEYMOD_LSHIFT) && (curEvent.modifiers & SCI_KEYMOD_RSHIFT) && (curEvent.data == '-')) {
 			printf("Debug mode activated\n");
 			g_debugState.seeking = kDebugSeekNothing;
 			g_debugState.runningStep = 0;
-		} else if ((curEvent.buckybits & SCI_KEYMOD_CTRL) && (curEvent.data == '`')) {
+		} else if ((curEvent.modifiers & SCI_KEYMOD_CTRL) && (curEvent.data == '`')) {
 			printf("Debug mode activated\n");
 			g_debugState.seeking = kDebugSeekNothing;
 			g_debugState.runningStep = 0;
@@ -89,7 +89,7 @@
 
 			PUT_SEL32V(segMan, obj, message, curEvent.character);
 			// We only care about the translated character
-			PUT_SEL32V(segMan, obj, modifiers, curEvent.buckybits&modifier_mask);
+			PUT_SEL32V(segMan, obj, modifiers, curEvent.modifiers & modifier_mask);
 		}
 		break;
 
@@ -117,7 +117,7 @@
 
 			PUT_SEL32V(segMan, obj, type, curEvent.type);
 			PUT_SEL32V(segMan, obj, message, 0);
-			PUT_SEL32V(segMan, obj, modifiers, (curEvent.buckybits | extra_bits)&modifier_mask);
+			PUT_SEL32V(segMan, obj, modifiers, (curEvent.modifiers | extra_bits) & modifier_mask);
 			s->r_acc = make_reg(0, 1);
 		}
 		break;

Modified: scummvm/trunk/engines/sci/event.cpp
===================================================================
--- scummvm/trunk/engines/sci/event.cpp	2009-12-04 17:58:26 UTC (rev 46255)
+++ scummvm/trunk/engines/sci/event.cpp	2009-12-04 18:02:48 UTC (rev 46256)
@@ -215,7 +215,7 @@
 		}
 		//TODO: SCI_EVM_INSERT
 
-		input.buckybits =
+		input.modifiers =
 		    ((modifiers & Common::KBD_ALT) ? SCI_KEYMOD_ALT : 0) |
 		    ((modifiers & Common::KBD_CTRL) ? SCI_KEYMOD_CTRL : 0) |
 		    ((modifiers & Common::KBD_SHIFT) ? SCI_KEYMOD_LSHIFT | SCI_KEYMOD_RSHIFT : 0) |
@@ -237,7 +237,7 @@
 				input.type = SCI_EVENT_NONE;
 				input.character = 0;
 				input.data = 0;
-				input.buckybits = 0;
+				input.modifiers = 0;
 
 				return input;
 			}
@@ -249,7 +249,7 @@
 					// Tab
 					input.type = SCI_EVENT_KEYBOARD;
 					input.data = SCI_KEY_TAB;
-					if (input.buckybits & (SCI_KEYMOD_LSHIFT | SCI_KEYMOD_RSHIFT))
+					if (input.modifiers & (SCI_KEYMOD_LSHIFT | SCI_KEYMOD_RSHIFT))
 						input.character = SCI_KEY_SHIFT_TAB;
 					else
 						input.character = SCI_KEY_TAB;
@@ -260,7 +260,7 @@
 				// SCI_K_F1 == 59 << 8
 				// SCI_K_SHIFT_F1 == 84 << 8
 				input.data = SCI_KEY_F1 + ((input.data - Common::KEYCODE_F1)<<8);
-				if (input.buckybits & (SCI_KEYMOD_LSHIFT | SCI_KEYMOD_RSHIFT))
+				if (input.modifiers & (SCI_KEYMOD_LSHIFT | SCI_KEYMOD_RSHIFT))
 					input.character = input.data + 25;
 				else
 					input.character = input.data;
@@ -400,23 +400,23 @@
 		event.character = event.data;
 
 		// TODO: Remove this as soon as ScummVM handles Ctrl-Alt-X to us
-		if ((event.buckybits == SCI_KEYMOD_CTRL) && (event.character = 'x'))
-			event.buckybits |= SCI_KEYMOD_ALT;
+		if ((event.modifiers == SCI_KEYMOD_CTRL) && (event.character = 'x'))
+			event.modifiers |= SCI_KEYMOD_ALT;
 
 		// Scancodify if appropriate
-		if (event.buckybits & SCI_KEYMOD_ALT) {
+		if (event.modifiers & SCI_KEYMOD_ALT) {
 			event.character = altify(event.character);
-		} else if (event.buckybits & SCI_KEYMOD_CTRL) {
+		} else if (event.modifiers & SCI_KEYMOD_CTRL) {
 			event.character = controlify(event.character);
 		}
 
 		// Shift if appropriate
-		else if (((event.buckybits & (SCI_KEYMOD_RSHIFT | SCI_KEYMOD_LSHIFT)) && !(event.buckybits & SCI_KEYMOD_CAPSLOCK))
-		         || (!(event.buckybits & (SCI_KEYMOD_RSHIFT | SCI_KEYMOD_LSHIFT)) && (event.buckybits & SCI_KEYMOD_CAPSLOCK)))
+		else if (((event.modifiers & (SCI_KEYMOD_RSHIFT | SCI_KEYMOD_LSHIFT)) && !(event.modifiers & SCI_KEYMOD_CAPSLOCK))
+		         || (!(event.modifiers & (SCI_KEYMOD_RSHIFT | SCI_KEYMOD_LSHIFT)) && (event.modifiers & SCI_KEYMOD_CAPSLOCK)))
 			event.character = shiftify(event.character);
 
 		// Numlockify if appropriate
-		else if (event.buckybits & SCI_KEYMOD_NUMLOCK)
+		else if (event.modifiers & SCI_KEYMOD_NUMLOCK)
 			event.data = numlockify(event.data);
 	}
 

Modified: scummvm/trunk/engines/sci/event.h
===================================================================
--- scummvm/trunk/engines/sci/event.h	2009-12-04 17:58:26 UTC (rev 46255)
+++ scummvm/trunk/engines/sci/event.h	2009-12-04 18:02:48 UTC (rev 46256)
@@ -37,9 +37,9 @@
 struct sciEvent {
 	short type;
 	short data;
-	short buckybits;
+	short modifiers;
 	short character; /* for keyboard events: 'data' after applying
-			 ** the effects of 'buckybits', e.g. if
+			 ** the effects of 'modifiers', e.g. if
 			 **   type == SCI_EVT_KEYBOARD
 			 **   data == 'a'
 			 **   buckybits == SCI_EVM_LSHIFT


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