diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-08-22 12:44:56 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-08-22 13:11:38 +0200 |
commit | bfca89de4edded82668376d2388784defbee071b (patch) | |
tree | e345a9ec1e5d3e6419191cb3233efdfb70ab0718 /src/scripting/luascript.cpp | |
parent | 59b889008760325845aeb04b7ac3fad5e1068c0f (diff) | |
download | manaserv-bfca89de4edded82668376d2388784defbee071b.tar.gz manaserv-bfca89de4edded82668376d2388784defbee071b.tar.bz2 manaserv-bfca89de4edded82668376d2388784defbee071b.tar.xz manaserv-bfca89de4edded82668376d2388784defbee071b.zip |
Rename some stuff to conform to naming conventions
Diffstat (limited to 'src/scripting/luascript.cpp')
-rw-r--r-- | src/scripting/luascript.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/scripting/luascript.cpp b/src/scripting/luascript.cpp index 922c15d0..ee727060 100644 --- a/src/scripting/luascript.cpp +++ b/src/scripting/luascript.cpp @@ -161,23 +161,23 @@ void LuaScript::getPostCallback(Character *q, const std::string &sender, s->execute(); } -bool LuaScript::load_global_event_script(const std::string &file) +bool LuaScript::loadGlobalEventScript(const std::string &file) { - Script::global_event_script = new LuaScript(); - if (!Script::global_event_script->loadFile(file)) + Script::globalEventScript = new LuaScript(); + if (!Script::globalEventScript->loadFile(file)) { - Script::global_event_script = NULL; + Script::globalEventScript = NULL; return false; } return true; } -bool LuaScript::load_special_actions_script(const std::string &file) +bool LuaScript::loadSpecialActionsScript(const std::string &file) { - Script::special_actions_script = new LuaScript(); - if (!Script::special_actions_script->loadFile(file)) + Script::specialActionsScript = new LuaScript(); + if (!Script::specialActionsScript->loadFile(file)) { - Script::special_actions_script = NULL; + Script::specialActionsScript = NULL; return false; } return true; |