Merge branch 'master' of github.com:scummvm/scummvm into mortevielle

Conflicts:
	base/plugins.cpp
	configure

1 files changed, 76 insertions, 0 deletions

diff --git a/engines/wintermute/base/base_script_holder.h b/engines/wintermute/base/base_script_holder.h
new file mode 100644
index 0000000000..5fd0dbec9c
--- /dev/null
+++ b/engines/wintermute/base/base_script_holder.h
@@ -0,0 +1,76 @@
+/* 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
+ */
+
+#ifndef WINTERMUTE_BASE_SCRIPTHOLDER_H
+#define WINTERMUTE_BASE_SCRIPTHOLDER_H
+
+#include "engines/wintermute/coll_templ.h"
+#include "engines/wintermute/persistent.h"
+#include "engines/wintermute/base/base_scriptable.h"
+
+namespace Wintermute {
+
+class BaseScriptHolder : public BaseScriptable {
+public:
+	DECLARE_PERSISTENT(BaseScriptHolder, BaseScriptable)
+
+	BaseScriptHolder(BaseGame *inGame);
+	virtual ~BaseScriptHolder();
+	virtual ScScript *invokeMethodThread(const char *methodName);
+	virtual void makeFreezable(bool freezable);
+	bool canHandleEvent(const char *eventName);
+	virtual bool canHandleMethod(const char *eventMethod);
+	bool cleanup();
+	bool removeScript(ScScript *script);
+	bool addScript(const char *filename);
+	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent);
+	virtual bool listen(BaseScriptHolder *param1, uint32 param2);
+	bool applyEvent(const char *eventName, bool unbreakable = false);
+	void setFilename(const char *filename);
+	const char *getFilename() { return _filename; }
+	bool parseProperty(byte *buffer, bool complete = true);
+	bool _freezable;
+	bool _ready;
+
+	BaseArray<ScScript *> _scripts;
+	// scripting interface
+	virtual ScValue *scGetProperty(const Common::String &name);
+	virtual bool scSetProperty(const char *name, ScValue *value);
+	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);
+	virtual const char *scToString();
+	virtual void scDebuggerDesc(char *buf, int bufSize);
+	// IWmeObject
+private:
+	char *_filename;
+public:
+	virtual bool sendEvent(const char *eventName);
+};
+
+} // end of namespace Wintermute
+
+#endif