teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Client] Don't use message box call boolean for regular message boxes

Browse source
This commit is contained in:
David Cernat 2017-10-10 04:11:36 +03:00
parent 4f112ba3d7
commit c35101cc36
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwmp/GUIController.cpp
View file

@ -43,7 +43,7 @@ mwmp::GUIController::GUIController(): mInputBox(0), mListBox(0)
mChat = nullptr; mChat = nullptr;
keySay = SDL_SCANCODE_Y; keySay = SDL_SCANCODE_Y;
keyChatMode = SDL_SCANCODE_F2; keyChatMode = SDL_SCANCODE_F2;
calledMessageBox = false; calledInteractiveMessage = false;
} }
mwmp::GUIController::~GUIController() mwmp::GUIController::~GUIController()
@ -119,7 +119,6 @@ void mwmp::GUIController::showMessageBox(const BasePlayer::GUIMessageBox &guiMes
{ {
MWBase::WindowManager *windowManager = MWBase::Environment::get().getWindowManager(); MWBase::WindowManager *windowManager = MWBase::Environment::get().getWindowManager();
windowManager->messageBox(guiMessageBox.label); windowManager->messageBox(guiMessageBox.label);
calledMessageBox = true;
} }
std::vector<std::string> splitString(const std::string &str, char delim = ';') std::vector<std::string> splitString(const std::string &str, char delim = ';')
@ -137,7 +136,7 @@ void mwmp::GUIController::showCustomMessageBox(const BasePlayer::GUIMessageBox &
MWBase::WindowManager *windowManager = MWBase::Environment::get().getWindowManager(); MWBase::WindowManager *windowManager = MWBase::Environment::get().getWindowManager();
std::vector<std::string> buttons = splitString(guiMessageBox.buttons); std::vector<std::string> buttons = splitString(guiMessageBox.buttons);
windowManager->interactiveMessageBox(guiMessageBox.label, buttons); windowManager->interactiveMessageBox(guiMessageBox.label, buttons);
calledMessageBox = true; calledInteractiveMessage = true;
} }
void mwmp::GUIController::showInputBox(const BasePlayer::GUIMessageBox &guiMessageBox) void mwmp::GUIController::showInputBox(const BasePlayer::GUIMessageBox &guiMessageBox)
@ -205,10 +204,10 @@ void mwmp::GUIController::update(float dt)
// checked somewhere else // checked somewhere else
int pressedButton = MWBase::Environment::get().getWindowManager()->readPressedButton(false); int pressedButton = MWBase::Environment::get().getWindowManager()->readPressedButton(false);
if (pressedButton != -1 && calledMessageBox) if (pressedButton != -1 && calledInteractiveMessage)
{ {
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Pressed: %d", pressedButton); LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Pressed: %d", pressedButton);
calledMessageBox = false; calledInteractiveMessage = false;
Main::get().getLocalPlayer()->guiMessageBox.data = MyGUI::utility::toString(pressedButton); Main::get().getLocalPlayer()->guiMessageBox.data = MyGUI::utility::toString(pressedButton);
Main::get().getNetworking()->getPlayerPacket(ID_GUI_MESSAGEBOX)->setPlayer(Main::get().getLocalPlayer()); Main::get().getNetworking()->getPlayerPacket(ID_GUI_MESSAGEBOX)->setPlayer(Main::get().getLocalPlayer());
Main::get().getNetworking()->getPlayerPacket(ID_GUI_MESSAGEBOX)->Send(); Main::get().getNetworking()->getPlayerPacket(ID_GUI_MESSAGEBOX)->Send();

2
apps/openmw/mwmp/GUIController.hpp
View file

@ -69,7 +69,7 @@ namespace mwmp
int keyChatMode; int keyChatMode;
long id; long id;
bool calledMessageBox; bool calledInteractiveMessage;
TextInputDialog *mInputBox; TextInputDialog *mInputBox;
GUIDialogList *mListBox; GUIDialogList *mListBox;
void onInputBoxDone(MWGui::WindowBase* parWindow); void onInputBoxDone(MWGui::WindowBase* parWindow);