mirror of
https://github.com/worldforge/cyphesis
synced 2026-08-13 12:26:04 -04:00
d5637bacef
* rulesets/Py_Operation.h, rulesets/Py_Operation.cpp: Remove reference ownership flag, and from and to pointers from the python operation structure. * rulesets/Py_Map.cpp, rulesets/Py_Oplist.cpp, rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp, rulesets/Python_API.cpp: Remove all usage of own, from and to. * rulesets/basic/mind/NPCMind.py, rulesets/basic/mind/goals/common/misc_goal.py, rulesets/basic/mind/goals/humanoid/mason.py, rulesets/basic/mind/goals/humanoid/transaction.py, rulesets/mason/world/objects/clothing/Garment.py, rulesets/mason/world/objects/plants/seeds/Acorn.py, rulesets/mason/world/objects/plants/seeds/Apple.py, rulesets/mason/world/objects/plants/seeds/Fircone.py, rulesets/mason/world/objects/tools/Bucksaw.py, rulesets/mason/world/objects/tools/Cleaver.py, rulesets/mason/world/objects/tools/Trowel.py: Modify all scripts so they expect from and to of ops to be an ID string rather than an entity.
96 lines
3.2 KiB
C++
96 lines
3.2 KiB
C++
// This file may be redistributed and modified only under the terms of
|
|
// the GNU General Public License (See COPYING for details).
|
|
// Copyright (C) 2000,2001 Alistair Riddoch
|
|
|
|
#include "PythonThingScript.h"
|
|
|
|
#include "Py_Operation.h"
|
|
#include "Py_Oplist.h"
|
|
|
|
#include "Entity.h"
|
|
|
|
#include "common/log.h"
|
|
#include "common/debug.h"
|
|
|
|
#include <Atlas/Objects/RootOperation.h>
|
|
|
|
static const bool debug_flag = false;
|
|
|
|
PythonEntityScript::PythonEntityScript(PyObject * o, Entity & t) :
|
|
PythonScript(o, t), m_entity(t)
|
|
{
|
|
}
|
|
|
|
PythonEntityScript::~PythonEntityScript()
|
|
{
|
|
}
|
|
|
|
bool PythonEntityScript::Operation(const std::string & op_type,
|
|
const Atlas::Objects::Operation::RootOperation & op,
|
|
OpVector & ret_list,
|
|
Atlas::Objects::Operation::RootOperation * sub_op)
|
|
{
|
|
if (scriptObject == NULL) {
|
|
debug( std::cout << "No script object asociated" << std::endl
|
|
<< std::flush;);
|
|
return false;
|
|
}
|
|
debug( std::cout << "Got script object for " << std::endl << std::flush;);
|
|
std::string op_name = op_type+"_operation";
|
|
// Construct apropriate python object thingies from op
|
|
if (!PyObject_HasAttrString(scriptObject, (char *)(op_name.c_str()))) {
|
|
debug( std::cout << "No method to be found for "
|
|
<< "." << op_name << std::endl << std::flush;);
|
|
return false;
|
|
}
|
|
PyConstOperation * py_op = newPyConstOperation();
|
|
py_op->operation = op;
|
|
PyObject * ret;
|
|
ret = PyObject_CallMethod(scriptObject, (char *)(op_name.c_str()),
|
|
"(O)", py_op);
|
|
Py_DECREF(py_op);
|
|
if (ret != NULL) {
|
|
debug( std::cout << "Called python method " << op_name
|
|
<< " for object " << std::endl << std::flush;);
|
|
if (PyOperation_Check(ret)) {
|
|
PyOperation * op = (PyOperation*)ret;
|
|
if (!op->operation.isValid()) {
|
|
ret_list.push_back(op->operation);
|
|
} else {
|
|
debug( std::cout << "Method returned invalid operation"
|
|
<< std::endl << std::flush;);
|
|
}
|
|
} else if (PyOplist_Check(ret)) {
|
|
PyOplist * op = (PyOplist*)ret;
|
|
if (op->ops != NULL) {
|
|
const OpVector & o = *op->ops;
|
|
OpVector::const_iterator Iend = o.end();
|
|
for (OpVector::const_iterator I = o.begin(); I != Iend; ++I) {
|
|
ret_list.push_back(*I);
|
|
}
|
|
} else {
|
|
debug( std::cout << "Method returned invalid OpVector"
|
|
<< std::endl << std::flush;);
|
|
}
|
|
} else {
|
|
debug( std::cout << "Method returned invalid object" << std::endl
|
|
<< std::flush;);
|
|
}
|
|
|
|
Py_DECREF(ret);
|
|
return true;
|
|
} else {
|
|
if (PyErr_Occurred() == NULL) {
|
|
debug( std::cout << "No method to be found for " << std::endl
|
|
<< std::flush;);
|
|
} else {
|
|
log(ERROR, "Reporting python error");
|
|
PyErr_Print();
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void PythonEntityScript::hook(const std::string &, Entity *)
|
|
{
|
|
}
|