mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-19 22:23:51 +00:00
re-routed talk action from gui to dialogue manager (master branch should not incooperate this change, because the dialogue window implementer will need the original code for testing)
This commit is contained in:
parent
d42747e85b
commit
b5d59edd44
2 changed files with 3 additions and 2 deletions
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include "environment.hpp"
|
||||
|
||||
#include "../mwgui/window_manager.hpp"
|
||||
#include "../mwdialogue/dialoguemanager.hpp"
|
||||
|
||||
namespace MWWorld
|
||||
{
|
||||
|
@ -11,6 +11,6 @@ namespace MWWorld
|
|||
|
||||
void ActionTalk::execute (Environment& environment)
|
||||
{
|
||||
environment.mWindowManager->setMode (MWGui::GM_Dialogue);
|
||||
environment.mDialogueManager->startDialogue (mActor);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,6 +13,7 @@ namespace MWWorld
|
|||
public:
|
||||
|
||||
ActionTalk (const Ptr& actor);
|
||||
///< \param actor The actor the player is talking to
|
||||
|
||||
virtual void execute (Environment& environment);
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue