mirror of
https://github.com/worldforge/cyphesis
synced 2026-08-13 12:26:04 -04:00
* common/inheritance.cpp, common/inheritance.h: Added code to store
atlas object inheritance tree. * server/Connection.cpp: Added code to allow client to query atlas object inheritance using get ops. * example/client/InheritanceClient.*: Added example client which queries the inheritance tree of the server. * rulesets/MemMap.h, rulesets/Py_Map.cpp: Made hooks lists private, and added methods to access them. * server/Account.cpp, server/Lobby.h: Added correct handling of OOG look ops when looking at own characters, other accounts, or the lobby. * server/ServerRouting.h: Added function to generate serial numbers for operations. * server/WorldRouter.cpp: Assign genuine serial number to all in game operations as they are pulled off the queue. * Cleaned up header file multiple inclusion checks for uniqueness, and made sure of ISO compliant use of std::string. Al Riddoch <alriddoch@zepler.org>
This commit is contained in:
parent
bae6175e99
commit
3969bffbfe
129 changed files with 1187 additions and 481 deletions
|
|
@ -23,11 +23,12 @@ PythonMindScript::~PythonMindScript()
|
|||
{
|
||||
}
|
||||
|
||||
bool PythonMindScript::Operation(const string& op_type, const RootOperation& op,
|
||||
oplist & ret_list, RootOperation * sub_op)
|
||||
bool PythonMindScript::Operation(const std::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";
|
||||
std::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;);
|
||||
|
|
@ -88,7 +89,7 @@ bool PythonMindScript::Operation(const string& op_type, const RootOperation& op,
|
|||
return false;
|
||||
}
|
||||
|
||||
void PythonMindScript::hook(const string & method, Entity * object)
|
||||
void PythonMindScript::hook(const std::string & method, Entity * object)
|
||||
{
|
||||
ThingObject * obj = newThingObject(NULL);
|
||||
obj->m_thing = object;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue