mmo-ref/cyphesis
1
0
Fork 0
mirror of https://github.com/worldforge/cyphesis synced 2026-08-13 12:26:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

* Complete re-write of python script interface to allow other

Browse source 
script types to be cleanly dropped in.

	* Re-work on server and communication related classes to use
	  references where they are apropriate. Code is now much more
	  robust.

	* Huge cleanup of header files removing redundant includes.

	* server/WorldRouter.h: Removed is_object_deleted because it
	  is broken and not used.

	* server/Connection.h: Removed unused disconnect() methods.

	* rulesets/Entity.*: Added new in game base class from which
	  all mind and object classes are derived. This removes
	  clutter of Thing class from mind classes.

	* aiclient/*: Progress with creating AI client for mind handling.

	* common/globals.*: Moved some globals out of server specific files.

	* rulesets/Makefile.am: Separated rulesets code into 3 almost stand
	  alone packages; entities, mind and python interface code.


Acorn may well not work now, but I would apreciate it if people could
test the code on their setups. Lots of code has changed, and almost
everything is now cleaner.

Al Riddoch  <alriddoch@zepler.org>
This commit is contained in:
Al Riddoch 2001-04-10 19:05:14 +00:00
parent 81199e0049
commit 488f35b52f
71 changed files with 1302 additions and 474 deletions
Download patch file Download diff file Expand all files Collapse all files

91
rulesets/PythonThingScript.cpp Normal file
View file

@ -0,0 +1,91 @@
// This file may be redistributed and modified only under the terms of
// the GNU General Public License (See COPYING for details).
// Copyright (C) 2000 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 (script_object == 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(script_object, (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->get_object(op.GetFrom());
py_op->to = (Entity *)thing.world->get_object(op.GetTo());
PyObject * ret;
ret = PyObject_CallMethod(script_object, (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 *)
{
}