summaryrefslogtreecommitdiffstats
path: root/src/scripting/luascript.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-03-16 23:20:38 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-04-04 20:18:50 +0200
commit4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07 (patch)
treecb6fc8a565689caaded7977fe249820a61dadee9 /src/scripting/luascript.cpp
parentb30e3355dbbd160ad77f2987b9758ad349830cac (diff)
downloadmanaserv-4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07.tar.gz
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/luascript.cpp')
-rw-r--r--src/scripting/luascript.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/scripting/luascript.cpp b/src/scripting/luascript.cpp
index 3a45b3f..8ea78f7 100644
--- a/src/scripting/luascript.cpp
+++ b/src/scripting/luascript.cpp
@@ -86,7 +86,7 @@ void LuaScript::push(const std::string &v)
++nbArgs;
}
-void LuaScript::push(Thing *v)
+void LuaScript::push(Entity *v)
{
assert(nbArgs >= 0);
if (v)
@@ -235,30 +235,30 @@ void LuaScript::load(const char *prog, const char *name)
}
}
-void LuaScript::processDeathEvent(Being *being)
+void LuaScript::processDeathEvent(Being *entity)
{
if (mDeathNotificationCallback.isValid())
{
prepare(mDeathNotificationCallback);
- push(being);
+ push(entity);
//TODO: get and push a list of creatures who contributed to killing the
// being. This might be very interesting for scripting quests.
execute();
}
}
-void LuaScript::processRemoveEvent(Thing *being)
+void LuaScript::processRemoveEvent(Entity *entity)
{
if (mRemoveNotificationCallback.isValid())
{
prepare(mRemoveNotificationCallback);
- push(being);
+ push(entity);
//TODO: get and push a list of creatures who contributed to killing the
// being. This might be very interesting for scripting quests.
execute();
}
- being->removeListener(getScriptListener());
+ entity->removeListener(getScriptListener());
}
/**