2007-11-23 Al Riddoch <alriddoch@zepler.org>

* rulesets/Script.h, rulesets/Script.cpp,
	  rulesets/PythonThingScript.h, rulesets/PythonThingScript.cpp,
	  rulesets/PythonMindScript.h, rulesets/PythonMindScript.cpp:
	  Modify the script interface so it now only handles one operation.

	* rulesets/BaseMind.cpp: Pass in the sub operation only for
	  sight and sound of other operations.

	* rulesets/basic/mind/NPCMind.py,
	  rulesets/basic/mind/goals/humanoid/transaction.py: Adapt the mind
	  and goal code so it only requires one operation.
This commit is contained in:
Al Riddoch 2007-11-23 16:06:52 +00:00
parent 0d46ceffd2
commit f557abbe13
11 changed files with 81 additions and 80 deletions

View file

@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software Foundation,
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
// $Id: PythonThingScript.cpp,v 1.36 2007-07-29 03:33:34 alriddoch Exp $
// $Id: PythonThingScript.cpp,v 1.37 2007-11-23 16:06:53 alriddoch Exp $
#include "PythonThingScript.h"
@ -44,8 +44,7 @@ PythonEntityScript::~PythonEntityScript()
bool PythonEntityScript::operation(const std::string & opname,
const Operation & op,
OpVector & res,
const Operation * sub_op)
OpVector & res)
{
assert(scriptObject != NULL);
std::string op_name = opname + "_operation";