mirror of
https://github.com/worldforge/cyphesis
synced 2026-08-13 12:26:04 -04:00
b584b32964
* client/Py_CreatorClient.cpp, client/Py_CreatorClient.h, rulesets/Py_BBox.cpp, rulesets/Py_BBox.h, rulesets/Py_Location.cpp, rulesets/Py_Location.h, rulesets/Py_Map.cpp, rulesets/Py_Map.h, rulesets/Py_Mind.cpp, rulesets/Py_Mind.h, rulesets/Py_Object.cpp, rulesets/Py_Object.h, rulesets/Py_Operation.cpp, rulesets/Py_Operation.h, rulesets/Py_Oplist.cpp, rulesets/Py_Oplist.h, rulesets/Py_Optime.cpp, rulesets/Py_Optime.h, rulesets/Py_Quaternion.cpp, rulesets/Py_Quaternion.h, rulesets/Py_Thing.cpp, rulesets/Py_Thing.h, rulesets/Py_Vector3D.cpp, rulesets/Py_Vector3D.h, rulesets/Py_World.cpp, rulesets/Py_World.h, rulesets/Py_WorldTime.cpp, rulesets/Py_WorldTime.h, rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp, rulesets/Python_API.cpp: Clean up python API code, with decent names for types, decent error reporting, and making the more paranoid checks only present in debug build. * common/BaseEntity.cpp, common/BaseEntity.h, server/Account.cpp: Remove pointless method setRefnoOp, and put it in the body as an inline method. * common/BaseEntity.h, common/BaseWorld.cpp, common/Setup.h, common/Tick.h, common/operations.h, common/custom.cpp, common/types.h, common/utility.cpp, common/utility.h, modules/Location.h, physics/Vector3D.h, rulesets/BaseMind.cpp, rulesets/Script.h, server/EntityFactory.h: Clean up the dependency trees using more forward declarations. * common/inheritance.cpp, common/inheritance.h: Move most of the implementation into the .cpp file as its not suited to inlining. * rulesets/MemMap.cpp, rulesets/MemMap.h, rulesets/MemMap_methods.h: Move contents of MemMap_methods.h into the .cpp file, as it is not suited to inlining, and remove the file from the build.
112 lines
3.9 KiB
C++
112 lines
3.9 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 "PythonMindScript.h"
|
|
|
|
#include "Py_Operation.h"
|
|
#include "Py_Oplist.h"
|
|
#include "Py_Thing.h"
|
|
|
|
#include "Entity.h"
|
|
#include "BaseMind.h"
|
|
#include "MemMap.h"
|
|
|
|
#include "common/log.h"
|
|
#include "common/debug.h"
|
|
|
|
#include <Atlas/Objects/Operation/RootOperation.h>
|
|
|
|
static const bool debug_flag = false;
|
|
|
|
PythonMindScript::PythonMindScript(PyObject * o, BaseMind & m) :
|
|
PythonScript(o, m), mind(m)
|
|
{
|
|
}
|
|
|
|
PythonMindScript::~PythonMindScript()
|
|
{
|
|
}
|
|
|
|
bool PythonMindScript::Operation(const std::string & op_type,
|
|
const RootOperation & op,
|
|
OpVector & ret_list, RootOperation * sub_op)
|
|
{
|
|
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 found for " << op_name << std::endl
|
|
<< std::flush;);
|
|
return false;
|
|
}
|
|
PyConstOperation * py_op = newPyConstOperation();
|
|
py_op->operation = &op;
|
|
py_op->own = 0;
|
|
py_op->from = mind.m_map.getAdd(op.getFrom());
|
|
py_op->to = mind.m_map.getAdd(op.getTo());
|
|
PyObject * ret;
|
|
if (sub_op == NULL) {
|
|
ret = PyObject_CallMethod(scriptObject, (char *)(op_name.c_str()),
|
|
"(O)", py_op);
|
|
} else {
|
|
PyOperation * py_sub_op = newPyOperation();
|
|
py_sub_op->operation = sub_op;
|
|
py_sub_op->own = 0;
|
|
py_sub_op->from = mind.m_map.getAdd(sub_op->getFrom());
|
|
py_sub_op->to = mind.m_map.getAdd(sub_op->getTo());
|
|
ret = PyObject_CallMethod(scriptObject, (char *)(op_name.c_str()),
|
|
"(OO)", py_op, py_sub_op);
|
|
Py_DECREF(py_sub_op);
|
|
}
|
|
Py_DECREF(py_op);
|
|
if (ret != NULL) {
|
|
debug( std::cout << "Called python method " << op_name << std::endl
|
|
<< std::flush;);
|
|
if (PyOperation_Check(ret)) {
|
|
PyOperation * op = (PyOperation*)ret;
|
|
if (op->operation != NULL) {
|
|
ret_list.push_back(op->operation);
|
|
op->own = 0;
|
|
} else {
|
|
debug( std::cout << "Method returned invalid op" << std::endl
|
|
<< std::flush;);
|
|
}
|
|
} else if (PyOplist_Check(ret)) {
|
|
PyOplist * op = (PyOplist*)ret;
|
|
if (op->ops != NULL) {
|
|
ret_list = *op->ops;
|
|
} 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();
|
|
if (op_type == "tick") {
|
|
std::string msg = std::string("Mind script for ") + mind.getId() + ", named " + mind.getName() + " has reported an error processing a tick operation. This NPC is probably now inactive.";
|
|
log(ERROR, msg.c_str());
|
|
}
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void PythonMindScript::hook(const std::string & method, Entity * object)
|
|
{
|
|
PyEntity * obj = newPyEntity();
|
|
obj->m_entity = object;
|
|
PyObject * ret = PyObject_CallMethod(scriptObject, (char *)(method.c_str()), "(O)", obj);
|
|
Py_DECREF(ret);
|
|
Py_DECREF(obj);
|
|
}
|