diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-03-16 23:20:38 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-04-04 20:18:50 +0200 |
commit | 4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07 (patch) | |
tree | cb6fc8a565689caaded7977fe249820a61dadee9 /src/scripting/script.h | |
parent | b30e3355dbbd160ad77f2987b9758ad349830cac (diff) | |
download | manaserv-4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07.tar.gz manaserv-4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07.tar.bz2 manaserv-4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07.tar.xz manaserv-4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07.zip |
Renamed Thing to Entity
In preparation for using an entity/component system for the entities
in the game world, this name will be more recognizable and easier to
talk about.
Reviewed-by: Yohann Ferreira
Diffstat (limited to 'src/scripting/script.h')
-rw-r--r-- | src/scripting/script.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/scripting/script.h b/src/scripting/script.h index f6d6d180..238bc34c 100644 --- a/src/scripting/script.h +++ b/src/scripting/script.h @@ -30,7 +30,7 @@ #include <vector> class MapComposite; -class Thing; +class Entity; /** * Abstract interface for calling functions written in an external language. @@ -163,7 +163,7 @@ class Script * scripting engine, if needed. This value will usually be passed * by the script to some callback functions. */ - virtual void push(Thing *) = 0; + virtual void push(Entity *) = 0; /** * Pushes a list of items with amounts to the script engine. @@ -219,9 +219,9 @@ class Script EventListener *getScriptListener() { return &mEventListener; } - virtual void processDeathEvent(Being *thing) = 0; + virtual void processDeathEvent(Being *entity) = 0; - virtual void processRemoveEvent(Thing *thing) = 0; + virtual void processRemoveEvent(Entity *entity) = 0; static void setCreateNpcDelayedCallback(Script *script) { script->assignCallback(mCreateNpcDelayedCallback); } @@ -251,7 +251,7 @@ struct ScriptEventDispatch: EventDispatch { typedef EventListenerFactory< Script, &Script::mEventListener > Factory; died = &Factory::create< Being, &Script::processDeathEvent >::function; - removed = &Factory::create< Thing, &Script::processRemoveEvent >::function; + removed = &Factory::create< Entity, &Script::processRemoveEvent >::function; } }; |