diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-08-20 02:30:21 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-02-03 00:19:14 +0100 |
| commit | 86bfde389a73c984c7ce15ad736c998e893fda6d (patch) | |
| tree | 77ef6215b321295c15165229bfbaf41248b9f808 /src/server/game/Chat | |
| parent | 3c82863c528fa9ea1bd5eb75fa596a99266431b7 (diff) | |
Scripts/Commands: Convert argument parsing of event commands to new system (PR #25275)
(cherry picked from commit 7bfeb03c136f18fda73474054c837f4fe8f11136)
Diffstat (limited to 'src/server/game/Chat')
| -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 4754763b531..960c6a10338 100644 --- a/src/server/game/Chat/Hyperlinks.h +++ b/src/server/game/Chat/Hyperlinks.h @@ -249,7 +249,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); |
