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

Hackish fix for inheritance.

Browse source 
Character should inherit from Entity/Thing, but doesn't really in the
Python class hierarchy. We'll fudge it anyways.
This commit is contained in:
Erik Ogenvik 2018-07-29 19:56:45 +02:00
parent d1ebd44e01
commit a4e29323a4
4 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rulesets/python/CyPy_Server.cpp
View file

@ -49,8 +49,8 @@ CyPy_Server::CyPy_Server() : ExtensionModule("server")
Py::Dict d(moduleDictionary());
//d["LocatedEntity"] = CyPy_LocatedEntity::type();
d["Character"] = CyPy_Character::type();
d["Entity"] = CyPy_Entity::type();
//FIXME: Remove "Thing"
// d["Entity"] = CyPy_Entity::type();
//FIXME: Make CyPy_Entity wrap Thing. And in the process also combine Thing and Entity (no reason to separate them)
d["Thing"] = CyPy_Entity::type();
d["Mind"] = CyPy_BaseMind::type();
d["MemEntity"] = CyPy_MemEntity::type();