WINTERMUTE: Convert CRLF to LF

1 files changed, 309 insertions, 309 deletions

diff --git a/engines/wintermute/base/base_keyboard_state.cpp b/engines/wintermute/base/base_keyboard_state.cpp
index d5c2027a0d..fd5f2b0e1d 100644
--- a/engines/wintermute/base/base_keyboard_state.cpp
+++ b/engines/wintermute/base/base_keyboard_state.cpp
@@ -1,309 +1,309 @@
-/* ScummVM - Graphic Adventure Engine

- *

- * ScummVM is the legal property of its developers, whose names

- * are too numerous to list here. Please refer to the COPYRIGHT

- * file distributed with this source distribution.

- *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

-

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

-

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- *

- */

-

-/*

- * This file is based on WME Lite.

- * http://dead-code.org/redir.php?target=wmelite

- * Copyright (c) 2011 Jan Nedoma

- */

-

-#include "engines/wintermute/base/base_keyboard_state.h"

-#include "engines/wintermute/base/scriptables/script_value.h"

-#include "engines/wintermute/base/scriptables/script_stack.h"

-#include "common/system.h"

-#include "common/keyboard.h"

-

-namespace Wintermute {

-

-IMPLEMENT_PERSISTENT(BaseKeyboardState, false)

-

-//////////////////////////////////////////////////////////////////////////

-BaseKeyboardState::BaseKeyboardState(BaseGame *inGame) : BaseScriptable(inGame) {

-	_currentPrintable = false;

-	_currentCharCode = 0;

-	_currentKeyData = 0;

-

-	_currentShift = false;

-	_currentAlt = false;

-	_currentControl = false;

-

-	_keyStates = new uint8[323]; // Hardcoded size for the common/keyboard.h enum

-	for (int i = 0; i < 323; i++) {

-		_keyStates[i] = false;

-	}

-}

-

-//////////////////////////////////////////////////////////////////////////

-BaseKeyboardState::~BaseKeyboardState() {

-	delete[] _keyStates;

-}

-

-void BaseKeyboardState::handleKeyPress(Common::Event *event) {

-	if (event->type == Common::EVENT_KEYDOWN) {

-		_keyStates[event->kbd.keycode] = true;

-	}

-}

-

-void BaseKeyboardState::handleKeyRelease(Common::Event *event) {

-	if (event->type == Common::EVENT_KEYUP) {

-		_keyStates[event->kbd.keycode] = false;

-	}

-}

-

-//////////////////////////////////////////////////////////////////////////

-// high level scripting interface

-//////////////////////////////////////////////////////////////////////////

-bool BaseKeyboardState::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) {

-	//////////////////////////////////////////////////////////////////////////

-	// IsKeyDown

-	//////////////////////////////////////////////////////////////////////////

-	if (strcmp(name, "IsKeyDown") == 0) {

-		stack->correctParams(1);

-		ScValue *val = stack->pop();

-		int vKey;

-

-		if (val->_type == VAL_STRING && strlen(val->getString()) > 0) {

-			const char *str = val->getString();

-			char temp = str[0];

-			if (temp >= 'A' && temp <= 'Z') {

-				temp += ('a' - 'A');

-			}

-			vKey = (int)temp;

-		} else {

-			vKey = val->getInt();

-		}

-

-		bool isDown = _keyStates[vKeyToKeyCode(vKey)];

-

-		stack->pushBool(isDown);

-		return STATUS_OK;

-	} else {

-		return BaseScriptable::scCallMethod(script, stack, thisStack, name);

-	}

-}

-

-

-//////////////////////////////////////////////////////////////////////////

-ScValue *BaseKeyboardState::scGetProperty(const char *name) {

-	_scValue->setNULL();

-

-	//////////////////////////////////////////////////////////////////////////

-	// Type

-	//////////////////////////////////////////////////////////////////////////

-	if (strcmp(name, "Type") == 0) {

-		_scValue->setString("keyboard");

-		return _scValue;

-	}

-

-	//////////////////////////////////////////////////////////////////////////

-	// Key

-	//////////////////////////////////////////////////////////////////////////

-	else if (strcmp(name, "Key") == 0) {

-		if (_currentPrintable) {

-			char key[2];

-			key[0] = (char)_currentCharCode;

-			key[1] = '\0';

-			_scValue->setString(key);

-		} else {

-			_scValue->setString("");

-		}

-

-		return _scValue;

-	}

-

-	//////////////////////////////////////////////////////////////////////////

-	// Printable

-	//////////////////////////////////////////////////////////////////////////

-	else if (strcmp(name, "Printable") == 0) {

-		_scValue->setBool(_currentPrintable);

-		return _scValue;

-	}

-

-	//////////////////////////////////////////////////////////////////////////

-	// KeyCode

-	//////////////////////////////////////////////////////////////////////////

-	else if (strcmp(name, "KeyCode") == 0) {

-		_scValue->setInt(_currentCharCode);

-		return _scValue;

-	}

-

-	//////////////////////////////////////////////////////////////////////////

-	// IsShift

-	//////////////////////////////////////////////////////////////////////////

-	else if (strcmp(name, "IsShift") == 0) {

-		_scValue->setBool(_currentShift);

-		return _scValue;

-	}

-

-	//////////////////////////////////////////////////////////////////////////

-	// IsAlt

-	//////////////////////////////////////////////////////////////////////////

-	else if (strcmp(name, "IsAlt") == 0) {

-		_scValue->setBool(_currentAlt);

-		return _scValue;

-	}

-

-	//////////////////////////////////////////////////////////////////////////

-	// IsControl

-	//////////////////////////////////////////////////////////////////////////

-	else if (strcmp(name, "IsControl") == 0) {

-		_scValue->setBool(_currentControl);

-		return _scValue;

-	} else {

-		return BaseScriptable::scGetProperty(name);

-	}

-}

-

-

-//////////////////////////////////////////////////////////////////////////

-bool BaseKeyboardState::scSetProperty(const char *name, ScValue *value) {

-	/*

-	//////////////////////////////////////////////////////////////////////////

-	// Name

-	//////////////////////////////////////////////////////////////////////////

-	if (strcmp(name, "Name") == 0) {

-	    setName(value->getString());

-	    if (_renderer) SetWindowText(_renderer->_window, _name);

-	    return STATUS_OK;

-	}

-

-	else*/ return BaseScriptable::scSetProperty(name, value);

-}

-

-

-//////////////////////////////////////////////////////////////////////////

-const char *BaseKeyboardState::scToString() {

-	return "[keyboard state]";

-}

-

-

-//////////////////////////////////////////////////////////////////////////

-bool BaseKeyboardState::readKey(Common::Event *event) {

-	//_currentPrintable = (event->type == SDL_TEXTINPUT); // TODO

-	_currentCharCode = keyCodeToVKey(event);

-	if ((_currentCharCode <= Common::KEYCODE_z && _currentCharCode >= Common::KEYCODE_a) ||

-	        (_currentCharCode <= Common::KEYCODE_9 && _currentCharCode >= Common::KEYCODE_0) ||

-			(_currentCharCode == Common::KEYCODE_SPACE)) {

-		_currentPrintable = true;

-	} else {

-		_currentPrintable = false;

-	}

-	//_currentKeyData = KeyData;

-

-	_currentControl = isControlDown();

-	_currentAlt     = isAltDown();

-	_currentShift   = isShiftDown();

-

-	return STATUS_OK;

-}

-

-

-//////////////////////////////////////////////////////////////////////////

-bool BaseKeyboardState::persist(BasePersistenceManager *persistMgr) {

-	//if (!persistMgr->getIsSaving()) cleanup();

-	BaseScriptable::persist(persistMgr);

-

-	persistMgr->transfer(TMEMBER(_currentAlt));

-	persistMgr->transfer(TMEMBER(_currentCharCode));

-	persistMgr->transfer(TMEMBER(_currentControl));

-	persistMgr->transfer(TMEMBER(_currentKeyData));

-	persistMgr->transfer(TMEMBER(_currentPrintable));

-	persistMgr->transfer(TMEMBER(_currentShift));

-

-	if (!persistMgr->getIsSaving()) {

-		_keyStates = new uint8[323]; // Hardcoded size for the common/keyboard.h enum

-		for (int i = 0; i < 323; i++) {

-			_keyStates[i] = false;

-		}

-	}

-

-	return STATUS_OK;

-}

-

-//////////////////////////////////////////////////////////////////////////

-bool BaseKeyboardState::isShiftDown() {

-	int mod = g_system->getEventManager()->getModifierState();

-	return (mod & Common::KBD_SHIFT);

-}

-

-//////////////////////////////////////////////////////////////////////////

-bool BaseKeyboardState::isControlDown() {

-	int mod = g_system->getEventManager()->getModifierState();

-	return (mod & Common::KBD_CTRL);

-}

-

-//////////////////////////////////////////////////////////////////////////

-bool BaseKeyboardState::isAltDown() {

-	int mod = g_system->getEventManager()->getModifierState();

-	return (mod & Common::KBD_ALT);

-}

-

-//////////////////////////////////////////////////////////////////////////

-uint32 BaseKeyboardState::keyCodeToVKey(Common::Event *event) {

-	if (event->type != Common::EVENT_KEYDOWN) {

-		return 0;

-	}

-

-	switch (event->kbd.keycode) {

-	case Common::KEYCODE_KP_ENTER:

-		return Common::KEYCODE_RETURN;

-	default:

-		return (uint32)event->kbd.keycode;

-	}

-}

-

-enum VKeyCodes {

-	kVkSpace = 32,

-	kVkLeft  = 37,

-	kVkUp    = 38,

-	kVkRight = 39,

-	kVkDown  = 40

-};

-

-//////////////////////////////////////////////////////////////////////////

-Common::KeyCode BaseKeyboardState::vKeyToKeyCode(uint32 vkey) {

-	// todo

-	switch (vkey) {

-	case kVkSpace:

-		return Common::KEYCODE_SPACE;

-		break;

-	case kVkLeft:

-		return Common::KEYCODE_LEFT;

-		break;

-	case kVkRight:

-		return Common::KEYCODE_RIGHT;

-		break;

-	case kVkUp:

-		return Common::KEYCODE_UP;

-		break;

-	case kVkDown:

-		return Common::KEYCODE_DOWN;

-		break;

-	default:

-		warning("Unknown VKEY: %d", vkey);

-		return (Common::KeyCode)vkey;

-		break;

-	}

-

-}

-

-} // end of namespace Wintermute

+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+/*
+ * This file is based on WME Lite.
+ * http://dead-code.org/redir.php?target=wmelite
+ * Copyright (c) 2011 Jan Nedoma
+ */
+
+#include "engines/wintermute/base/base_keyboard_state.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "common/system.h"
+#include "common/keyboard.h"
+
+namespace Wintermute {
+
+IMPLEMENT_PERSISTENT(BaseKeyboardState, false)
+
+//////////////////////////////////////////////////////////////////////////
+BaseKeyboardState::BaseKeyboardState(BaseGame *inGame) : BaseScriptable(inGame) {
+	_currentPrintable = false;
+	_currentCharCode = 0;
+	_currentKeyData = 0;
+
+	_currentShift = false;
+	_currentAlt = false;
+	_currentControl = false;
+
+	_keyStates = new uint8[323]; // Hardcoded size for the common/keyboard.h enum
+	for (int i = 0; i < 323; i++) {
+		_keyStates[i] = false;
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////
+BaseKeyboardState::~BaseKeyboardState() {
+	delete[] _keyStates;
+}
+
+void BaseKeyboardState::handleKeyPress(Common::Event *event) {
+	if (event->type == Common::EVENT_KEYDOWN) {
+		_keyStates[event->kbd.keycode] = true;
+	}
+}
+
+void BaseKeyboardState::handleKeyRelease(Common::Event *event) {
+	if (event->type == Common::EVENT_KEYUP) {
+		_keyStates[event->kbd.keycode] = false;
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////
+// high level scripting interface
+//////////////////////////////////////////////////////////////////////////
+bool BaseKeyboardState::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) {
+	//////////////////////////////////////////////////////////////////////////
+	// IsKeyDown
+	//////////////////////////////////////////////////////////////////////////
+	if (strcmp(name, "IsKeyDown") == 0) {
+		stack->correctParams(1);
+		ScValue *val = stack->pop();
+		int vKey;
+
+		if (val->_type == VAL_STRING && strlen(val->getString()) > 0) {
+			const char *str = val->getString();
+			char temp = str[0];
+			if (temp >= 'A' && temp <= 'Z') {
+				temp += ('a' - 'A');
+			}
+			vKey = (int)temp;
+		} else {
+			vKey = val->getInt();
+		}
+
+		bool isDown = _keyStates[vKeyToKeyCode(vKey)];
+
+		stack->pushBool(isDown);
+		return STATUS_OK;
+	} else {
+		return BaseScriptable::scCallMethod(script, stack, thisStack, name);
+	}
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+ScValue *BaseKeyboardState::scGetProperty(const char *name) {
+	_scValue->setNULL();
+
+	//////////////////////////////////////////////////////////////////////////
+	// Type
+	//////////////////////////////////////////////////////////////////////////
+	if (strcmp(name, "Type") == 0) {
+		_scValue->setString("keyboard");
+		return _scValue;
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+	// Key
+	//////////////////////////////////////////////////////////////////////////
+	else if (strcmp(name, "Key") == 0) {
+		if (_currentPrintable) {
+			char key[2];
+			key[0] = (char)_currentCharCode;
+			key[1] = '\0';
+			_scValue->setString(key);
+		} else {
+			_scValue->setString("");
+		}
+
+		return _scValue;
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+	// Printable
+	//////////////////////////////////////////////////////////////////////////
+	else if (strcmp(name, "Printable") == 0) {
+		_scValue->setBool(_currentPrintable);
+		return _scValue;
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+	// KeyCode
+	//////////////////////////////////////////////////////////////////////////
+	else if (strcmp(name, "KeyCode") == 0) {
+		_scValue->setInt(_currentCharCode);
+		return _scValue;
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+	// IsShift
+	//////////////////////////////////////////////////////////////////////////
+	else if (strcmp(name, "IsShift") == 0) {
+		_scValue->setBool(_currentShift);
+		return _scValue;
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+	// IsAlt
+	//////////////////////////////////////////////////////////////////////////
+	else if (strcmp(name, "IsAlt") == 0) {
+		_scValue->setBool(_currentAlt);
+		return _scValue;
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+	// IsControl
+	//////////////////////////////////////////////////////////////////////////
+	else if (strcmp(name, "IsControl") == 0) {
+		_scValue->setBool(_currentControl);
+		return _scValue;
+	} else {
+		return BaseScriptable::scGetProperty(name);
+	}
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool BaseKeyboardState::scSetProperty(const char *name, ScValue *value) {
+	/*
+	//////////////////////////////////////////////////////////////////////////
+	// Name
+	//////////////////////////////////////////////////////////////////////////
+	if (strcmp(name, "Name") == 0) {
+	    setName(value->getString());
+	    if (_renderer) SetWindowText(_renderer->_window, _name);
+	    return STATUS_OK;
+	}
+
+	else*/ return BaseScriptable::scSetProperty(name, value);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+const char *BaseKeyboardState::scToString() {
+	return "[keyboard state]";
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool BaseKeyboardState::readKey(Common::Event *event) {
+	//_currentPrintable = (event->type == SDL_TEXTINPUT); // TODO
+	_currentCharCode = keyCodeToVKey(event);
+	if ((_currentCharCode <= Common::KEYCODE_z && _currentCharCode >= Common::KEYCODE_a) ||
+	        (_currentCharCode <= Common::KEYCODE_9 && _currentCharCode >= Common::KEYCODE_0) ||
+			(_currentCharCode == Common::KEYCODE_SPACE)) {
+		_currentPrintable = true;
+	} else {
+		_currentPrintable = false;
+	}
+	//_currentKeyData = KeyData;
+
+	_currentControl = isControlDown();
+	_currentAlt     = isAltDown();
+	_currentShift   = isShiftDown();
+
+	return STATUS_OK;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool BaseKeyboardState::persist(BasePersistenceManager *persistMgr) {
+	//if (!persistMgr->getIsSaving()) cleanup();
+	BaseScriptable::persist(persistMgr);
+
+	persistMgr->transfer(TMEMBER(_currentAlt));
+	persistMgr->transfer(TMEMBER(_currentCharCode));
+	persistMgr->transfer(TMEMBER(_currentControl));
+	persistMgr->transfer(TMEMBER(_currentKeyData));
+	persistMgr->transfer(TMEMBER(_currentPrintable));
+	persistMgr->transfer(TMEMBER(_currentShift));
+
+	if (!persistMgr->getIsSaving()) {
+		_keyStates = new uint8[323]; // Hardcoded size for the common/keyboard.h enum
+		for (int i = 0; i < 323; i++) {
+			_keyStates[i] = false;
+		}
+	}
+
+	return STATUS_OK;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool BaseKeyboardState::isShiftDown() {
+	int mod = g_system->getEventManager()->getModifierState();
+	return (mod & Common::KBD_SHIFT);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool BaseKeyboardState::isControlDown() {
+	int mod = g_system->getEventManager()->getModifierState();
+	return (mod & Common::KBD_CTRL);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool BaseKeyboardState::isAltDown() {
+	int mod = g_system->getEventManager()->getModifierState();
+	return (mod & Common::KBD_ALT);
+}
+
+//////////////////////////////////////////////////////////////////////////
+uint32 BaseKeyboardState::keyCodeToVKey(Common::Event *event) {
+	if (event->type != Common::EVENT_KEYDOWN) {
+		return 0;
+	}
+
+	switch (event->kbd.keycode) {
+	case Common::KEYCODE_KP_ENTER:
+		return Common::KEYCODE_RETURN;
+	default:
+		return (uint32)event->kbd.keycode;
+	}
+}
+
+enum VKeyCodes {
+	kVkSpace = 32,
+	kVkLeft  = 37,
+	kVkUp    = 38,
+	kVkRight = 39,
+	kVkDown  = 40
+};
+
+//////////////////////////////////////////////////////////////////////////
+Common::KeyCode BaseKeyboardState::vKeyToKeyCode(uint32 vkey) {
+	// todo
+	switch (vkey) {
+	case kVkSpace:
+		return Common::KEYCODE_SPACE;
+		break;
+	case kVkLeft:
+		return Common::KEYCODE_LEFT;
+		break;
+	case kVkRight:
+		return Common::KEYCODE_RIGHT;
+		break;
+	case kVkUp:
+		return Common::KEYCODE_UP;
+		break;
+	case kVkDown:
+		return Common::KEYCODE_DOWN;
+		break;
+	default:
+		warning("Unknown VKEY: %d", vkey);
+		return (Common::KeyCode)vkey;
+		break;
+	}
+
+}
+
+} // end of namespace Wintermute