From 50b396bf0533455e9f461dc97fa9c0c698aec579 Mon Sep 17 00:00:00 2001 From: Sandu Liviu Catalin Date: Thu, 14 Jul 2016 21:19:14 +0300 Subject: [PATCH] Minor adjustments in command system manager method names. And added brackets to make the code more clear. --- source/Command.cpp | 4 ++-- source/Command.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/Command.cpp b/source/Command.cpp index 0806c27a..54ad3ed8 100644 --- a/source/Command.cpp +++ b/source/Command.cpp @@ -1080,8 +1080,8 @@ void Register(HSQUIRRELVM vm) .Func(_SC("Clear"), &Manager::Clear) .Func(_SC("Attach"), &Manager::Attach) .Func(_SC("FindByName"), &Manager::FindByName) - .Func(_SC("BindOnFail"), &Manager::SetOnFail) - .Func(_SC("BindOnAuth"), &Manager::SetOnAuth) + .Func(_SC("BindFail"), &Manager::SetOnFail) + .Func(_SC("BindAuth"), &Manager::SetOnAuth) .Func(_SC("GetArray"), &Manager::GetCommandsArray) .Func(_SC("GetTable"), &Manager::GetCommandsTable) .Func(_SC("Foreach"), &Manager::ForeachCommand) diff --git a/source/Command.hpp b/source/Command.hpp index d2c4dfa6..e40f6085 100644 --- a/source/Command.hpp +++ b/source/Command.hpp @@ -1754,7 +1754,7 @@ public: // Perform the requested check return (f == CMDARG_ANY) || // Requires check? (f & flag) || // Exact match? - (f & CMDARG_GREEDY && flag & CMDARG_STRING); + ((f & CMDARG_GREEDY) && (flag & CMDARG_STRING)); } /* --------------------------------------------------------------------------------------------