[Scummvm-cvs-logs] scummvm master -> b726513b1ede6c6ffafe5532cc681464f4a1f060

m-kiewitz m_kiewitz at users.sourceforge.net
Wed Feb 3 20:52:19 CET 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b726513b1e SCI: code/define formatting


Commit: b726513b1ede6c6ffafe5532cc681464f4a1f060
    https://github.com/scummvm/scummvm/commit/b726513b1ede6c6ffafe5532cc681464f4a1f060
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-03T20:51:46+01:00

Commit Message:
SCI: code/define formatting

Changed paths:
    engines/sci/event.h



diff --git a/engines/sci/event.h b/engines/sci/event.h
index dc3f81d..76c884a 100644
--- a/engines/sci/event.h
+++ b/engines/sci/event.h
@@ -48,69 +48,69 @@ struct SciEvent {
 
 /*Values for type*/
 #define SCI_EVENT_NONE            0
-#define SCI_EVENT_MOUSE_PRESS     (1<<0)
-#define SCI_EVENT_MOUSE_RELEASE   (1<<1)
-#define SCI_EVENT_KEYBOARD        (1<<2)
-#define SCI_EVENT_DIRECTION       (1<<6)
-#define SCI_EVENT_SAID            (1<<7)
+#define SCI_EVENT_MOUSE_PRESS     (1 << 0)
+#define SCI_EVENT_MOUSE_RELEASE   (1 << 1)
+#define SCI_EVENT_KEYBOARD        (1 << 2)
+#define SCI_EVENT_DIRECTION       (1 << 6)
+#define SCI_EVENT_SAID            (1 << 7)
 /*Fake values for other events*/
-#define SCI_EVENT_QUIT            (1<<11)
-#define SCI_EVENT_PEEK            (1<<15)
+#define SCI_EVENT_QUIT            (1 << 11)
+#define SCI_EVENT_PEEK            (1 << 15)
 #define SCI_EVENT_ANY             0x7fff
 
 /* Keycodes of special keys: */
-#define SCI_KEY_ESC 27
-#define SCI_KEY_BACKSPACE 8
-#define SCI_KEY_ENTER 13
-#define SCI_KEY_TAB '\t'
-#define SCI_KEY_SHIFT_TAB (0xf << 8)
-
-#define SCI_KEY_HOME (71 << 8)	// 7
-#define SCI_KEY_UP (72 << 8)		// 8
-#define SCI_KEY_PGUP (73 << 8)	// 9
+#define SCI_KEY_ESC          27
+#define SCI_KEY_BACKSPACE     8
+#define SCI_KEY_ENTER        13
+#define SCI_KEY_TAB        '\t'
+#define SCI_KEY_SHIFT_TAB  (0xf << 8)
+
+#define SCI_KEY_HOME   (71 << 8)	// 7
+#define SCI_KEY_UP     (72 << 8)	// 8
+#define SCI_KEY_PGUP   (73 << 8)	// 9
 //
-#define SCI_KEY_LEFT (75 << 8)	// 4
+#define SCI_KEY_LEFT   (75 << 8)	// 4
 #define SCI_KEY_CENTER (76 << 8)	// 5
-#define SCI_KEY_RIGHT (77 << 8)	// 6
+#define SCI_KEY_RIGHT  (77 << 8)	// 6
 //
-#define SCI_KEY_END (79 << 8)		// 1
-#define SCI_KEY_DOWN (80 << 8)	// 2
+#define SCI_KEY_END    (79 << 8)	// 1
+#define SCI_KEY_DOWN   (80 << 8)	// 2
 #define SCI_KEY_PGDOWN (81 << 8)	// 3
 //
 #define SCI_KEY_INSERT (82 << 8)	// 0
 #define SCI_KEY_DELETE (83 << 8)	// .
 
-#define SCI_KEY_F1 (59<<8)
-#define SCI_KEY_F2 (60<<8)
-#define SCI_KEY_F3 (61<<8)
-#define SCI_KEY_F4 (62<<8)
-#define SCI_KEY_F5 (63<<8)
-#define SCI_KEY_F6 (64<<8)
-#define SCI_KEY_F7 (65<<8)
-#define SCI_KEY_F8 (66<<8)
-#define SCI_KEY_F9 (67<<8)
-#define SCI_KEY_F10 (68<<8)
-
-#define SCI_KEY_SHIFT_F1 (84<<8)
-#define SCI_KEY_SHIFT_F2 (85<<8)
-#define SCI_KEY_SHIFT_F3 (86<<8)
-#define SCI_KEY_SHIFT_F4 (87<<8)
-#define SCI_KEY_SHIFT_F5 (88<<8)
-#define SCI_KEY_SHIFT_F6 (89<<8)
-#define SCI_KEY_SHIFT_F7 (90<<8)
-#define SCI_KEY_SHIFT_F8 (91<<8)
-#define SCI_KEY_SHIFT_F9 (92<<8)
-#define SCI_KEY_SHIFT_F10 (93<<8)
+#define SCI_KEY_F1   (59 << 8)
+#define SCI_KEY_F2   (60 << 8)
+#define SCI_KEY_F3   (61 << 8)
+#define SCI_KEY_F4   (62 << 8)
+#define SCI_KEY_F5   (63 << 8)
+#define SCI_KEY_F6   (64 << 8)
+#define SCI_KEY_F7   (65 << 8)
+#define SCI_KEY_F8   (66 << 8)
+#define SCI_KEY_F9   (67 << 8)
+#define SCI_KEY_F10  (68 << 8)
+
+#define SCI_KEY_SHIFT_F1   (84 << 8)
+#define SCI_KEY_SHIFT_F2   (85 << 8)
+#define SCI_KEY_SHIFT_F3   (86 << 8)
+#define SCI_KEY_SHIFT_F4   (87 << 8)
+#define SCI_KEY_SHIFT_F5   (88 << 8)
+#define SCI_KEY_SHIFT_F6   (89 << 8)
+#define SCI_KEY_SHIFT_F7   (90 << 8)
+#define SCI_KEY_SHIFT_F8   (91 << 8)
+#define SCI_KEY_SHIFT_F9   (92 << 8)
+#define SCI_KEY_SHIFT_F10  (93 << 8)
 
 /*Values for buckybits */
-#define SCI_KEYMOD_RSHIFT          (1<<0)
-#define SCI_KEYMOD_LSHIFT          (1<<1)
-#define SCI_KEYMOD_CTRL            (1<<2)
-#define SCI_KEYMOD_ALT             (1<<3)
-#define SCI_KEYMOD_SCRLOCK         (1<<4)
-#define SCI_KEYMOD_NUMLOCK         (1<<5)
-#define SCI_KEYMOD_CAPSLOCK        (1<<6)
-#define SCI_KEYMOD_INSERT          (1<<7)
+#define SCI_KEYMOD_RSHIFT    (1 << 0)
+#define SCI_KEYMOD_LSHIFT    (1 << 1)
+#define SCI_KEYMOD_CTRL      (1 << 2)
+#define SCI_KEYMOD_ALT       (1 << 3)
+#define SCI_KEYMOD_SCRLOCK   (1 << 4)
+#define SCI_KEYMOD_NUMLOCK   (1 << 5)
+#define SCI_KEYMOD_CAPSLOCK  (1 << 6)
+#define SCI_KEYMOD_INSERT    (1 << 7)
 
 #define SCI_KEYMOD_NO_FOOLOCK      (~(SCI_KEYMOD_SCRLOCK | SCI_KEYMOD_NUMLOCK | SCI_KEYMOD_CAPSLOCK | SCI_KEYMOD_INSERT))
 #define SCI_KEYMOD_ALL             0xFF






More information about the Scummvm-git-logs mailing list