1 files changed, 252 insertions, 252 deletions
diff --git a/engines/wintermute/base/scriptables/script_ext_array.cpp b/engines/wintermute/base/scriptables/script_ext_array.cpp
index c8d4f64ae9..5ed07f0da6 100644
--- a/engines/wintermute/base/scriptables/script_ext_array.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_array.cpp
@@ -1,252 +1,252 @@
-/* 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/persistent.h"
-#include "engines/wintermute/base/scriptables/script_value.h"
-#include "engines/wintermute/base/scriptables/script_stack.h"
-#include "engines/wintermute/system/sys_instance.h"
-#include "engines/wintermute/base/scriptables/script_ext_array.h"
-
-namespace Wintermute {
-
-IMPLEMENT_PERSISTENT(SXArray, false)
-
-BaseScriptable *makeSXArray(BaseGame *inGame, ScStack *stack) {
-	return new SXArray(inGame, stack);
-}
-
-//////////////////////////////////////////////////////////////////////////
-SXArray::SXArray(BaseGame *inGame, ScStack *stack) : BaseScriptable(inGame) {
-	_length = 0;
-	_values = new ScValue(_gameRef);
-
-	int numParams = stack->pop()->getInt(0);
-
-	if (numParams == 1) {
-		_length = stack->pop()->getInt(0);
-	} else if (numParams > 1) {
-		_length = numParams;
-		char paramName[20];
-		for (int i = 0; i < numParams; i++) {
-			sprintf(paramName, "%d", i);
-			_values->setProp(paramName, stack->pop());
-		}
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////
-SXArray::SXArray(BaseGame *inGame) : BaseScriptable(inGame) {
-	_length = 0;
-	_values = new ScValue(_gameRef);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-SXArray::~SXArray() {
-	delete _values;
-	_values = NULL;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-const char *SXArray::scToString() {
-	char dummy[32768];
-	strcpy(dummy, "");
-	char propName[20];
-	for (int i = 0; i < _length; i++) {
-		sprintf(propName, "%d", i);
-		ScValue *val = _values->getProp(propName);
-		if (val) {
-			if (strlen(dummy) + strlen(val->getString()) < 32768) {
-				strcat(dummy, val->getString());
-			}
-		}
-
-		if (i < _length - 1 && strlen(dummy) + 1 < 32768) {
-			strcat(dummy, ",");
-		}
-	}
-	_strRep = dummy;
-	return _strRep.c_str();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool SXArray::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) {
-	//////////////////////////////////////////////////////////////////////////
-	// Push
-	//////////////////////////////////////////////////////////////////////////
-	if (strcmp(name, "Push") == 0) {
-		int numParams = stack->pop()->getInt(0);
-		char paramName[20];
-
-		for (int i = 0; i < numParams; i++) {
-			_length++;
-			sprintf(paramName, "%d", _length - 1);
-			_values->setProp(paramName, stack->pop(), true);
-		}
-		stack->pushInt(_length);
-
-		return STATUS_OK;
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// Pop
-	//////////////////////////////////////////////////////////////////////////
-	if (strcmp(name, "Pop") == 0) {
-
-		stack->correctParams(0);
-
-		if (_length > 0) {
-			char paramName[20];
-			sprintf(paramName, "%d", _length - 1);
-			stack->push(_values->getProp(paramName));
-			_values->deleteProp(paramName);
-			_length--;
-		} else {
-			stack->pushNULL();
-		}
-
-		return STATUS_OK;
-	} else {
-		return STATUS_FAILED;
-	}
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-ScValue *SXArray::scGetProperty(const char *name) {
-	_scValue->setNULL();
-
-	//////////////////////////////////////////////////////////////////////////
-	// Type
-	//////////////////////////////////////////////////////////////////////////
-	if (strcmp(name, "Type") == 0) {
-		_scValue->setString("array");
-		return _scValue;
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// Length
-	//////////////////////////////////////////////////////////////////////////
-	else if (strcmp(name, "Length") == 0) {
-		_scValue->setInt(_length);
-		return _scValue;
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// [number]
-	//////////////////////////////////////////////////////////////////////////
-	else {
-		char paramName[20];
-		if (validNumber(name, paramName)) {
-			return _values->getProp(paramName);
-		} else {
-			return _scValue;
-		}
-	}
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool SXArray::scSetProperty(const char *name, ScValue *value) {
-	//////////////////////////////////////////////////////////////////////////
-	// Length
-	//////////////////////////////////////////////////////////////////////////
-	if (strcmp(name, "Length") == 0) {
-		int origLength = _length;
-		_length = MAX(value->getInt(0), 0);
-
-		char propName[20];
-		if (_length < origLength) {
-			for (int i = _length; i < origLength; i++) {
-				sprintf(propName, "%d", i);
-				_values->deleteProp(propName);
-			}
-		}
-		return STATUS_OK;
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// [number]
-	//////////////////////////////////////////////////////////////////////////
-	else {
-		char paramName[20];
-		if (validNumber(name, paramName)) {
-			int index = atoi(paramName);
-			if (index >= _length) {
-				_length = index + 1;
-			}
-			return _values->setProp(paramName, value);
-		} else {
-			return STATUS_FAILED;
-		}
-	}
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool SXArray::persist(BasePersistenceManager *persistMgr) {
-	BaseScriptable::persist(persistMgr);
-
-	persistMgr->transfer(TMEMBER(_length));
-	persistMgr->transfer(TMEMBER(_values));
-
-	return STATUS_OK;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool SXArray::validNumber(const char *origStr, char *outStr) {
-	bool isNumber = true;
-	for (uint32 i = 0; i < strlen(origStr); i++) {
-		if (!(origStr[i] >= '0' && origStr[i] <= '9')) {
-			isNumber = false;
-			break;
-		}
-	}
-
-	if (isNumber) {
-		int index = atoi(origStr);
-		sprintf(outStr, "%d", index);
-		return true;
-	} else {
-		return false;
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool SXArray::push(ScValue *val) {
-	char paramName[20];
-	_length++;
-	sprintf(paramName, "%d", _length - 1);
-	_values->setProp(paramName, val, true);
-	return STATUS_OK;
-}
-
-} // 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/persistent.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/system/sys_instance.h"
+#include "engines/wintermute/base/scriptables/script_ext_array.h"
+
+namespace Wintermute {
+
+IMPLEMENT_PERSISTENT(SXArray, false)
+
+BaseScriptable *makeSXArray(BaseGame *inGame, ScStack *stack) {
+	return new SXArray(inGame, stack);
+}
+
+//////////////////////////////////////////////////////////////////////////
+SXArray::SXArray(BaseGame *inGame, ScStack *stack) : BaseScriptable(inGame) {
+	_length = 0;
+	_values = new ScValue(_gameRef);
+
+	int numParams = stack->pop()->getInt(0);
+
+	if (numParams == 1) {
+		_length = stack->pop()->getInt(0);
+	} else if (numParams > 1) {
+		_length = numParams;
+		char paramName[20];
+		for (int i = 0; i < numParams; i++) {
+			sprintf(paramName, "%d", i);
+			_values->setProp(paramName, stack->pop());
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////
+SXArray::SXArray(BaseGame *inGame) : BaseScriptable(inGame) {
+	_length = 0;
+	_values = new ScValue(_gameRef);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+SXArray::~SXArray() {
+	delete _values;
+	_values = NULL;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+const char *SXArray::scToString() {
+	char dummy[32768];
+	strcpy(dummy, "");
+	char propName[20];
+	for (int i = 0; i < _length; i++) {
+		sprintf(propName, "%d", i);
+		ScValue *val = _values->getProp(propName);
+		if (val) {
+			if (strlen(dummy) + strlen(val->getString()) < 32768) {
+				strcat(dummy, val->getString());
+			}
+		}
+
+		if (i < _length - 1 && strlen(dummy) + 1 < 32768) {
+			strcat(dummy, ",");
+		}
+	}
+	_strRep = dummy;
+	return _strRep.c_str();
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool SXArray::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) {
+	//////////////////////////////////////////////////////////////////////////
+	// Push
+	//////////////////////////////////////////////////////////////////////////
+	if (strcmp(name, "Push") == 0) {
+		int numParams = stack->pop()->getInt(0);
+		char paramName[20];
+
+		for (int i = 0; i < numParams; i++) {
+			_length++;
+			sprintf(paramName, "%d", _length - 1);
+			_values->setProp(paramName, stack->pop(), true);
+		}
+		stack->pushInt(_length);
+
+		return STATUS_OK;
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+	// Pop
+	//////////////////////////////////////////////////////////////////////////
+	if (strcmp(name, "Pop") == 0) {
+
+		stack->correctParams(0);
+
+		if (_length > 0) {
+			char paramName[20];
+			sprintf(paramName, "%d", _length - 1);
+			stack->push(_values->getProp(paramName));
+			_values->deleteProp(paramName);
+			_length--;
+		} else {
+			stack->pushNULL();
+		}
+
+		return STATUS_OK;
+	} else {
+		return STATUS_FAILED;
+	}
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+ScValue *SXArray::scGetProperty(const char *name) {
+	_scValue->setNULL();
+
+	//////////////////////////////////////////////////////////////////////////
+	// Type
+	//////////////////////////////////////////////////////////////////////////
+	if (strcmp(name, "Type") == 0) {
+		_scValue->setString("array");
+		return _scValue;
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+	// Length
+	//////////////////////////////////////////////////////////////////////////
+	else if (strcmp(name, "Length") == 0) {
+		_scValue->setInt(_length);
+		return _scValue;
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+	// [number]
+	//////////////////////////////////////////////////////////////////////////
+	else {
+		char paramName[20];
+		if (validNumber(name, paramName)) {
+			return _values->getProp(paramName);
+		} else {
+			return _scValue;
+		}
+	}
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool SXArray::scSetProperty(const char *name, ScValue *value) {
+	//////////////////////////////////////////////////////////////////////////
+	// Length
+	//////////////////////////////////////////////////////////////////////////
+	if (strcmp(name, "Length") == 0) {
+		int origLength = _length;
+		_length = MAX(value->getInt(0), 0);
+
+		char propName[20];
+		if (_length < origLength) {
+			for (int i = _length; i < origLength; i++) {
+				sprintf(propName, "%d", i);
+				_values->deleteProp(propName);
+			}
+		}
+		return STATUS_OK;
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+	// [number]
+	//////////////////////////////////////////////////////////////////////////
+	else {
+		char paramName[20];
+		if (validNumber(name, paramName)) {
+			int index = atoi(paramName);
+			if (index >= _length) {
+				_length = index + 1;
+			}
+			return _values->setProp(paramName, value);
+		} else {
+			return STATUS_FAILED;
+		}
+	}
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool SXArray::persist(BasePersistenceManager *persistMgr) {
+	BaseScriptable::persist(persistMgr);
+
+	persistMgr->transfer(TMEMBER(_length));
+	persistMgr->transfer(TMEMBER(_values));
+
+	return STATUS_OK;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool SXArray::validNumber(const char *origStr, char *outStr) {
+	bool isNumber = true;
+	for (uint32 i = 0; i < strlen(origStr); i++) {
+		if (!(origStr[i] >= '0' && origStr[i] <= '9')) {
+			isNumber = false;
+			break;
+		}
+	}
+
+	if (isNumber) {
+		int index = atoi(origStr);
+		sprintf(outStr, "%d", index);
+		return true;
+	} else {
+		return false;
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool SXArray::push(ScValue *val) {
+	char paramName[20];
+	_length++;
+	sprintf(paramName, "%d", _length - 1);
+	_values->setProp(paramName, val, true);
+	return STATUS_OK;
+}
+
+} // end of namespace Wintermute