diff options
| author | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-07-20 15:00:59 +1000 |
|---|---|---|
| committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-07-20 15:00:59 +1000 |
| commit | c1ae23808677028ef6ac1b7f0b19b298d78affc2 (patch) | |
| tree | 0310c9d5e4673ea49add9791713fdd83b81ed87f /source/frontend/StarMainInterface.hpp | |
| parent | 9d66acde2ae6896607da953e20ba5bbfc23948f6 (diff) | |
| parent | 043db1841ee46ace0f6919bfdf6ac20a539faaca (diff) | |
Merge branch 'voice'
Diffstat (limited to 'source/frontend/StarMainInterface.hpp')
| -rw-r--r-- | source/frontend/StarMainInterface.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/frontend/StarMainInterface.hpp b/source/frontend/StarMainInterface.hpp index d96779d..9cf2342 100644 --- a/source/frontend/StarMainInterface.hpp +++ b/source/frontend/StarMainInterface.hpp @@ -49,7 +49,7 @@ STAR_CLASS(MainInterface); struct GuiMessage { GuiMessage(); - GuiMessage(String const& message, float cooldown); + GuiMessage(String const& message, float cooldown, float spring = 0); String message; float cooldown; @@ -105,7 +105,9 @@ public: void doChat(String const& chat, bool addToHistory); + void queueMessage(String const& message, Maybe<float> cooldown, float spring); void queueMessage(String const& message); + void queueItemPickupText(ItemPtr const& item); void queueJoinRequest(pair<String, RpcPromiseKeeper<P2PJoinRequestReply>> request); |