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

[Client] Fix build after recent OpenMW changes to GUI

Browse source
This commit is contained in:
David Cernat 2017-10-07 23:33:36 +03:00
parent 3e8d7c8416
commit 711c4d83da
11 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwbase/dialoguemanager.hpp
View file

@ -105,7 +105,7 @@ namespace MWBase
Declare this method here so it can be used from outside of MWDialogue::DialogueManager
*/
virtual void updateTopics() = 0;
virtual void updateActorKnownTopics() = 0;
/*
End of tes3mp addition
*/

2
apps/openmw/mwgui/container.cpp
View file

@ -226,7 +226,7 @@ namespace MWGui
Mark this container as open for multiplayer logic purposes
*/
mwmp::Main::get().getCellController()->openContainer(container, loot);
mwmp::Main::get().getCellController()->openContainer(container);
/*
End of tes3mp addition
*/

8
apps/openmw/mwmp/CellController.cpp
View file

@ -338,14 +338,14 @@ bool CellController::isSameCell(const ESM::Cell& cell, const ESM::Cell& otherCel
return false;
}
void CellController::openContainer(const MWWorld::Ptr &container, bool loot)
void CellController::openContainer(const MWWorld::Ptr &container)
{
// Record this as the player's current open container
Main::get().getLocalPlayer()->storeCurrentContainer(container, loot);
Main::get().getLocalPlayer()->storeCurrentContainer(container);
const auto &cellRef = container.getCellRef();
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Container \"%s\" (%d) is opened. Loot: %s",
cellRef.getRefId().c_str(), cellRef.getRefNum().mIndex, loot ? "true" : "false");
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Container \"%s\" (%d) is opened",
cellRef.getRefId().c_str(), cellRef.getRefNum().mIndex);
for (const auto &ptr : container.getClass().getContainerStore(container))
{

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

@ -59,7 +59,7 @@ namespace mwmp
bool isSameCell(const ESM::Cell& cell, const ESM::Cell& otherCell);
void openContainer(const MWWorld::Ptr& container, bool loot);
void openContainer(const MWWorld::Ptr& container);
void closeContainer(const MWWorld::Ptr& container);
int getCellSize() const;

7
apps/openmw/mwmp/GUI/GUIChat.cpp
View file

@ -46,7 +46,7 @@ namespace mwmp
delay = 3; // 3 sec.
}
void GUIChat::open()
void GUIChat::onOpen()
{
// Give keyboard focus to the combo box whenever the console is
// turned on
@ -54,7 +54,7 @@ namespace mwmp
windowState = CHAT_ENABLED;
}
void GUIChat::close()
void GUIChat::onClose()
{
// Apparently, hidden widgets can retain key focus
// Remove for MyGUI 3.2.2
@ -62,9 +62,10 @@ namespace mwmp
SetEditState(0);
}
void GUIChat::exit()
bool GUIChat::exit()
{
//WindowBase::exit();
return true;
}
void GUIChat::acceptCommand(MyGUI::EditBox *_sender)

7
apps/openmw/mwmp/GUI/GUIChat.hpp
View file

@ -43,11 +43,10 @@ namespace mwmp
void Update(float dt);
virtual void onOpen();
virtual void onClose();
virtual void open();
virtual void close();
virtual void exit();
virtual bool exit();
void setFont(const std::string &fntName);

4
apps/openmw/mwmp/GUI/TextInputDialog.cpp
View file

@ -55,9 +55,9 @@ namespace mwmp
setText("TextNote", note);
}
void TextInputDialog::open()
void TextInputDialog::onOpen()
{
WindowModal::open();
WindowModal::onOpen();
// Make sure the edit box has focus
MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mTextEdit);
}

2
apps/openmw/mwmp/GUI/TextInputDialog.hpp
View file

@ -29,7 +29,7 @@ namespace mwmp
void setEditPassword(bool value);
virtual void open();
virtual void onOpen();
/** Event : Dialog finished, OK button clicked.\n
signature : void method()\n

5
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -719,7 +719,7 @@ void LocalPlayer::addTopics()
env.getDialogueManager()->addTopic(topicId);
if (env.getWindowManager()->containsMode(MWGui::GM_Dialogue))
env.getDialogueManager()->updateTopics();
env.getDialogueManager()->updateActorKnownTopics();
}
}
@ -1369,10 +1369,9 @@ void LocalPlayer::storeCellState(ESM::Cell cell, int stateType)
cellStateChanges.cellStates.push_back(cellState);
}
void LocalPlayer::storeCurrentContainer(const MWWorld::Ptr &container, bool loot)
void LocalPlayer::storeCurrentContainer(const MWWorld::Ptr &container)
{
currentContainer.refId = container.getCellRef().getRefId();
currentContainer.refNumIndex = container.getCellRef().getRefNum().mIndex;
currentContainer.mpNum = container.getCellRef().getMpNum();
currentContainer.loot = loot;
}

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

@ -86,7 +86,7 @@ namespace mwmp
void clearCurrentContainer();
void storeCellState(ESM::Cell cell, int stateType);
void storeCurrentContainer(const MWWorld::Ptr& container, bool loot);
void storeCurrentContainer(const MWWorld::Ptr& container);
private:
Networking *getNetworking();

2
apps/openmw/mwmp/WorldEvent.cpp
View file

@ -142,7 +142,7 @@ void WorldEvent::editContainers(MWWorld::CellStore* cellStore)
currentContainer->mpNum == ptrFound.getCellRef().getMpNum())
{
MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container);
MWBase::Environment::get().getWindowManager()->openContainer(ptrFound, currentContainer->loot);
MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Container, ptrFound);
}
}
}