diff --git a/apps/openmw/mwmp/GUI/GUIChat.cpp b/apps/openmw/mwmp/GUI/GUIChat.cpp index 3bb8fead5..4d244d6e9 100644 --- a/apps/openmw/mwmp/GUI/GUIChat.cpp +++ b/apps/openmw/mwmp/GUI/GUIChat.cpp @@ -66,6 +66,11 @@ namespace mwmp return true; } + bool GUIChat::getEditState() + { + return editState; + } + void GUIChat::acceptCommand(MyGUI::EditBox *_sender) { const std::string &cm = MyGUI::TextIterator::toTagsString(mCommandLine->getCaption()); diff --git a/apps/openmw/mwmp/GUI/GUIChat.hpp b/apps/openmw/mwmp/GUI/GUIChat.hpp index e66f10b2a..01e962635 100644 --- a/apps/openmw/mwmp/GUI/GUIChat.hpp +++ b/apps/openmw/mwmp/GUI/GUIChat.hpp @@ -44,6 +44,8 @@ namespace mwmp virtual bool exit(); + bool getEditState(); + void setFont(const std::string &fntName); void onResChange(int width, int height); diff --git a/apps/openmw/mwmp/GUIController.cpp b/apps/openmw/mwmp/GUIController.cpp index 87d8775d2..341487f36 100644 --- a/apps/openmw/mwmp/GUIController.cpp +++ b/apps/openmw/mwmp/GUIController.cpp @@ -213,9 +213,9 @@ bool mwmp::GUIController::pressedKey(int key) return false; } -bool mwmp::GUIController::hasFocusedElement() +bool mwmp::GUIController::getChatEditState() { - return false; + return mChat->editState; } void mwmp::GUIController::update(float dt) diff --git a/apps/openmw/mwmp/GUIController.hpp b/apps/openmw/mwmp/GUIController.hpp index 9b1412b88..27fdf519e 100644 --- a/apps/openmw/mwmp/GUIController.hpp +++ b/apps/openmw/mwmp/GUIController.hpp @@ -45,8 +45,8 @@ namespace mwmp void showDialogList(const BasePlayer::GUIMessageBox &guiMessageBox); - /// Return true if any tes3mp gui element in active state - bool hasFocusedElement(); + bool getChatEditState(); + /// Returns 0 if there was no events bool pressedKey(int key);