mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm

Browse Source
pull/541/head
AnyOldName3 7 years ago
parent cf54b4a130 ae14aa0c84
commit ef8a7d1cb9
18 changed files with 153 additions and 117 deletions
Show Stats Download Patch File Download Diff File

22
CI/before_script.msvc.sh
Unescape Escape View File

@ -330,9 +330,9 @@ if [ -z $SKIP_DOWNLOAD ]; then
"OpenAL-Soft-1.17.2.zip" "OpenAL-Soft-1.17.2.zip"
# OSG # OSG
download "OpenSceneGraph 3.4.0-scrawl" \ download "OpenSceneGraph 3.4.1-scrawl" \
"http://www.lysator.liu.se/~ace/OpenMW/deps/OSG-3.4.0-scrawl-msvc${MSVC_YEAR}-win${BITS}.7z" \ "http://www.lysator.liu.se/~ace/OpenMW/deps/OSG-3.4.1-scrawl-msvc${MSVC_YEAR}-win${BITS}.7z" \
"OSG-3.4.0-scrawl-msvc${MSVC_YEAR}-win${BITS}.7z" "OSG-3.4.1-scrawl-msvc${MSVC_YEAR}-win${BITS}.7z"
# Qt # Qt
if [ -z $APPVEYOR ]; then if [ -z $APPVEYOR ]; then
@ -527,20 +527,20 @@ cd $DEPS
echo echo
# OSG # OSG
printf "OSG 3.4.0-scrawl... " printf "OSG 3.4.1-scrawl... "
{ {
cd $DEPS_INSTALL cd $DEPS_INSTALL
if [ -d OSG ] && \ if [ -d OSG ] && \
grep "OPENSCENEGRAPH_MAJOR_VERSION 3" OSG/include/osg/Version > /dev/null && \ grep "OPENSCENEGRAPH_MAJOR_VERSION 3" OSG/include/osg/Version > /dev/null && \
grep "OPENSCENEGRAPH_MINOR_VERSION 4" OSG/include/osg/Version > /dev/null && \ grep "OPENSCENEGRAPH_MINOR_VERSION 4" OSG/include/osg/Version > /dev/null && \
grep "OPENSCENEGRAPH_PATCH_VERSION 0" OSG/include/osg/Version > /dev/null grep "OPENSCENEGRAPH_PATCH_VERSION 1" OSG/include/osg/Version > /dev/null
then then
printf "Exists. " printf "Exists. "
elif [ -z $SKIP_EXTRACT ]; then elif [ -z $SKIP_EXTRACT ]; then
rm -rf OSG rm -rf OSG
eval 7z x -y "${DEPS}/OSG-3.4.0-scrawl-msvc${MSVC_YEAR}-win${BITS}.7z" $STRIP eval 7z x -y "${DEPS}/OSG-3.4.1-scrawl-msvc${MSVC_YEAR}-win${BITS}.7z" $STRIP
mv "OSG-3.4.0-scrawl-msvc${MSVC_YEAR}-win${BITS}" OSG mv "OSG-3.4.1-scrawl-msvc${MSVC_YEAR}-win${BITS}" OSG
fi fi
OSG_SDK="$(real_pwd)/OSG" OSG_SDK="$(real_pwd)/OSG"
@ -556,8 +556,8 @@ printf "OSG 3.4.0-scrawl... "
add_runtime_dlls "$(pwd)/OSG/bin/"{OpenThreads,zlib,libpng*}${SUFFIX}.dll \ add_runtime_dlls "$(pwd)/OSG/bin/"{OpenThreads,zlib,libpng*}${SUFFIX}.dll \
"$(pwd)/OSG/bin/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX}.dll "$(pwd)/OSG/bin/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX}.dll
add_osg_dlls "$(pwd)/OSG/bin/osgPlugins-3.4.0/osgdb_"{bmp,dds,jpeg,osg,png,tga}${SUFFIX}.dll add_osg_dlls "$(pwd)/OSG/bin/osgPlugins-3.4.1/osgdb_"{bmp,dds,jpeg,osg,png,tga}${SUFFIX}.dll
add_osg_dlls "$(pwd)/OSG/bin/osgPlugins-3.4.0/osgdb_serializers_osg"{,animation,fx,ga,particle,text,util,viewer,shadow}${SUFFIX}.dll add_osg_dlls "$(pwd)/OSG/bin/osgPlugins-3.4.1/osgdb_serializers_osg"{,animation,fx,ga,particle,text,util,viewer,shadow}${SUFFIX}.dll
echo Done. echo Done.
} }
@ -717,10 +717,10 @@ if [ -z $CI ]; then
echo echo
echo "- OSG Plugin DLLs..." echo "- OSG Plugin DLLs..."
mkdir -p $BUILD_CONFIG/osgPlugins-3.4.0 mkdir -p $BUILD_CONFIG/osgPlugins-3.4.1
for DLL in $OSG_PLUGINS; do for DLL in $OSG_PLUGINS; do
echo " $(basename $DLL)." echo " $(basename $DLL)."
cp "$DLL" $BUILD_CONFIG/osgPlugins-3.4.0 cp "$DLL" $BUILD_CONFIG/osgPlugins-3.4.1
done done
echo echo

17
apps/openmw/mwbase/dialoguemanager.hpp
Unescape Escape View File

@ -36,6 +36,12 @@ namespace MWBase
public: public:
class ResponseCallback
{
public:
virtual void addResponse(const std::string& title, const std::string& text) = 0;
};
DialogueManager() {} DialogueManager() {}
virtual void clear() = 0; virtual void clear() = 0;
@ -44,8 +50,7 @@ namespace MWBase
virtual bool isInChoice() const = 0; virtual bool isInChoice() const = 0;
typedef std::pair<std::string, std::string> Response; // title, text virtual bool startDialogue (const MWWorld::Ptr& actor, ResponseCallback* callback) = 0;
virtual bool startDialogue (const MWWorld::Ptr& actor, Response& response) = 0;
virtual void addTopic (const std::string& topic) = 0; virtual void addTopic (const std::string& topic) = 0;
@ -58,15 +63,15 @@ namespace MWBase
virtual void say(const MWWorld::Ptr &actor, const std::string &topic) = 0; virtual void say(const MWWorld::Ptr &actor, const std::string &topic) = 0;
virtual Response keywordSelected (const std::string& keyword) = 0; virtual void keywordSelected (const std::string& keyword, ResponseCallback* callback) = 0;
virtual void goodbyeSelected() = 0; virtual void goodbyeSelected() = 0;
virtual Response questionAnswered (int answer) = 0; virtual void questionAnswered (int answer, ResponseCallback* callback) = 0;
virtual std::list<std::string> getAvailableTopics() = 0; virtual std::list<std::string> getAvailableTopics() = 0;
virtual bool checkServiceRefused (Response& response) = 0; virtual bool checkServiceRefused (ResponseCallback* callback) = 0;
virtual Response persuade (int type) = 0; virtual void persuade (int type, ResponseCallback* callback) = 0;
virtual int getTemporaryDispositionChange () const = 0; virtual int getTemporaryDispositionChange () const = 0;
/// @note This change is temporary and gets discarded when dialogue ends. /// @note This change is temporary and gets discarded when dialogue ends.

35
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
Unescape Escape View File

@ -101,7 +101,7 @@ namespace MWDialogue
} }
} }
bool DialogueManager::startDialogue (const MWWorld::Ptr& actor, Response& response) bool DialogueManager::startDialogue (const MWWorld::Ptr& actor, ResponseCallback* callback)
{ {
updateGlobals(); updateGlobals();
@ -151,7 +151,7 @@ namespace MWDialogue
parseText (info->mResponse); parseText (info->mResponse);
MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor); MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
response = Response ("", Interpreter::fixDefinesDialog(info->mResponse, interpreterContext)); callback->addResponse("", Interpreter::fixDefinesDialog(info->mResponse, interpreterContext));
executeScript (info->mResultScript, mActor); executeScript (info->mResultScript, mActor);
mLastTopic = it->mId; mLastTopic = it->mId;
@ -240,9 +240,8 @@ namespace MWDialogue
} }
} }
DialogueManager::Response DialogueManager::executeTopic (const std::string& topic) void DialogueManager::executeTopic (const std::string& topic, ResponseCallback* callback)
{ {
DialogueManager::Response response;
Filter filter (mActor, mChoice, mTalkedTo); Filter filter (mActor, mChoice, mTalkedTo);
const MWWorld::Store<ESM::Dialogue> &dialogues = const MWWorld::Store<ESM::Dialogue> &dialogues =
@ -274,7 +273,7 @@ namespace MWDialogue
title = topic; title = topic;
MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor); MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
response = Response(title, Interpreter::fixDefinesDialog(info->mResponse, interpreterContext)); callback->addResponse(title, Interpreter::fixDefinesDialog(info->mResponse, interpreterContext));
if (dialogue.mType == ESM::Dialogue::Topic) if (dialogue.mType == ESM::Dialogue::Topic)
{ {
@ -295,7 +294,6 @@ namespace MWDialogue
mLastTopic = topic; mLastTopic = topic;
} }
return response;
} }
const ESM::Dialogue *DialogueManager::searchDialogue(const std::string& id) const ESM::Dialogue *DialogueManager::searchDialogue(const std::string& id)
@ -325,8 +323,7 @@ namespace MWDialogue
{ {
if (filter.responseAvailable (*iter)) if (filter.responseAvailable (*iter))
{ {
std::string lower = Misc::StringUtils::lowerCase(iter->mId); mActorKnownTopics.insert (iter->mId);
mActorKnownTopics.insert (lower);
} }
} }
} }
@ -342,7 +339,7 @@ namespace MWDialogue
for (const std::string& topic : mActorKnownTopics) for (const std::string& topic : mActorKnownTopics)
{ {
//does the player know the topic? //does the player know the topic?
if (mKnownTopics.count(Misc::StringUtils::lowerCase(topic))) if (mKnownTopics.count(topic))
keywordList.push_back(topic); keywordList.push_back(topic);
} }
@ -351,18 +348,16 @@ namespace MWDialogue
return keywordList; return keywordList;
} }
DialogueManager::Response DialogueManager::keywordSelected (const std::string& keyword) void DialogueManager::keywordSelected (const std::string& keyword, ResponseCallback* callback)
{ {
Response response;
if(!mIsInChoice) if(!mIsInChoice)
{ {
const ESM::Dialogue* dialogue = searchDialogue(keyword); const ESM::Dialogue* dialogue = searchDialogue(keyword);
if (dialogue && dialogue->mType == ESM::Dialogue::Topic) if (dialogue && dialogue->mType == ESM::Dialogue::Topic)
{ {
response = executeTopic (keyword); executeTopic (keyword, callback);
} }
} }
return response;
} }
bool DialogueManager::isInChoice() const bool DialogueManager::isInChoice() const
@ -387,10 +382,9 @@ namespace MWDialogue
mTemporaryDispositionChange = 0; mTemporaryDispositionChange = 0;
} }
DialogueManager::Response DialogueManager::questionAnswered (int answer) void DialogueManager::questionAnswered (int answer, ResponseCallback* callback)
{ {
mChoice = answer; mChoice = answer;
DialogueManager::Response response;
const ESM::Dialogue* dialogue = searchDialogue(mLastTopic); const ESM::Dialogue* dialogue = searchDialogue(mLastTopic);
if (dialogue) if (dialogue)
@ -409,7 +403,7 @@ namespace MWDialogue
mChoices.clear(); mChoices.clear();
MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor); MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
response = Response("", Interpreter::fixDefinesDialog(text, interpreterContext)); callback->addResponse("", Interpreter::fixDefinesDialog(text, interpreterContext));
// Make sure the returned DialInfo is from the Dialogue we supplied. If could also be from the Info refusal group, // Make sure the returned DialInfo is from the Dialogue we supplied. If could also be from the Info refusal group,
// in which case it should not be added to the journal. // in which case it should not be added to the journal.
@ -435,7 +429,6 @@ namespace MWDialogue
} }
updateActorKnownTopics(); updateActorKnownTopics();
return response;
} }
void DialogueManager::addChoice (const std::string& text, int choice) void DialogueManager::addChoice (const std::string& text, int choice)
@ -461,7 +454,7 @@ namespace MWDialogue
mGoodbye = true; mGoodbye = true;
} }
DialogueManager::Response DialogueManager::persuade(int type) void DialogueManager::persuade(int type, ResponseCallback* callback)
{ {
bool success; bool success;
float temp, perm; float temp, perm;
@ -510,7 +503,7 @@ namespace MWDialogue
text = "Bribe"; text = "Bribe";
} }
return executeTopic (text + (success ? " Success" : " Fail")); executeTopic (text + (success ? " Success" : " Fail"), callback);
} }
int DialogueManager::getTemporaryDispositionChange() const int DialogueManager::getTemporaryDispositionChange() const
@ -523,7 +516,7 @@ namespace MWDialogue
mTemporaryDispositionChange += delta; mTemporaryDispositionChange += delta;
} }
bool DialogueManager::checkServiceRefused(Response& response) bool DialogueManager::checkServiceRefused(ResponseCallback* callback)
{ {
Filter filter (mActor, mChoice, mTalkedTo); Filter filter (mActor, mChoice, mTalkedTo);
@ -544,7 +537,7 @@ namespace MWDialogue
MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor); MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
response = Response(gmsts.find ("sServiceRefusal")->getString(), Interpreter::fixDefinesDialog(info->mResponse, interpreterContext)); callback->addResponse(gmsts.find ("sServiceRefusal")->getString(), Interpreter::fixDefinesDialog(info->mResponse, interpreterContext));
executeScript (info->mResultScript, mActor); executeScript (info->mResultScript, mActor);
return true; return true;

17
apps/openmw/mwdialogue/dialoguemanagerimp.hpp
Unescape Escape View File

@ -8,6 +8,7 @@
#include <components/compiler/streamerrorhandler.hpp> #include <components/compiler/streamerrorhandler.hpp>
#include <components/translation/translation.hpp> #include <components/translation/translation.hpp>
#include <components/misc/stringops.hpp>
#include "../mwworld/ptr.hpp" #include "../mwworld/ptr.hpp"
@ -22,13 +23,13 @@ namespace MWDialogue
{ {
class DialogueManager : public MWBase::DialogueManager class DialogueManager : public MWBase::DialogueManager
{ {
std::set<std::string> mKnownTopics;// Those are the topics the player knows. std::set<std::string, Misc::StringUtils::CiComp> mKnownTopics;// Those are the topics the player knows.
// Modified faction reactions. <Faction1, <Faction2, Difference> > // Modified faction reactions. <Faction1, <Faction2, Difference> >
typedef std::map<std::string, std::map<std::string, int> > ModFactionReactionMap; typedef std::map<std::string, std::map<std::string, int> > ModFactionReactionMap;
ModFactionReactionMap mChangedFactionReaction; ModFactionReactionMap mChangedFactionReaction;
std::set<std::string> mActorKnownTopics; std::set<std::string, Misc::StringUtils::CiComp> mActorKnownTopics;
Translation::Storage& mTranslationDataStorage; Translation::Storage& mTranslationDataStorage;
MWScript::CompilerContext mCompilerContext; MWScript::CompilerContext mCompilerContext;
@ -56,7 +57,7 @@ namespace MWDialogue
bool compile (const std::string& cmd, std::vector<Interpreter::Type_Code>& code, const MWWorld::Ptr& actor); bool compile (const std::string& cmd, std::vector<Interpreter::Type_Code>& code, const MWWorld::Ptr& actor);
void executeScript (const std::string& script, const MWWorld::Ptr& actor); void executeScript (const std::string& script, const MWWorld::Ptr& actor);
Response executeTopic (const std::string& topic); void executeTopic (const std::string& topic, ResponseCallback* callback);
const ESM::Dialogue* searchDialogue(const std::string& id); const ESM::Dialogue* searchDialogue(const std::string& id);
@ -68,7 +69,7 @@ namespace MWDialogue
virtual bool isInChoice() const; virtual bool isInChoice() const;
virtual bool startDialogue (const MWWorld::Ptr& actor, Response& response); virtual bool startDialogue (const MWWorld::Ptr& actor, ResponseCallback* callback);
std::list<std::string> getAvailableTopics(); std::list<std::string> getAvailableTopics();
@ -81,16 +82,16 @@ namespace MWDialogue
virtual void goodbye(); virtual void goodbye();
virtual bool checkServiceRefused (Response& response); virtual bool checkServiceRefused (ResponseCallback* callback);
virtual void say(const MWWorld::Ptr &actor, const std::string &topic); virtual void say(const MWWorld::Ptr &actor, const std::string &topic);
//calbacks for the GUI //calbacks for the GUI
virtual Response keywordSelected (const std::string& keyword); virtual void keywordSelected (const std::string& keyword, ResponseCallback* callback);
virtual void goodbyeSelected(); virtual void goodbyeSelected();
virtual Response questionAnswered (int answer); virtual void questionAnswered (int answer, ResponseCallback* callback);
virtual Response persuade (int type); virtual void persuade (int type, ResponseCallback* callback);
virtual int getTemporaryDispositionChange () const; virtual int getTemporaryDispositionChange () const;
/// @note This change is temporary and gets discarded when dialogue ends. /// @note This change is temporary and gets discarded when dialogue ends.

7
apps/openmw/mwdialogue/journalimp.cpp
Unescape Escape View File

@ -77,11 +77,16 @@ namespace MWDialogue
void Journal::addEntry (const std::string& id, int index, const MWWorld::Ptr& actor) void Journal::addEntry (const std::string& id, int index, const MWWorld::Ptr& actor)
{ {
// bail out of we already have heard this... // bail out if we already have heard this...
std::string infoId = JournalEntry::idFromIndex (id, index); std::string infoId = JournalEntry::idFromIndex (id, index);
for (TEntryIter i = mJournal.begin (); i != mJournal.end (); ++i) for (TEntryIter i = mJournal.begin (); i != mJournal.end (); ++i)
if (i->mTopic == id && i->mInfoId == infoId) if (i->mTopic == id && i->mInfoId == infoId)
{
if (getJournalIndex(id) < index)
setJournalIndex(id, index);
MWBase::Environment::get().getWindowManager()->messageBox ("#{sJournalEntry}");
return; return;
}
StampedJournalEntry entry = StampedJournalEntry::makeFromQuest (id, index, actor); StampedJournalEntry entry = StampedJournalEntry::makeFromQuest (id, index, actor);

93
apps/openmw/mwgui/dialogue.cpp
Unescape Escape View File

@ -30,8 +30,29 @@
namespace MWGui namespace MWGui
{ {
PersuasionDialog::PersuasionDialog() class ResponseCallback : public MWBase::DialogueManager::ResponseCallback
{
public:
ResponseCallback(DialogueWindow* win, bool needMargin=true)
: mWindow(win)
, mNeedMargin(needMargin)
{
}
void addResponse(const std::string& title, const std::string& text)
{
mWindow->addResponse(title, text, mNeedMargin);
}
private:
DialogueWindow* mWindow;
bool mNeedMargin;
};
PersuasionDialog::PersuasionDialog(ResponseCallback* callback)
: WindowModal("openmw_persuasion_dialog.layout") : WindowModal("openmw_persuasion_dialog.layout")
, mCallback(callback)
{ {
getWidget(mCancelButton, "CancelButton"); getWidget(mCancelButton, "CancelButton");
getWidget(mAdmireButton, "AdmireButton"); getWidget(mAdmireButton, "AdmireButton");
@ -69,9 +90,7 @@ namespace MWGui
else /*if (sender == mBribe1000Button)*/ else /*if (sender == mBribe1000Button)*/
type = MWBase::MechanicsManager::PT_Bribe1000; type = MWBase::MechanicsManager::PT_Bribe1000;
MWBase::DialogueManager::Response response = MWBase::Environment::get().getDialogueManager()->persuade(type); MWBase::Environment::get().getDialogueManager()->persuade(type, mCallback.get());
eventPersuadeMsg(response.first, response.second);
setVisible(false); setVisible(false);
} }
@ -244,13 +263,14 @@ namespace MWGui
: WindowBase("openmw_dialogue_window.layout") : WindowBase("openmw_dialogue_window.layout")
, mIsCompanion(false) , mIsCompanion(false)
, mGoodbye(false) , mGoodbye(false)
, mPersuasionDialog() , mPersuasionDialog(new ResponseCallback(this))
, mCallback(new ResponseCallback(this))
, mGreetingCallback(new ResponseCallback(this, false))
{ {
// Centre dialog // Centre dialog
center(); center();
mPersuasionDialog.setVisible(false); mPersuasionDialog.setVisible(false);
mPersuasionDialog.eventPersuadeMsg += MyGUI::newDelegate(this, &DialogueWindow::onPersuadeResult);
//History view //History view
getWidget(mHistory, "History"); getWidget(mHistory, "History");
@ -277,8 +297,6 @@ namespace MWGui
DialogueWindow::~DialogueWindow() DialogueWindow::~DialogueWindow()
{ {
mPersuasionDialog.eventPersuadeMsg.clear();
deleteLater(); deleteLater();
for (Link* link : mLinks) for (Link* link : mLinks)
delete link; delete link;
@ -356,12 +374,11 @@ namespace MWGui
const MWWorld::Store<ESM::GameSetting> &gmst = const MWWorld::Store<ESM::GameSetting> &gmst =
MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>(); MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
MWBase::DialogueManager::Response response;
if (topic == gmst.find("sPersuasion")->getString()) if (topic == gmst.find("sPersuasion")->getString())
mPersuasionDialog.setVisible(true); mPersuasionDialog.setVisible(true);
else if (topic == gmst.find("sCompanionShare")->getString()) else if (topic == gmst.find("sCompanionShare")->getString())
MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Companion, mPtr); MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Companion, mPtr);
else if (!MWBase::Environment::get().getDialogueManager()->checkServiceRefused(response)) else if (!MWBase::Environment::get().getDialogueManager()->checkServiceRefused(mCallback.get()))
{ {
if (topic == gmst.find("sBarter")->getString()) if (topic == gmst.find("sBarter")->getString())
MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Barter, mPtr); MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Barter, mPtr);
@ -378,19 +395,34 @@ namespace MWGui
else if (topic == gmst.find("sRepair")->getString()) else if (topic == gmst.find("sRepair")->getString())
MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_MerchantRepair, mPtr); MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_MerchantRepair, mPtr);
} }
else
addResponse(response.first, response.second);
} }
} }
void DialogueWindow::setPtr(const MWWorld::Ptr& actor) void DialogueWindow::setPtr(const MWWorld::Ptr& actor)
{ {
MWBase::DialogueManager::Response response; bool sameActor = (mPtr == actor);
if (!MWBase::Environment::get().getDialogueManager()->startDialogue(actor, response)) if (!sameActor)
{
for (std::vector<DialogueText*>::iterator it = mHistoryContents.begin(); it != mHistoryContents.end(); ++it)
delete (*it);
mHistoryContents.clear();
mKeywords.clear();
mTopicsList->clear();
for (std::vector<Link*>::iterator it = mLinks.begin(); it != mLinks.end(); ++it)
mDeleteLater.push_back(*it); // Links are not deleted right away to prevent issues with event handlers
mLinks.clear();
}
mPtr = actor;
mGoodbye = false;
mTopicsList->setEnabled(true);
if (!MWBase::Environment::get().getDialogueManager()->startDialogue(actor, mGreetingCallback.get()))
{ {
// No greetings found. The dialogue window should not be shown. // No greetings found. The dialogue window should not be shown.
// If this is a companion, we must show the companion window directly (used by BM_bear_be_unique). // If this is a companion, we must show the companion window directly (used by BM_bear_be_unique).
MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Dialogue); MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Dialogue);
mPtr = MWWorld::Ptr();
if (isCompanion(actor)) if (isCompanion(actor))
MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Companion, actor); MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Companion, actor);
return; return;
@ -398,32 +430,11 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mGoodbyeButton); MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mGoodbyeButton);
mGoodbye = false;
bool sameActor = (mPtr == actor);
mPtr = actor;
mTopicsList->setEnabled(true);
setTitle(mPtr.getClass().getName(mPtr)); setTitle(mPtr.getClass().getName(mPtr));
mTopicsList->clear(); updateTopicsPane();
if (!sameActor)
{
for (std::vector<DialogueText*>::iterator it = mHistoryContents.begin(); it != mHistoryContents.end(); ++it)
delete (*it);
mHistoryContents.clear();
mKeywords.clear();
updateTopicsPane();
}
for (std::vector<Link*>::iterator it = mLinks.begin(); it != mLinks.end(); ++it)
mDeleteLater.push_back(*it); // Links are not deleted right away to prevent issues with event handlers
mLinks.clear();
updateDisposition(); updateDisposition();
restock(); restock();
addResponse(response.first, response.second, false);
} }
void DialogueWindow::restock() void DialogueWindow::restock()
@ -608,14 +619,12 @@ namespace MWGui
void DialogueWindow::onTopicActivated(const std::string &topicId) void DialogueWindow::onTopicActivated(const std::string &topicId)
{ {
MWBase::DialogueManager::Response response = MWBase::Environment::get().getDialogueManager()->keywordSelected(topicId); MWBase::Environment::get().getDialogueManager()->keywordSelected(topicId, mCallback.get());
addResponse(response.first, response.second);
} }
void DialogueWindow::onChoiceActivated(int id) void DialogueWindow::onChoiceActivated(int id)
{ {
MWBase::DialogueManager::Response response = MWBase::Environment::get().getDialogueManager()->questionAnswered(id); MWBase::Environment::get().getDialogueManager()->questionAnswered(id, mCallback.get());
addResponse(response.first, response.second);
} }
void DialogueWindow::onGoodbyeActivated() void DialogueWindow::onGoodbyeActivated()
@ -707,8 +716,4 @@ namespace MWGui
&& actor.getRefData().getLocals().getIntVar(actor.getClass().getScript(actor), "companion"); && actor.getRefData().getLocals().getIntVar(actor.getClass().getScript(actor), "companion");
} }
void DialogueWindow::onPersuadeResult(const std::string &title, const std::string &text)
{
addResponse(title, text);
}
} }

13
apps/openmw/mwgui/dialogue.hpp
Unescape Escape View File

@ -22,19 +22,20 @@ namespace MWGui
namespace MWGui namespace MWGui
{ {
class ResponseCallback;
class PersuasionDialog : public WindowModal class PersuasionDialog : public WindowModal
{ {
public: public:
PersuasionDialog(); PersuasionDialog(ResponseCallback* callback);
typedef MyGUI::delegates::CMultiDelegate2<const std::string&, const std::string&> EventHandle_Result;
EventHandle_Result eventPersuadeMsg;
virtual void onOpen(); virtual void onOpen();
virtual MyGUI::Widget* getDefaultKeyFocus(); virtual MyGUI::Widget* getDefaultKeyFocus();
private: private:
std::unique_ptr<ResponseCallback> mCallback;
MyGUI::Button* mCancelButton; MyGUI::Button* mCancelButton;
MyGUI::Button* mAdmireButton; MyGUI::Button* mAdmireButton;
MyGUI::Button* mIntimidateButton; MyGUI::Button* mIntimidateButton;
@ -136,7 +137,6 @@ namespace MWGui
bool isCompanion(const MWWorld::Ptr& actor); bool isCompanion(const MWWorld::Ptr& actor);
bool isCompanion(); bool isCompanion();
void onPersuadeResult(const std::string& title, const std::string& text);
void onSelectListItem(const std::string& topic, int id); void onSelectListItem(const std::string& topic, int id);
void onByeClicked(MyGUI::Widget* _sender); void onByeClicked(MyGUI::Widget* _sender);
void onMouseWheel(MyGUI::Widget* _sender, int _rel); void onMouseWheel(MyGUI::Widget* _sender, int _rel);
@ -180,6 +180,9 @@ namespace MWGui
PersuasionDialog mPersuasionDialog; PersuasionDialog mPersuasionDialog;
MyGUI::IntSize mCurrentWindowSize; MyGUI::IntSize mCurrentWindowSize;
std::unique_ptr<ResponseCallback> mCallback;
std::unique_ptr<ResponseCallback> mGreetingCallback;
}; };
} }
#endif #endif

16
apps/openmw/mwgui/inventorywindow.cpp
Unescape Escape View File

@ -26,7 +26,6 @@
#include "../mwworld/class.hpp" #include "../mwworld/class.hpp"
#include "../mwworld/action.hpp" #include "../mwworld/action.hpp"
#include "../mwscript/interpretercontext.hpp" #include "../mwscript/interpretercontext.hpp"
#include "../mwrender/characterpreview.hpp"
#include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/actorutil.hpp"
#include "../mwmechanics/creaturestats.hpp" #include "../mwmechanics/creaturestats.hpp"
@ -229,8 +228,8 @@ namespace MWGui
MWWorld::Ptr object = item.mBase; MWWorld::Ptr object = item.mBase;
int count = item.mCount; int count = item.mCount;
bool shift = MyGUI::InputManager::getInstance().isShiftPressed(); bool shift = MyGUI::InputManager::getInstance().isShiftPressed();
if (MyGUI::InputManager::getInstance().isControlPressed()) if (MyGUI::InputManager::getInstance().isControlPressed())
count = 1; count = 1;
@ -528,6 +527,7 @@ namespace MWGui
if (mDragAndDrop->mIsOnDragAndDrop) if (mDragAndDrop->mIsOnDragAndDrop)
{ {
MWWorld::Ptr ptr = mDragAndDrop->mItem.mBase; MWWorld::Ptr ptr = mDragAndDrop->mItem.mBase;
mDragAndDrop->finish(); mDragAndDrop->finish();
if (mDragAndDrop->mSourceModel != mTradeModel) if (mDragAndDrop->mSourceModel != mTradeModel)
@ -535,7 +535,19 @@ namespace MWGui
// Move item to the player's inventory // Move item to the player's inventory
ptr = mDragAndDrop->mSourceModel->moveItem(mDragAndDrop->mItem, mDragAndDrop->mDraggedCount, mTradeModel); ptr = mDragAndDrop->mSourceModel->moveItem(mDragAndDrop->mItem, mDragAndDrop->mDraggedCount, mTradeModel);
} }
useItem(ptr); useItem(ptr);
// If item is ingredient or potion don't stop drag and drop to simplify action of taking more than one 1 item
if ((ptr.getTypeName() == typeid(ESM::Potion).name() ||
ptr.getTypeName() == typeid(ESM::Ingredient).name())
&& mDragAndDrop->mDraggedCount > 1)
{
// Item can be provided from other window for example container.
// But after DragAndDrop::startDrag item automaticly always gets to player inventory.
mSelectedItem = getModel()->getIndex(mDragAndDrop->mItem);
dragItem(nullptr, mDragAndDrop->mDraggedCount - 1);
}
} }
else else
{ {

1
apps/openmw/mwgui/messagebox.cpp
Unescape Escape View File

@ -126,6 +126,7 @@ namespace MWGui
if (mInterMessageBoxe != NULL) if (mInterMessageBoxe != NULL)
{ {
std::cerr << "Warning: replacing an interactive message box that was not answered yet" << std::endl; std::cerr << "Warning: replacing an interactive message box that was not answered yet" << std::endl;
mInterMessageBoxe->setVisible(false);
delete mInterMessageBoxe; delete mInterMessageBoxe;
mInterMessageBoxe = NULL; mInterMessageBoxe = NULL;
} }

1
apps/openmw/mwrender/renderingmanager.cpp
Unescape Escape View File

@ -291,6 +291,7 @@ namespace MWRender
sceneRoot->setName("Scene Root"); sceneRoot->setName("Scene Root");
mSky.reset(new SkyManager(sceneRoot, resourceSystem->getSceneManager())); mSky.reset(new SkyManager(sceneRoot, resourceSystem->getSceneManager()));
mSky->setCamera(mViewer->getCamera()); mSky->setCamera(mViewer->getCamera());
mSky->setRainIntensityUniform(mWater->getRainIntensityUniform()); mSky->setRainIntensityUniform(mWater->getRainIntensityUniform());

10
apps/openmw/mwrender/water.cpp
Unescape Escape View File

@ -416,9 +416,9 @@ Water::Water(osg::Group *parent, osg::Group* sceneRoot, Resource::ResourceSystem
setHeight(mTop); setHeight(mTop);
updateWaterMaterial();
mRainIntensityUniform = new osg::Uniform("rainIntensity",(float) 0.0); mRainIntensityUniform = new osg::Uniform("rainIntensity",(float) 0.0);
updateWaterMaterial();
} }
osg::Uniform *Water::getRainIntensityUniform() osg::Uniform *Water::getRainIntensityUniform()
@ -517,6 +517,7 @@ void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, R
osg::ref_ptr<osg::Shader> fragmentShader (shaderMgr.getShader("water_fragment.glsl", defineMap, osg::Shader::FRAGMENT)); osg::ref_ptr<osg::Shader> fragmentShader (shaderMgr.getShader("water_fragment.glsl", defineMap, osg::Shader::FRAGMENT));
osg::ref_ptr<osg::Texture2D> normalMap (new osg::Texture2D(readPngImage(mResourcePath + "/shaders/water_nm.png"))); osg::ref_ptr<osg::Texture2D> normalMap (new osg::Texture2D(readPngImage(mResourcePath + "/shaders/water_nm.png")));
if (normalMap->getImage()) if (normalMap->getImage())
normalMap->getImage()->flipVertical(); normalMap->getImage()->flipVertical();
normalMap->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT); normalMap->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
@ -531,6 +532,7 @@ void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, R
shaderStateset->setTextureAttributeAndModes(0, normalMap, osg::StateAttribute::ON); shaderStateset->setTextureAttributeAndModes(0, normalMap, osg::StateAttribute::ON);
shaderStateset->setTextureAttributeAndModes(1, reflection->getReflectionTexture(), osg::StateAttribute::ON); shaderStateset->setTextureAttributeAndModes(1, reflection->getReflectionTexture(), osg::StateAttribute::ON);
if (refraction) if (refraction)
{ {
shaderStateset->setTextureAttributeAndModes(2, refraction->getRefractionTexture(), osg::StateAttribute::ON); shaderStateset->setTextureAttributeAndModes(2, refraction->getRefractionTexture(), osg::StateAttribute::ON);
@ -552,13 +554,13 @@ void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, R
shaderStateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF); shaderStateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
shaderStateset->addUniform(mRainIntensityUniform.get());
osg::ref_ptr<osg::Program> program (new osg::Program); osg::ref_ptr<osg::Program> program (new osg::Program);
program->addShader(vertexShader); program->addShader(vertexShader);
program->addShader(fragmentShader); program->addShader(fragmentShader);
shaderStateset->setAttributeAndModes(program, osg::StateAttribute::ON); shaderStateset->setAttributeAndModes(program, osg::StateAttribute::ON);
shaderStateset->addUniform(mRainIntensityUniform);
node->setStateSet(shaderStateset); node->setStateSet(shaderStateset);
node->setUpdateCallback(NULL); node->setUpdateCallback(NULL);
} }

3
apps/openmw/mwscript/docs/vmformat.txt
Unescape Escape View File

@ -453,5 +453,6 @@ op 0x2000302: Fixme
op 0x2000303: Fixme, explicit op 0x2000303: Fixme, explicit
op 0x2000304: Show op 0x2000304: Show
op 0x2000305: Show, explicit op 0x2000305: Show, explicit
op 0x2000306: OnActivate, explicit
opcodes 0x2000304-0x3ffffff unused opcodes 0x2000307-0x3ffffff unused

9
apps/openmw/mwscript/miscextensions.cpp
Unescape Escape View File

@ -131,16 +131,14 @@ namespace MWScript
} }
}; };
template <class R>
class OpOnActivate : public Interpreter::Opcode0 class OpOnActivate : public Interpreter::Opcode0
{ {
public: public:
virtual void execute (Interpreter::Runtime& runtime) virtual void execute (Interpreter::Runtime& runtime)
{ {
InterpreterContext& context = MWWorld::Ptr ptr = R()(runtime);
static_cast<InterpreterContext&> (runtime.getContext());
MWWorld::Ptr ptr = context.getReference();
runtime.push (ptr.getRefData().onActivate()); runtime.push (ptr.getRefData().onActivate());
} }
@ -1280,7 +1278,8 @@ namespace MWScript
void installOpcodes (Interpreter::Interpreter& interpreter) void installOpcodes (Interpreter::Interpreter& interpreter)
{ {
interpreter.installSegment5 (Compiler::Misc::opcodeXBox, new OpXBox); interpreter.installSegment5 (Compiler::Misc::opcodeXBox, new OpXBox);
interpreter.installSegment5 (Compiler::Misc::opcodeOnActivate, new OpOnActivate); interpreter.installSegment5 (Compiler::Misc::opcodeOnActivate, new OpOnActivate<ImplicitRef>);
interpreter.installSegment5 (Compiler::Misc::opcodeOnActivateExplicit, new OpOnActivate<ExplicitRef>);
interpreter.installSegment5 (Compiler::Misc::opcodeActivate, new OpActivate<ImplicitRef>); interpreter.installSegment5 (Compiler::Misc::opcodeActivate, new OpActivate<ImplicitRef>);
interpreter.installSegment5 (Compiler::Misc::opcodeActivateExplicit, new OpActivate<ExplicitRef>); interpreter.installSegment5 (Compiler::Misc::opcodeActivateExplicit, new OpActivate<ExplicitRef>);
interpreter.installSegment3 (Compiler::Misc::opcodeLock, new OpLock<ImplicitRef>); interpreter.installSegment3 (Compiler::Misc::opcodeLock, new OpLock<ImplicitRef>);

14
cmake/OpenMWMacros.cmake
Unescape Escape View File

@ -166,11 +166,15 @@ macro (openmw_add_executable target)
endmacro (openmw_add_executable) endmacro (openmw_add_executable)
macro (get_generator_is_multi_config VALUE) macro (get_generator_is_multi_config VALUE)
if (CMAKE_VERSION VERSION_GREATER 3.9 OR CMAKE_VERSION VERSION_EQUAL 3.9) if (DEFINED generator_is_multi_config_var)
get_cmake_property(${VALUE} GENERATOR_IS_MULTI_CONFIG) set(${VALUE} ${generator_is_multi_config_var})
else (CMAKE_VERSION VERSION_GREATER 3.9 OR CMAKE_VERSION VERSION_EQUAL 3.9) else (DEFINED generator_is_multi_config_var)
list(LENGTH "${CMAKE_CONFIGURATION_TYPES}" ${VALUE}) if (CMAKE_VERSION VERSION_GREATER 3.9 OR CMAKE_VERSION VERSION_EQUAL 3.9)
endif (CMAKE_VERSION VERSION_GREATER 3.9 OR CMAKE_VERSION VERSION_EQUAL 3.9) get_cmake_property(${VALUE} GENERATOR_IS_MULTI_CONFIG)
else (CMAKE_VERSION VERSION_GREATER 3.9 OR CMAKE_VERSION VERSION_EQUAL 3.9)
list(LENGTH "${CMAKE_CONFIGURATION_TYPES}" ${VALUE})
endif (CMAKE_VERSION VERSION_GREATER 3.9 OR CMAKE_VERSION VERSION_EQUAL 3.9)
endif (DEFINED generator_is_multi_config_var)
endmacro (get_generator_is_multi_config) endmacro (get_generator_is_multi_config)
macro (copy_resource_file source_path destination_dir_base dest_path_relative) macro (copy_resource_file source_path destination_dir_base dest_path_relative)

7
components/CMakeLists.txt
Unescape Escape View File

@ -5,7 +5,8 @@ set (VERSION_IN_FILE "${OpenMW_SOURCE_DIR}/files/version.in")
set (VERSION_FILE_PATH_BASE "${OpenMW_BINARY_DIR}") set (VERSION_FILE_PATH_BASE "${OpenMW_BINARY_DIR}")
set (VERSION_FILE_PATH_RELATIVE resources/version) set (VERSION_FILE_PATH_RELATIVE resources/version)
if (GIT_CHECKOUT) if (GIT_CHECKOUT)
add_custom_target (git-version get_generator_is_multi_config(multi_config)
add_custom_target (git-version
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DGIT_EXECUTABLE=${GIT_EXECUTABLE}
-DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR}
@ -16,7 +17,9 @@ if (GIT_CHECKOUT)
-DOPENMW_VERSION_MINOR=${OPENMW_VERSION_MINOR} -DOPENMW_VERSION_MINOR=${OPENMW_VERSION_MINOR}
-DOPENMW_VERSION_RELEASE=${OPENMW_VERSION_RELEASE} -DOPENMW_VERSION_RELEASE=${OPENMW_VERSION_RELEASE}
-DOPENMW_VERSION=${OPENMW_VERSION} -DOPENMW_VERSION=${OPENMW_VERSION}
-DMACROSFILE=${CMAKE_SOURCE_DIR}/cmake/OpenMWMacros.cmake -DMACROSFILE=${CMAKE_SOURCE_DIR}/cmake/OpenMWMacros.cmake
"-DCMAKE_CONFIGURATION_TYPES=${CMAKE_CONFIGURATION_TYPES}"
-Dgenerator_is_multi_config_var=${multi_config}
-P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/GitVersion.cmake -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/GitVersion.cmake
VERBATIM) VERBATIM)
else (GIT_CHECKOUT) else (GIT_CHECKOUT)

2
components/compiler/extensions0.cpp
Unescape Escape View File

@ -240,7 +240,7 @@ namespace Compiler
void registerExtensions (Extensions& extensions) void registerExtensions (Extensions& extensions)
{ {
extensions.registerFunction ("xbox", 'l', "", opcodeXBox); extensions.registerFunction ("xbox", 'l', "", opcodeXBox);
extensions.registerFunction ("onactivate", 'l', "", opcodeOnActivate); extensions.registerFunction ("onactivate", 'l', "", opcodeOnActivate, opcodeOnActivateExplicit);
extensions.registerInstruction ("activate", "x", opcodeActivate, opcodeActivateExplicit); extensions.registerInstruction ("activate", "x", opcodeActivate, opcodeActivateExplicit);
extensions.registerInstruction ("lock", "/l", opcodeLock, opcodeLockExplicit); extensions.registerInstruction ("lock", "/l", opcodeLock, opcodeLockExplicit);
extensions.registerInstruction ("unlock", "", opcodeUnlock, opcodeUnlockExplicit); extensions.registerInstruction ("unlock", "", opcodeUnlock, opcodeUnlockExplicit);

1
components/compiler/opcodes.hpp
Unescape Escape View File

@ -200,6 +200,7 @@ namespace Compiler
{ {
const int opcodeXBox = 0x200000c; const int opcodeXBox = 0x200000c;
const int opcodeOnActivate = 0x200000d; const int opcodeOnActivate = 0x200000d;
const int opcodeOnActivateExplicit = 0x2000306;
const int opcodeActivate = 0x2000075; const int opcodeActivate = 0x2000075;
const int opcodeActivateExplicit = 0x2000244; const int opcodeActivateExplicit = 0x2000244;
const int opcodeLock = 0x20004; const int opcodeLock = 0x20004;

2
components/config/gamesettings.cpp
Unescape Escape View File

@ -63,7 +63,7 @@ void Config::GameSettings::validatePaths()
// Do the same for data-local // Do the same for data-local
QString local = mSettings.value(QString("data-local")); QString local = mSettings.value(QString("data-local"));
if (local.at(0) == QChar('\"')) if (local.length() && local.at(0) == QChar('\"'))
{ {
local.remove(0, 1); local.remove(0, 1);
local.chop(1); local.chop(1);

Write Preview
Loading…
Cancel
Save