diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-08-20 02:30:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 02:30:21 +0200 |
| commit | 7bfeb03c136f18fda73474054c837f4fe8f11136 (patch) | |
| tree | 186f28d4bf1126b94007220990ffb48e7b74e4a2 /src/server/game | |
| parent | 643b9209f8f1bc90fa4e26fc06e95f89b2b04899 (diff) | |
Scripts/Commands: Convert argument parsing of event commands to new system (PR #25275)
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Chat/ChatCommands/ChatCommandTags.h | 6 | ||||
| -rw-r--r-- | src/server/game/Chat/Hyperlinks.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/server/game/Chat/ChatCommands/ChatCommandTags.h b/src/server/game/Chat/ChatCommands/ChatCommandTags.h index 213a80c507e..22db765f102 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommandTags.h +++ b/src/server/game/Chat/ChatCommands/ChatCommandTags.h @@ -152,6 +152,12 @@ namespace Trinity::ChatCommands return operator*(); } + template<bool C = have_operators> + operator std::enable_if_t<C && std::is_convertible<first_type, size_t>::value, size_t>() const + { + return operator*(); + } + template <typename T> Variant& operator=(T&& arg) { base::operator=(std::forward<T>(arg)); return *this; } diff --git a/src/server/game/Chat/Hyperlinks.h b/src/server/game/Chat/Hyperlinks.h index b1b43b69a07..f47235e409a 100644 --- a/src/server/game/Chat/Hyperlinks.h +++ b/src/server/game/Chat/Hyperlinks.h @@ -133,7 +133,7 @@ namespace Trinity::Hyperlinks make_base_tag(areatrigger, uint32); make_base_tag(creature, ObjectGuid::LowType); make_base_tag(creature_entry, uint32); - make_base_tag(gameevent, uint32); + make_base_tag(gameevent, uint16); make_base_tag(gameobject, ObjectGuid::LowType); make_base_tag(gameobject_entry, uint32); make_base_tag(itemset, uint32); |
