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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Fri Jun 18 01:12:38 CEST 2010


Revision: 49964
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49964&view=rev
Author:   fingolfin
Date:     2010-06-17 23:12:38 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
SCI: cleanup scancode rows code

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

Modified: scummvm/trunk/engines/sci/event.cpp
===================================================================
--- scummvm/trunk/engines/sci/event.cpp	2010-06-17 23:12:17 UTC (rev 49963)
+++ scummvm/trunk/engines/sci/event.cpp	2010-06-17 23:12:38 UTC (rev 49964)
@@ -34,18 +34,19 @@
 
 namespace Sci {
 
-#define SCANCODE_ROWS_NR 3
-
 EventManager::EventManager(bool fontIsExtended) : _fontIsExtended(fontIsExtended), _modifierStates(0) {
 }
 
 EventManager::~EventManager() {
 }
 
-static const struct scancode_row {
+
+struct ScancodeRow {
 	int offset;
 	const char *keys;
-} scancode_rows[SCANCODE_ROWS_NR] = {
+};
+
+static const ScancodeRow s_scancodeRows[] = {
 	{0x10, "QWERTYUIOP[]"},
 	{0x1e, "ASDFGHJKL;'\\"},
 	{0x2c, "ZXCVBNM,./"}
@@ -56,9 +57,9 @@
 	int row;
 	int c = toupper((char)ch);
 
-	for (row = 0; row < SCANCODE_ROWS_NR; row++) {
-		const char *keys = scancode_rows[row].keys;
-		int offset = scancode_rows[row].offset;
+	for (row = 0; row < ARRAYSIZE(s_scancodeRows); row++) {
+		const char *keys = s_scancodeRows[row].keys;
+		int offset = s_scancodeRows[row].offset;
 
 		while (*keys) {
 			if (*keys == c)


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




More information about the Scummvm-git-logs mailing list