mirror of
https://github.com/worldforge/cyphesis
synced 2026-08-13 12:26:04 -04:00
1d0f77d4b5
make server operation customisable. Added comments. * server/server.cpp, server/CommServer.h: Changed methods which return int to returning bool if they are success/faul results. * server/WorldRouter.cpp: Removed some unused debugging code. Optimised heavily used code. Changed error message on sending to a non-existant entity so that it is no longer reported as a critical error. * server/ServerRouting.h, server/Connection.h, server/Connection_methods.h: inlined simple methods. * server/Connection.cpp: Optimised frequently used code. * server/CommClient.h: Simplified read method so it no longer checks status redundantly. * common/BaseEntity.h, rulesets/Thing.h, rulesets/Entity.h: Added comments explaing purpose of classes. * rulesets/Thing.cpp: Added detailed comments, and removed unnecessary initialisation of some attributes. * rulesets/PythonMindScript.cpp: Removed redundant NULL check. * rulesets/MemMap.h: Added inlines for inlined methods. * rulesets/Entity.h, common/BaseEntity.h: Moved seq from BaseEntity to Entity as it does not apply to Out Of Game objects. * rulesets/Entity.cpp: Added in stamp/seq attribute. Nade name attribute optional. * rulesets/Character.cpp: Simplified some op handling code to make it more readable and hopefully faster. Added comments explaining movement, removed unused commented out code, and removed some unnecessary debugging code. * common/operations.h: Explanatory comments. * common/*.h: Re-wrote extended operations to fit in with Atlas-C++ 0.4.2 conventions. * common/log.*: Commented out unused logging code. Al Riddoch <alriddoch@zepler.org> This code will no longer build against the last release of Atlas-C++ 0.4 Please use cvs Atlas-C++ stable branch.
97 lines
3.2 KiB
C++
97 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 "PythonMindScript.h"
|
|
|
|
#include "Python_API.h"
|
|
|
|
#include <common/debug.h>
|
|
|
|
#include "Entity.h"
|
|
#include "BaseMind.h"
|
|
#include "MemMap_methods.h"
|
|
|
|
using Atlas::Objects::Operation::RootOperation;
|
|
|
|
PythonMindScript::PythonMindScript(PyObject * o, BaseMind & m) :
|
|
PythonScript(o, m), mind(m)
|
|
{
|
|
}
|
|
|
|
PythonMindScript::~PythonMindScript()
|
|
{
|
|
}
|
|
|
|
bool PythonMindScript::Operation(const string& op_type, const RootOperation& op,
|
|
oplist & ret_list, RootOperation * sub_op)
|
|
{
|
|
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 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 = mind.map.getAdd(op.GetFrom());
|
|
py_op->to = mind.map.getAdd(op.GetTo());
|
|
PyObject * ret;
|
|
if (sub_op == NULL) {
|
|
ret = PyObject_CallMethod(scriptObject, (char *)(op_name.c_str()),
|
|
"(O)", py_op);
|
|
} else {
|
|
RootOperationObject * py_sub_op = newAtlasRootOperation(NULL);
|
|
py_sub_op->operation = sub_op;
|
|
py_sub_op->own = 0;
|
|
py_sub_op->from = mind.map.getAdd(sub_op->GetFrom());
|
|
py_sub_op->to = mind.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);
|
|
}
|
|
delete py_op->operation;
|
|
Py_DECREF(py_op);
|
|
if (ret != NULL) {
|
|
debug( cout << "Called python method " << op_name << 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 op" << 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 PythonMindScript::hook(const string & method, Entity * object)
|
|
{
|
|
ThingObject * obj = newThingObject(NULL);
|
|
obj->m_thing = object;
|
|
PyObject_CallMethod(scriptObject, (char *)(method.c_str()), "(O)", obj);
|
|
Py_DECREF(obj);
|
|
}
|