mirror of
https://github.com/worldforge/cyphesis
synced 2026-08-13 12:26:04 -04:00
2ccfaadef3
* Substantial re-work of object model. Moved many attributes out of BaseEntity class. Changed WoldRouter so it now handles objects in terms of Entity, rather than BaseEntity. * Code cleanups, including removing reduntant includes, and getting rid of C style comments. * Fixed the way attributes are handled in Set operations and when merging from an Atlas::Message::Object. This fixed problem with setting gender of characters. * rulesets/Pedestrian.*, rulesets/Movement.*: Re-named Movement variables to make them clearer. Added in separate handling for collisions from moving to target position. Modified collision handling so objects can slide next to each other. * rulesets/Thing.cpp, rulesets/Character.cpp: Cleaned up and rationalised movement code. Much shorter, faster and more compact than before. * Made better use of iterators throughout, eliminating unnecessary lookups, and copying of data. * Moved all virtual functions out of header files, making less work for the linker. * Made more use of const references to avoid the need to copy data before being able to inspect it. Al Riddoch <alriddoch@zepler.org>
91 lines
2.9 KiB
C++
91 lines
2.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 "PythonThingScript.h"
|
|
|
|
#include "Python_API.h"
|
|
|
|
#include "Thing.h"
|
|
|
|
#include <server/WorldRouter.h>
|
|
#include <common/debug.h>
|
|
|
|
using Atlas::Objects::Operation::RootOperation;
|
|
|
|
static const bool debug_flag = false;
|
|
|
|
PythonThingScript::PythonThingScript(PyObject * o, Thing & t) :
|
|
PythonScript(o, t), thing(t)
|
|
{
|
|
}
|
|
|
|
PythonThingScript::~PythonThingScript()
|
|
{
|
|
}
|
|
|
|
bool PythonThingScript::Operation(const string& op_type,const RootOperation& op,
|
|
oplist & ret_list, RootOperation * sub_op)
|
|
{
|
|
if (scriptObject == NULL) {
|
|
debug( cout << "No script object asociated" << endl << flush;);
|
|
return false;
|
|
}
|
|
debug( cout << "Got script object for " << endl << flush;);
|
|
string op_name = op_type+"_operation";
|
|
// Construct apropriate python object thingies from op
|
|
if (!PyObject_HasAttrString(scriptObject, (char *)(op_name.c_str()))) {
|
|
debug( cout << "No method to be found for "
|
|
<< "." << op_name << endl << flush;);
|
|
return false;
|
|
}
|
|
RootOperationObject * py_op = newAtlasRootOperation(NULL);
|
|
py_op->operation = new RootOperation(op);
|
|
py_op->own = 0;
|
|
py_op->from = (Entity *)thing.world->getObject(op.GetFrom());
|
|
py_op->to = (Entity *)thing.world->getObject(op.GetTo());
|
|
PyObject * ret;
|
|
ret = PyObject_CallMethod(scriptObject, (char *)(op_name.c_str()),
|
|
"(O)", py_op);
|
|
delete py_op->operation;
|
|
Py_DECREF(py_op);
|
|
if (ret != NULL) {
|
|
debug( cout << "Called python method " << op_name
|
|
<< " for object " << endl << flush;);
|
|
if (PyOperation_Check(ret)) {
|
|
RootOperationObject * op = (RootOperationObject*)ret;
|
|
if (op->operation != NULL) {
|
|
ret_list.push_back(op->operation);
|
|
op->own = 0;
|
|
} else {
|
|
debug( cout << "Method returned invalid operation"
|
|
<< endl << flush;);
|
|
}
|
|
} else if (PyOplist_Check(ret)) {
|
|
OplistObject * op = (OplistObject*)ret;
|
|
if (op->ops != NULL) {
|
|
ret_list = *op->ops;
|
|
} else {
|
|
debug( cout << "Method returned invalid oplist"
|
|
<< endl << flush;);
|
|
}
|
|
} else {
|
|
debug( cout << "Method returned invalid object" << endl << flush;);
|
|
}
|
|
|
|
Py_DECREF(ret);
|
|
return true;
|
|
} else {
|
|
if (PyErr_Occurred() == NULL) {
|
|
debug( cout << "No method to be found for " << endl << flush;);
|
|
} else {
|
|
cerr << "Reporting python error for " << endl << flush;
|
|
PyErr_Print();
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void PythonThingScript::hook(const string &, Entity *)
|
|
{
|
|
}
|