cleanup ; follow the code conventions

svn-id: r15476

1 files changed, 117 insertions, 132 deletions

diff --git a/queen/input.cpp b/queen/input.cpp
index 4f2fee40fa..fc3b9f8ca6 100644
--- a/queen/input.cpp
+++ b/queen/input.cpp
@@ -25,14 +25,25 @@
 
 namespace Queen {
 
-const char* Input::_commandKeys[LANGUAGE_COUNT] = {
+const char *Input::_commandKeys[LANGUAGE_COUNT] = {
 	"ocmglptu", // English
 	"osbgpnre", // German
 	"ofdnepau", // French
 	"acsdgpqu", // Italian
 	"ocmglptu", // Hebrew
 	"acodmthu"  // Spanish
-};  
+};
+
+const Verb Input::_verbKeys[8] = {
+	VERB_OPEN,
+	VERB_CLOSE,
+	VERB_MOVE,
+	VERB_GIVE,
+	VERB_LOOK_AT,
+	VERB_PICK_UP,
+	VERB_TALK_TO,
+	VERB_USE
+};
 
 Input::Input(Language language, OSystem *system) : 
 	_system(system), _fastMode(false), _keyVerb(VERB_NONE), 
@@ -42,27 +53,27 @@ Input::Input(Language language, OSystem *system) :
 	_mouse_y(0), _mouseButton(0), _idleTime(0) {
 
 	switch (language) {
-		case ENGLISH:
-			_currentCommandKeys = _commandKeys[0];
-			break;
-		case GERMAN:
-			_currentCommandKeys = _commandKeys[1];
-			break;
-		case FRENCH:
-			_currentCommandKeys = _commandKeys[2];
-			break;
-		case ITALIAN:
-			_currentCommandKeys = _commandKeys[3];
-			break;
-		case HEBREW:
-			_currentCommandKeys = _commandKeys[4];
-			break;
-		case SPANISH:
-			_currentCommandKeys = _commandKeys[5];
-			break;
-		default:
-			error("Unknown language");
-			break;
+	case ENGLISH:
+		_currentCommandKeys = _commandKeys[0];
+		break;
+	case GERMAN:
+		_currentCommandKeys = _commandKeys[1];
+		break;
+	case FRENCH:
+		_currentCommandKeys = _commandKeys[2];
+		break;
+	case ITALIAN:
+		_currentCommandKeys = _commandKeys[3];
+		break;
+	case HEBREW:
+		_currentCommandKeys = _commandKeys[4];
+		break;
+	case SPANISH:
+		_currentCommandKeys = _commandKeys[5];
+		break;
+	default:
+		error("Unknown language");
+		break;
 	}
 }
 
@@ -85,43 +96,40 @@ void Input::delay(uint amount) {
 		while (_system->pollEvent(event)) {
 			_idleTime = 0;
 			switch (event.event_code) {
-				case OSystem::EVENT_KEYDOWN:
-					if (event.kbd.flags == OSystem::KBD_CTRL) {
-						if (event.kbd.keycode == 'd') {
-							_debugger = true;
-						}
-						else if (event.kbd.keycode == 'f') {
-							_fastMode = !_fastMode;
-						}
-					}
-					else {
-						_inKey = event.kbd.keycode;
+			case OSystem::EVENT_KEYDOWN:
+				if (event.kbd.flags == OSystem::KBD_CTRL) {
+					if (event.kbd.keycode == 'd') {
+						_debugger = true;
+					} else if (event.kbd.keycode == 'f') {
+						_fastMode = !_fastMode;
 					}
-					break;
-
-				case OSystem::EVENT_MOUSEMOVE:
-					_mouse_x = event.mouse.x;
-					_mouse_y = event.mouse.y;
-					break;
-
-				case OSystem::EVENT_LBUTTONDOWN:
-					_mouseButton |= MOUSE_LBUTTON;
+				} else {
+					_inKey = event.kbd.keycode;
+				}
+				break;
+			case OSystem::EVENT_MOUSEMOVE:
+				_mouse_x = event.mouse.x;
+				_mouse_y = event.mouse.y;
+				break;
+
+			case OSystem::EVENT_LBUTTONDOWN:
+				_mouseButton |= MOUSE_LBUTTON;
 #if defined(_WIN32_WCE) || defined(__PALM_OS__)
-					_mouse_x = event.mouse.x;
-					_mouse_y = event.mouse.y;
+				_mouse_x = event.mouse.x;
+				_mouse_y = event.mouse.y;
 #endif
-					break;
+				break;
 
-				case OSystem::EVENT_RBUTTONDOWN:
-					_mouseButton |= MOUSE_RBUTTON;
-					break;
+			case OSystem::EVENT_RBUTTONDOWN:
+				_mouseButton |= MOUSE_RBUTTON;
+				break;
 
-				case OSystem::EVENT_QUIT:
-					_system->quit();
-					break;
+			case OSystem::EVENT_QUIT:
+				_system->quit();
+				break;
 
-				default:
-					break;
+			default:
+				break;
 			}
 		}
 
@@ -142,91 +150,68 @@ int Input::checkKeys() {
 		debug(6, "[Input::checkKeys] _inKey = %i", _inKey);
 
 	switch (_inKey) {
-		case KEY_SPACE:
-			_keyVerb = VERB_SKIP_TEXT;
-			break;
-
-		case KEY_COMMA:
-			_keyVerb = VERB_SCROLL_UP;
-			break;
-
-		case KEY_DOT:
-			_keyVerb = VERB_SCROLL_DOWN;
-			break;
-
-		case KEY_DIGIT_1:
-			_keyVerb = VERB_DIGIT_1;
-			break;
-
-		case KEY_DIGIT_2:
-			_keyVerb = VERB_DIGIT_2;
-			break;
-
-		case KEY_DIGIT_3:
-			_keyVerb = VERB_DIGIT_3;
-			break;
-
-		case KEY_DIGIT_4:
-			_keyVerb = VERB_DIGIT_4;
-			break;
-
-		case KEY_ESCAPE:
-			if (_canQuit) {
-				if (_cutawayRunning) {
-					debug(6, "[Input::checkKeys] Setting _cutawayQuit to true!");
-					_cutawayQuit = true;
-				}
-
-				if (_dialogueRunning)
-					_talkQuit = true;
-			}
-			break;
-
-		case KEY_F1:	// Use Journal
-		case KEY_F5:
+	case KEY_SPACE:
+		_keyVerb = VERB_SKIP_TEXT;
+		break;
+	case KEY_COMMA:
+		_keyVerb = VERB_SCROLL_UP;
+		break;
+	case KEY_DOT:
+		_keyVerb = VERB_SCROLL_DOWN;
+		break;
+	case KEY_DIGIT_1:
+		_keyVerb = VERB_DIGIT_1;
+		break;
+	case KEY_DIGIT_2:
+		_keyVerb = VERB_DIGIT_2;
+		break;
+	case KEY_DIGIT_3:
+		_keyVerb = VERB_DIGIT_3;
+		break;
+	case KEY_DIGIT_4:
+		_keyVerb = VERB_DIGIT_4;
+		break;
+	case KEY_ESCAPE: // slip cutaway / dialogue
+		if (_canQuit) {
 			if (_cutawayRunning) {
-				if (_canQuit) {
-					_keyVerb = VERB_USE_JOURNAL;
-					_cutawayQuit = _talkQuit = true;
-				}
+				debug(6, "[Input::checkKeys] Setting _cutawayQuit to true!");
+				_cutawayQuit = true;
 			}
-			else {
+			if (_dialogueRunning)
+				_talkQuit = true;
+		}
+		break;
+	case KEY_F1: // use Journal
+	case KEY_F5:
+		if (_cutawayRunning) {
+			if (_canQuit) {
 				_keyVerb = VERB_USE_JOURNAL;
-				if (_canQuit)
-					_talkQuit = true;
+				_cutawayQuit = _talkQuit = true;
 			}
-			break;
-
-		case KEY_F11:	// Quicksave
-			_quickSave = true;
-			break;
-			
-		case KEY_F12:	// Quickload
-			_quickLoad = true;
-			break;
-
-		default:
-			if(_inKey == _currentCommandKeys[0])
-				_keyVerb = VERB_OPEN;
-			else if(_inKey == _currentCommandKeys[1])
-				_keyVerb = VERB_CLOSE;
-			else if(_inKey == _currentCommandKeys[2])
-				_keyVerb = VERB_MOVE;
-			else if(_inKey == _currentCommandKeys[3])
-				_keyVerb = VERB_GIVE;
-			else if(_inKey == _currentCommandKeys[4])
-				_keyVerb = VERB_LOOK_AT;
-			else if(_inKey == _currentCommandKeys[5])
-				_keyVerb = VERB_PICK_UP;
-			else if(_inKey == _currentCommandKeys[6])
-				_keyVerb = VERB_TALK_TO;
-			else if(_inKey == _currentCommandKeys[7])
-				_keyVerb = VERB_USE;
-			break;
+		} else {
+			_keyVerb = VERB_USE_JOURNAL;
+			if (_canQuit)
+				_talkQuit = true;
+		}
+		break;
+	case KEY_F11: // quicksave
+		_quickSave = true;
+		break;		
+	case KEY_F12: // quickload
+		_quickLoad = true;
+		break;
+	default:
+		for (int i = 0; i < ARRAYSIZE(_verbKeys); ++i) {
+			if (_inKey == _currentCommandKeys[i]) {
+				_keyVerb = _verbKeys[i];
+				break;
+			}
+		}
+		break;
 	}
 	
 	int inKey = _inKey;
-	_inKey = 0;	//reset
+	_inKey = 0;	// reset
 	return inKey;
 }