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

Merge pull request #325 from TES3MP/master while resolving conflicts

Browse source 
# Conflicts:
#	apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp
This commit is contained in:
David Cernat 2017-10-24 19:45:11 +03:00
commit 76a4abd7c0
28 changed files with 467 additions and 453 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -349,8 +349,9 @@ endif ()
configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw-cs.cfg configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw-cs.cfg
"${OpenMW_BINARY_DIR}" "openmw-cs.cfg") "${OpenMW_BINARY_DIR}" "openmw-cs.cfg")
configure_resource_file(${OpenMW_SOURCE_DIR}/files/opencs/defaultfilters # Needs the copy version because the configure version assumes the end of the file has been reached when a null character is reached and there are no CMake expressions to evaluate.
"${OpenMW_BINARY_DIR}" "resources/defaultfilters" COPYONLY) copy_resource_file(${OpenMW_SOURCE_DIR}/files/opencs/defaultfilters
"${OpenMW_BINARY_DIR}" "resources/defaultfilters")
configure_resource_file(${OpenMW_SOURCE_DIR}/files/gamecontrollerdb.txt configure_resource_file(${OpenMW_SOURCE_DIR}/files/gamecontrollerdb.txt
"${OpenMW_BINARY_DIR}" "gamecontrollerdb.txt") "${OpenMW_BINARY_DIR}" "gamecontrollerdb.txt")

2
apps/opencs/model/doc/document.cpp
View file

@ -288,7 +288,7 @@ CSMDoc::Document::Document (const Files::ConfigurationManager& configuration,
if (mContentFiles.empty()) if (mContentFiles.empty())
throw std::runtime_error ("Empty content file sequence"); throw std::runtime_error ("Empty content file sequence");
if (!boost::filesystem::exists (mProjectPath)) if (mNew || !boost::filesystem::exists (mProjectPath))
{ {
boost::filesystem::path customFiltersPath (configuration.getUserDataPath()); boost::filesystem::path customFiltersPath (configuration.getUserDataPath());
customFiltersPath /= "defaultfilters"; customFiltersPath /= "defaultfilters";

5
apps/opencs/model/tools/mergeoperation.cpp
View file

@ -38,9 +38,10 @@ CSMTools::MergeOperation::MergeOperation (CSMDoc::Document& document, ToUTF8::Fr
appendStage (new MergeRefIdsStage (mState)); appendStage (new MergeRefIdsStage (mState));
appendStage (new MergeReferencesStage (mState)); appendStage (new MergeReferencesStage (mState));
appendStage (new MergeReferencesStage (mState)); appendStage (new MergeReferencesStage (mState));
appendStage (new ListLandTexturesMergeStage (mState)); appendStage (new PopulateLandTexturesMergeStage (mState));
appendStage (new MergeLandTexturesStage (mState));
appendStage (new MergeLandStage (mState)); appendStage (new MergeLandStage (mState));
appendStage (new FixLandsAndLandTexturesMergeStage (mState));
appendStage (new CleanupLandTexturesMergeStage (mState));
appendStage (new FinishMergedDocumentStage (mState, encoding)); appendStage (new FinishMergedDocumentStage (mState, encoding));
} }

192
apps/opencs/model/tools/mergestages.cpp
View file

@ -8,7 +8,9 @@
#include "mergestate.hpp" #include "mergestate.hpp"
#include "../doc/document.hpp" #include "../doc/document.hpp"
#include "../world/commands.hpp"
#include "../world/data.hpp" #include "../world/data.hpp"
#include "../world/idtable.hpp"
CSMTools::StartMergeStage::StartMergeStage (MergeState& state) CSMTools::StartMergeStage::StartMergeStage (MergeState& state)
@ -109,102 +111,32 @@ void CSMTools::MergeReferencesStage::perform (int stage, CSMDoc::Messages& messa
} }
CSMTools::ListLandTexturesMergeStage::ListLandTexturesMergeStage (MergeState& state) CSMTools::PopulateLandTexturesMergeStage::PopulateLandTexturesMergeStage (MergeState& state)
: mState (state) : mState (state)
{}
int CSMTools::ListLandTexturesMergeStage::setup()
{ {
return mState.mSource.getData().getLand().getSize();
} }
void CSMTools::ListLandTexturesMergeStage::perform (int stage, CSMDoc::Messages& messages) int CSMTools::PopulateLandTexturesMergeStage::setup()
{ {
const CSMWorld::Record<CSMWorld::Land>& record =
mState.mSource.getData().getLand().getRecord (stage);
if (!record.isDeleted())
{
const CSMWorld::Land& land = record.get();
// make sure record is loaded
land.loadData (ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML |
ESM::Land::DATA_VCLR | ESM::Land::DATA_VTEX);
if (const ESM::Land::LandData *data = land.getLandData (ESM::Land::DATA_VTEX))
{
// list texture indices
std::pair<uint16_t, int> key;
key.second = land.mPlugin;
for (int i=0; i<ESM::Land::LAND_NUM_TEXTURES; ++i)
{
key.first = data->mTextures[i];
mState.mTextureIndices[key] = -1;
}
}
}
}
CSMTools::MergeLandTexturesStage::MergeLandTexturesStage (MergeState& state)
: mState (state), mNext (mState.mTextureIndices.end())
{}
int CSMTools::MergeLandTexturesStage::setup()
{
// Should use the size of mState.mTextureIndices instead, but that is not available at this
// point. Unless there are any errors in the land and land texture records this will not
// make a difference.
return mState.mSource.getData().getLandTextures().getSize(); return mState.mSource.getData().getLandTextures().getSize();
} }
void CSMTools::MergeLandTexturesStage::perform (int stage, CSMDoc::Messages& messages) void CSMTools::PopulateLandTexturesMergeStage::perform (int stage, CSMDoc::Messages& messages)
{ {
if (stage==0) const CSMWorld::Record<CSMWorld::LandTexture>& record =
mNext = mState.mTextureIndices.begin(); mState.mSource.getData().getLandTextures().getRecord (stage);
bool found = false; if (!record.isDeleted())
do
{ {
if (mNext==mState.mTextureIndices.end()) mState.mTarget->getData().getLandTextures().appendRecord(record);
return;
mNext->second = stage+1;
std::ostringstream stream;
stream << mNext->first.first-1 << "_" << mNext->first.second;
int index = mState.mSource.getData().getLandTextures().searchId (stream.str());
if (index!=-1)
{
CSMWorld::LandTexture texture =
mState.mSource.getData().getLandTextures().getRecord (index).get();
stream.clear();
stream << mNext->second-1 << "_0";
texture.mIndex = mNext->second-1;
texture.mId = stream.str();
CSMWorld::Record<CSMWorld::LandTexture> newRecord (
CSMWorld::RecordBase::State_ModifiedOnly, 0, &texture);
mState.mTarget->getData().getLandTextures().appendRecord (newRecord);
found = true;
}
++mNext;
} }
while (!found);
} }
CSMTools::MergeLandStage::MergeLandStage (MergeState& state) : mState (state) {} CSMTools::MergeLandStage::MergeLandStage (MergeState& state)
: mState (state)
{
}
int CSMTools::MergeLandStage::setup() int CSMTools::MergeLandStage::setup()
{ {
@ -218,40 +150,66 @@ void CSMTools::MergeLandStage::perform (int stage, CSMDoc::Messages& messages)
if (!record.isDeleted()) if (!record.isDeleted())
{ {
const CSMWorld::Land& land = record.get(); mState.mTarget->getData().getLand().appendRecord (record);
}
land.loadData (ESM::Land::DATA_VCLR | ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML | }
ESM::Land::DATA_VTEX);
CSMWorld::Land newLand (land); CSMTools::FixLandsAndLandTexturesMergeStage::FixLandsAndLandTexturesMergeStage (MergeState& state)
: mState (state)
newLand.mPlugin = 0; {
}
if (land.mDataTypes & ESM::Land::DATA_VTEX)
{ int CSMTools::FixLandsAndLandTexturesMergeStage::setup()
// adjust land texture references {
if (ESM::Land::LandData *data = newLand.getLandData()) // We will have no more than the source
{ return mState.mSource.getData().getLand().getSize();
std::pair<uint16_t, int> key; }
key.second = land.mPlugin;
void CSMTools::FixLandsAndLandTexturesMergeStage::perform (int stage, CSMDoc::Messages& messages)
for (int i=0; i<ESM::Land::LAND_NUM_TEXTURES; ++i) {
{ if (stage < mState.mTarget->getData().getLand().getSize())
key.first = data->mTextures[i]; {
std::map<std::pair<uint16_t, int>, int>::const_iterator iter = CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&>(
mState.mTextureIndices.find (key); *mState.mTarget->getData().getTableModel(CSMWorld::UniversalId::Type_Lands));
if (iter!=mState.mTextureIndices.end()) CSMWorld::IdTable& ltexTable = dynamic_cast<CSMWorld::IdTable&>(
data->mTextures[i] = iter->second; *mState.mTarget->getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures));
else
data->mTextures[i] = 0; std::string id = mState.mTarget->getData().getLand().getId(stage);
}
} CSMWorld::TouchLandCommand cmd(landTable, ltexTable, id);
} cmd.redo();
CSMWorld::Record<CSMWorld::Land> newRecord ( // Get rid of base data
CSMWorld::RecordBase::State_ModifiedOnly, 0, &newLand); const CSMWorld::Record<CSMWorld::Land>& oldRecord =
mState.mTarget->getData().getLand().getRecord (stage);
mState.mTarget->getData().getLand().appendRecord (newRecord);
CSMWorld::Record<CSMWorld::Land> newRecord(CSMWorld::RecordBase::State_ModifiedOnly,
nullptr, &oldRecord.get());
mState.mTarget->getData().getLand().setRecord(stage, newRecord);
}
}
CSMTools::CleanupLandTexturesMergeStage::CleanupLandTexturesMergeStage (MergeState& state)
: mState (state)
{
}
int CSMTools::CleanupLandTexturesMergeStage::setup()
{
return 1;
}
void CSMTools::CleanupLandTexturesMergeStage::perform (int stage, CSMDoc::Messages& messages)
{
auto& landTextures = mState.mTarget->getData().getLandTextures();
for (int i = 0; i < landTextures.getSize(); )
{
if (!landTextures.getRecord(i).isModified())
landTextures.removeRows(i, 1);
else
++i;
} }
} }

55
apps/opencs/model/tools/mergestages.hpp
View file

@ -116,29 +116,14 @@ namespace CSMTools
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
class ListLandTexturesMergeStage : public CSMDoc::Stage /// Adds all land texture records that could potentially be referenced when merging
class PopulateLandTexturesMergeStage : public CSMDoc::Stage
{ {
MergeState& mState; MergeState& mState;
public: public:
ListLandTexturesMergeStage (MergeState& state); PopulateLandTexturesMergeStage (MergeState& state);
virtual int setup();
///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages);
///< Messages resulting from this stage will be appended to \a messages.
};
class MergeLandTexturesStage : public CSMDoc::Stage
{
MergeState& mState;
std::map<std::pair<uint16_t, int>, int>::iterator mNext;
public:
MergeLandTexturesStage (MergeState& state);
virtual int setup(); virtual int setup();
///< \return number of steps ///< \return number of steps
@ -161,6 +146,40 @@ namespace CSMTools
virtual void perform (int stage, CSMDoc::Messages& messages); virtual void perform (int stage, CSMDoc::Messages& messages);
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
/// During this stage, the complex process of combining LandTextures from
/// potentially multiple plugins is undertaken.
class FixLandsAndLandTexturesMergeStage : public CSMDoc::Stage
{
MergeState& mState;
public:
FixLandsAndLandTexturesMergeStage (MergeState& state);
virtual int setup();
///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages);
///< Messages resulting from this stage will be appended to \a messages.
};
/// Removes base LandTexture records. This gets rid of the base records previously
/// needed in FixLandsAndLandTexturesMergeStage.
class CleanupLandTexturesMergeStage : public CSMDoc::Stage
{
MergeState& mState;
public:
CleanupLandTexturesMergeStage (MergeState& state);
virtual int setup();
///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages);
///< Messages resulting from this stage will be appended to \a messages.
};
} }
#endif #endif

10
apps/opencs/model/world/columnimp.cpp
View file

@ -108,7 +108,7 @@ namespace CSMWorld
throw std::runtime_error("invalid land map LOD data"); throw std::runtime_error("invalid land map LOD data");
Land copy = record.get(); Land copy = record.get();
copy.setDataLoaded(Land::DATA_WNAM); copy.add(Land::DATA_WNAM);
for (int i = 0; i < values.size(); ++i) for (int i = 0; i < values.size(); ++i)
{ {
@ -155,7 +155,7 @@ namespace CSMWorld
throw std::runtime_error("invalid land normals data"); throw std::runtime_error("invalid land normals data");
Land copy = record.get(); Land copy = record.get();
copy.setDataLoaded(Land::DATA_VNML); copy.add(Land::DATA_VNML);
for (int i = 0; i < values.size(); ++i) for (int i = 0; i < values.size(); ++i)
{ {
@ -202,7 +202,7 @@ namespace CSMWorld
throw std::runtime_error("invalid land heights data"); throw std::runtime_error("invalid land heights data");
Land copy = record.get(); Land copy = record.get();
copy.setDataLoaded(Land::DATA_VHGT); copy.add(Land::DATA_VHGT);
for (int i = 0; i < values.size(); ++i) for (int i = 0; i < values.size(); ++i)
{ {
@ -249,7 +249,7 @@ namespace CSMWorld
throw std::runtime_error("invalid land colours data"); throw std::runtime_error("invalid land colours data");
Land copy = record.get(); Land copy = record.get();
copy.setDataLoaded(Land::DATA_VCLR); copy.add(Land::DATA_VCLR);
for (int i = 0; i < values.size(); ++i) for (int i = 0; i < values.size(); ++i)
{ {
@ -296,7 +296,7 @@ namespace CSMWorld
throw std::runtime_error("invalid land textures data"); throw std::runtime_error("invalid land textures data");
Land copy = record.get(); Land copy = record.get();
copy.setDataLoaded(Land::DATA_VTEX); copy.add(Land::DATA_VTEX);
for (int i = 0; i < values.size(); ++i) for (int i = 0; i < values.size(); ++i)
{ {

15
apps/opencs/model/world/commands.hpp
View file

@ -44,6 +44,15 @@ namespace CSMWorld
bool mChanged; bool mChanged;
}; };
/// \brief Adds LandTexture records and modifies texture indices as needed.
///
/// LandTexture records are different from other types of records, because
/// they only effect the current plugin. Thus, when modifying or copying
/// a Land record, all of the LandTexture records referenced need to be
/// added to the current plugin. Since these newly added LandTextures could
/// have indices that conflict with pre-existing LandTextures in the current
/// plugin, the indices might have to be changed, both for the newly added
/// LandRecord and within the Land record.
class ImportLandTexturesCommand : public QUndoCommand class ImportLandTexturesCommand : public QUndoCommand
{ {
public: public:
@ -71,6 +80,9 @@ namespace CSMWorld
std::vector<std::string> mCreatedTextures; std::vector<std::string> mCreatedTextures;
}; };
/// \brief This command is used to fix LandTexture records and texture
/// indices after cloning a Land. See ImportLandTexturesCommand for
/// details.
class CopyLandTexturesCommand : public ImportLandTexturesCommand class CopyLandTexturesCommand : public ImportLandTexturesCommand
{ {
public: public:
@ -90,6 +102,9 @@ namespace CSMWorld
std::string mDestId; std::string mDestId;
}; };
/// \brief This command brings a land record into the current plugin, adding
/// LandTexture records and modifying texture indices as needed.
/// \note See ImportLandTextures for more details.
class TouchLandCommand : public ImportLandTexturesCommand class TouchLandCommand : public ImportLandTexturesCommand
{ {
public: public:

2
apps/opencs/model/world/idtable.cpp
View file

@ -336,7 +336,7 @@ CSMWorld::LandTextureIdTable::ImportResults CSMWorld::LandTextureIdTable::import
int oldRow = idCollection()->searchId(id); int oldRow = idCollection()->searchId(id);
// If it does not exist or it is in the current plugin, it can be skipped. // If it does not exist or it is in the current plugin, it can be skipped.
if (oldRow <= 0 || plugin == 0) if (oldRow < 0 || plugin == 0)
{ {
results.recordMapping.push_back(std::make_pair(id, id)); results.recordMapping.push_back(std::make_pair(id, id));
continue; continue;

2
apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp
View file

@ -17,8 +17,6 @@ namespace mwmp
{ {
DEBUG_PRINTF(strPacketID.c_str()); DEBUG_PRINTF(strPacketID.c_str());
packet.Send(true);
//Todo: Script::Call<Script::CallbackIdentity("OnPlayerTopic")>(player.getId()); //Todo: Script::Call<Script::CallbackIdentity("OnPlayerTopic")>(player.getId());
Networking::get().getState().getEventCtrl().Call<CoreEvent::ON_PLAYER_TOPIC>(player); Networking::get().getState().getEventCtrl().Call<CoreEvent::ON_PLAYER_TOPIC>(player);
} }

17
apps/openmw/mwbase/dialoguemanager.hpp
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;
@ -69,15 +74,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
View file

@ -139,7 +139,7 @@ namespace MWDialogue
} }
} }
bool DialogueManager::startDialogue (const MWWorld::Ptr& actor, Response& response) bool DialogueManager::startDialogue (const MWWorld::Ptr& actor, ResponseCallback* callback)
{ {
updateGlobals(); updateGlobals();
@ -189,7 +189,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;
@ -278,9 +278,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 =
@ -312,7 +311,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)
{ {
@ -333,7 +332,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)
@ -363,8 +361,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);
} }
} }
} }
@ -380,7 +377,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);
} }
@ -389,18 +386,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
@ -425,10 +420,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)
@ -447,7 +441,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.
@ -473,7 +467,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)
@ -499,7 +492,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;
@ -548,7 +541,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
@ -561,7 +554,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);
@ -582,7 +575,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
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();
@ -92,16 +93,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.

6
apps/openmw/mwdialogue/journalimp.cpp
View file

@ -95,11 +95,15 @@ 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)
{
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);

104
apps/openmw/mwgui/dialogue.cpp
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,52 +395,46 @@ 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;
if (!MWBase::Environment::get().getDialogueManager()->startDialogue(actor, response))
{
// 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).
MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Dialogue);
if (isCompanion())
MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Companion, mPtr);
return;
}
MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mGoodbyeButton);
mGoodbye = false;
bool sameActor = (mPtr == actor); bool sameActor = (mPtr == actor);
mPtr = actor;
mTopicsList->setEnabled(true);
setTitle(mPtr.getClass().getName(mPtr));
mTopicsList->clear();
if (!sameActor) if (!sameActor)
{ {
for (std::vector<DialogueText*>::iterator it = mHistoryContents.begin(); it != mHistoryContents.end(); ++it) for (std::vector<DialogueText*>::iterator it = mHistoryContents.begin(); it != mHistoryContents.end(); ++it)
delete (*it); delete (*it);
mHistoryContents.clear(); mHistoryContents.clear();
mKeywords.clear(); mKeywords.clear();
updateTopicsPane(); 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();
} }
for (std::vector<Link*>::iterator it = mLinks.begin(); it != mLinks.end(); ++it) mPtr = actor;
mDeleteLater.push_back(*it); // Links are not deleted right away to prevent issues with event handlers mGoodbye = false;
mLinks.clear(); mTopicsList->setEnabled(true);
if (!MWBase::Environment::get().getDialogueManager()->startDialogue(actor, mGreetingCallback.get()))
{
// 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).
MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Dialogue);
mPtr = MWWorld::Ptr();
if (isCompanion(actor))
MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Companion, actor);
return;
}
MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mGoodbyeButton);
setTitle(mPtr.getClass().getName(mPtr));
updateTopicsPane();
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()
@ -698,12 +707,13 @@ namespace MWGui
bool DialogueWindow::isCompanion() bool DialogueWindow::isCompanion()
{ {
return !mPtr.getClass().getScript(mPtr).empty() return isCompanion(mPtr);
&& mPtr.getRefData().getLocals().getIntVar(mPtr.getClass().getScript(mPtr), "companion");
} }
void DialogueWindow::onPersuadeResult(const std::string &title, const std::string &text) bool DialogueWindow::isCompanion(const MWWorld::Ptr& actor)
{ {
addResponse(title, text); return !actor.getClass().getScript(actor).empty()
&& actor.getRefData().getLocals().getIntVar(actor.getClass().getScript(actor), "companion");
} }
} }

14
apps/openmw/mwgui/dialogue.hpp
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;
@ -133,9 +134,9 @@ namespace MWGui
protected: protected:
void updateTopics(); void updateTopics();
void updateTopicsPane(); void updateTopicsPane();
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);
@ -179,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
View file

@ -40,7 +40,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"
@ -243,8 +242,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;
@ -542,6 +541,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)
@ -549,7 +549,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
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
View file

@ -252,6 +252,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
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
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
View file

@ -157,16 +157,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());
} }
@ -1350,7 +1348,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>);

6
apps/openmw/mwworld/inventorystore.cpp
View file

@ -354,17 +354,15 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
Ptr rightRing = *slots_.at(Slot_RightRing); Ptr rightRing = *slots_.at(Slot_RightRing);
// we want to swap cheaper ring only if both are equipped // we want to swap cheaper ring only if both are equipped
if (rightRing.getClass().getValue(rightRing) < old.getClass().getValue(old)) if (old.getClass().getValue (old) >= rightRing.getClass().getValue (rightRing))
{
continue; continue;
}
} }
} }
if (old.getTypeName() == typeid(ESM::Clothing).name()) if (old.getTypeName() == typeid(ESM::Clothing).name())
{ {
// check value // check value
if (old.getClass().getValue (old) > test.getClass().getValue (test)) if (old.getClass().getValue (old) >= test.getClass().getValue (test))
// old clothing was more valuable // old clothing was more valuable
continue; continue;
} }

376
apps/openmw/mwworld/worldimp.hpp
View file

@ -69,7 +69,7 @@ namespace MWWorld
/// \brief The game world and its visual representation /// \brief The game world and its visual representation
class World : public MWBase::World class World final: public MWBase::World
{ {
Resource::ResourceSystem* mResourceSystem; Resource::ResourceSystem* mResourceSystem;
@ -137,7 +137,7 @@ namespace MWWorld
MWWorld::Ptr getFacedObject(float maxDistance, bool ignorePlayer=true); MWWorld::Ptr getFacedObject(float maxDistance, bool ignorePlayer=true);
public: // FIXME public: // FIXME
void removeContainerScripts(const Ptr& reference); void removeContainerScripts(const Ptr& reference) override;
private: private:
void addContainerScripts(const Ptr& reference, CellStore* cell); void addContainerScripts(const Ptr& reference, CellStore* cell);
void PCDropped (const Ptr& item); void PCDropped (const Ptr& item);
@ -191,210 +191,210 @@ namespace MWWorld
virtual ~World(); virtual ~World();
virtual void startNewGame (bool bypass); void startNewGame (bool bypass) override;
///< \param bypass Bypass regular game start. ///< \param bypass Bypass regular game start.
virtual void clear(); void clear() override;
virtual int countSavedGameRecords() const; int countSavedGameRecords() const override;
virtual int countSavedGameCells() const; int countSavedGameCells() const override;
virtual void write (ESM::ESMWriter& writer, Loading::Listener& progress) const; void write (ESM::ESMWriter& writer, Loading::Listener& progress) const override;
virtual void readRecord (ESM::ESMReader& reader, uint32_t type, void readRecord (ESM::ESMReader& reader, uint32_t type,
const std::map<int, int>& contentFileMap); const std::map<int, int>& contentFileMap) override;
virtual CellStore *getExterior (int x, int y); CellStore *getExterior (int x, int y) override;
virtual CellStore *getInterior (const std::string& name); CellStore *getInterior (const std::string& name) override;
virtual CellStore *getCell (const ESM::CellId& id); CellStore *getCell (const ESM::CellId& id) override;
//switch to POV before showing player's death animation //switch to POV before showing player's death animation
virtual void useDeathCamera(); void useDeathCamera() override;
virtual void setWaterHeight(const float height); void setWaterHeight(const float height) override;
virtual bool toggleWater(); bool toggleWater() override;
virtual bool toggleWorld(); bool toggleWorld() override;
virtual void adjustSky(); void adjustSky() override;
virtual const Fallback::Map *getFallback() const; const Fallback::Map *getFallback() const override;
virtual Player& getPlayer(); Player& getPlayer() override;
virtual MWWorld::Ptr getPlayerPtr(); MWWorld::Ptr getPlayerPtr() override;
virtual const MWWorld::ESMStore& getStore() const; const MWWorld::ESMStore& getStore() const override;
virtual std::vector<ESM::ESMReader>& getEsmReader(); std::vector<ESM::ESMReader>& getEsmReader() override;
virtual LocalScripts& getLocalScripts(); LocalScripts& getLocalScripts() override;
virtual bool hasCellChanged() const; bool hasCellChanged() const override;
///< Has the set of active cells changed, since the last frame? ///< Has the set of active cells changed, since the last frame?
virtual bool isCellExterior() const; bool isCellExterior() const override;
virtual bool isCellQuasiExterior() const; bool isCellQuasiExterior() const override;
virtual osg::Vec2f getNorthVector (const CellStore* cell); osg::Vec2f getNorthVector (const CellStore* cell) override;
///< get north vector for given interior cell ///< get north vector for given interior cell
virtual void getDoorMarkers (MWWorld::CellStore* cell, std::vector<DoorMarker>& out); void getDoorMarkers (MWWorld::CellStore* cell, std::vector<DoorMarker>& out) override;
///< get a list of teleport door markers for a given cell, to be displayed on the local map ///< get a list of teleport door markers for a given cell, to be displayed on the local map
virtual void setGlobalInt (const std::string& name, int value); void setGlobalInt (const std::string& name, int value) override;
///< Set value independently from real type. ///< Set value independently from real type.
virtual void setGlobalFloat (const std::string& name, float value); void setGlobalFloat (const std::string& name, float value) override;
///< Set value independently from real type. ///< Set value independently from real type.
virtual int getGlobalInt (const std::string& name) const; int getGlobalInt (const std::string& name) const override;
///< Get value independently from real type. ///< Get value independently from real type.
virtual float getGlobalFloat (const std::string& name) const; float getGlobalFloat (const std::string& name) const override;
///< Get value independently from real type. ///< Get value independently from real type.
virtual char getGlobalVariableType (const std::string& name) const; char getGlobalVariableType (const std::string& name) const override;
///< Return ' ', if there is no global variable with this name. ///< Return ' ', if there is no global variable with this name.
virtual std::string getCellName (const MWWorld::CellStore *cell = 0) const; std::string getCellName (const MWWorld::CellStore *cell = 0) const override;
///< Return name of the cell. ///< Return name of the cell.
/// ///
/// \note If cell==0, the cell the player is currently in will be used instead to /// \note If cell==0, the cell the player is currently in will be used instead to
/// generate a name. /// generate a name.
virtual void removeRefScript (MWWorld::RefData *ref); void removeRefScript (MWWorld::RefData *ref) override;
//< Remove the script attached to ref from mLocalScripts //< Remove the script attached to ref from mLocalScripts
virtual Ptr getPtr (const std::string& name, bool activeOnly); Ptr getPtr (const std::string& name, bool activeOnly) override;
///< Return a pointer to a liveCellRef with the given name. ///< Return a pointer to a liveCellRef with the given name.
/// \param activeOnly do non search inactive cells. /// \param activeOnly do non search inactive cells.
virtual Ptr searchPtr (const std::string& name, bool activeOnly); Ptr searchPtr (const std::string& name, bool activeOnly) override;
///< Return a pointer to a liveCellRef with the given name. ///< Return a pointer to a liveCellRef with the given name.
/// \param activeOnly do non search inactive cells. /// \param activeOnly do non search inactive cells.
virtual Ptr searchPtrViaActorId (int actorId); Ptr searchPtrViaActorId (int actorId) override;
///< Search is limited to the active cells. ///< Search is limited to the active cells.
virtual MWWorld::Ptr findContainer (const MWWorld::ConstPtr& ptr); MWWorld::Ptr findContainer (const MWWorld::ConstPtr& ptr) override;
///< Return a pointer to a liveCellRef which contains \a ptr. ///< Return a pointer to a liveCellRef which contains \a ptr.
/// \note Search is limited to the active cells. /// \note Search is limited to the active cells.
virtual void adjustPosition (const Ptr& ptr, bool force); void adjustPosition (const Ptr& ptr, bool force) override;
///< Adjust position after load to be on ground. Must be called after model load. ///< Adjust position after load to be on ground. Must be called after model load.
/// @param force do this even if the ptr is flying /// @param force do this even if the ptr is flying
virtual void fixPosition (const Ptr& actor); void fixPosition (const Ptr& actor) override;
///< Attempt to fix position so that the Ptr is no longer inside collision geometry. ///< Attempt to fix position so that the Ptr is no longer inside collision geometry.
virtual void enable (const Ptr& ptr); void enable (const Ptr& ptr) override;
virtual void disable (const Ptr& ptr); void disable (const Ptr& ptr) override;
virtual void advanceTime (double hours, bool incremental = false); void advanceTime (double hours, bool incremental = false) override;
///< Advance in-game time. ///< Advance in-game time.
virtual void setHour (double hour); void setHour (double hour) override;
///< Set in-game time hour. ///< Set in-game time hour.
virtual void setMonth (int month); void setMonth (int month) override;
///< Set in-game time month. ///< Set in-game time month.
virtual void setDay (int day); void setDay (int day) override;
///< Set in-game time day. ///< Set in-game time day.
virtual int getDay() const; int getDay() const override;
virtual int getMonth() const; int getMonth() const override;
virtual int getYear() const; int getYear() const override;
virtual std::string getMonthName (int month = -1) const; std::string getMonthName (int month = -1) const override;
///< Return name of month (-1: current month) ///< Return name of month (-1: current month)
virtual TimeStamp getTimeStamp() const; TimeStamp getTimeStamp() const override;
///< Return current in-game time stamp. ///< Return current in-game time stamp.
virtual bool toggleSky(); bool toggleSky() override;
///< \return Resulting mode ///< \return Resulting mode
virtual void changeWeather (const std::string& region, const unsigned int id); void changeWeather (const std::string& region, const unsigned int id) override;
virtual int getCurrentWeather() const; int getCurrentWeather() const override;
virtual int getMasserPhase() const; int getMasserPhase() const override;
virtual int getSecundaPhase() const; int getSecundaPhase() const override;
virtual void setMoonColour (bool red); void setMoonColour (bool red) override;
virtual void modRegion(const std::string &regionid, const std::vector<char> &chances); void modRegion(const std::string &regionid, const std::vector<char> &chances) override;
virtual float getTimeScaleFactor() const; float getTimeScaleFactor() const override;
virtual void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true); void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true) override;
///< Move to interior cell. ///< Move to interior cell.
///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
virtual void changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true); void changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true) override;
///< Move to exterior cell. ///< Move to exterior cell.
///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true); void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true) override;
///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
virtual const ESM::Cell *getExterior (const std::string& cellName) const; const ESM::Cell *getExterior (const std::string& cellName) const override;
///< Return a cell matching the given name or a 0-pointer, if there is no such cell. ///< Return a cell matching the given name or a 0-pointer, if there is no such cell.
virtual void markCellAsUnchanged(); void markCellAsUnchanged() override;
virtual MWWorld::Ptr getFacedObject(); MWWorld::Ptr getFacedObject() override;
///< Return pointer to the object the player is looking at, if it is within activation range ///< Return pointer to the object the player is looking at, if it is within activation range
virtual float getDistanceToFacedObject(); float getDistanceToFacedObject() override;
/// Returns a pointer to the object the provided object would hit (if within the /// Returns a pointer to the object the provided object would hit (if within the
/// specified distance), and the point where the hit occurs. This will attempt to /// specified distance), and the point where the hit occurs. This will attempt to
/// use the "Head" node as a basis. /// use the "Head" node as a basis.
virtual std::pair<MWWorld::Ptr,osg::Vec3f> getHitContact(const MWWorld::ConstPtr &ptr, float distance, std::vector<MWWorld::Ptr> &targets); std::pair<MWWorld::Ptr,osg::Vec3f> getHitContact(const MWWorld::ConstPtr &ptr, float distance, std::vector<MWWorld::Ptr> &targets) override;
/// @note No-op for items in containers. Use ContainerStore::removeItem instead. /// @note No-op for items in containers. Use ContainerStore::removeItem instead.
virtual void deleteObject (const Ptr& ptr); void deleteObject (const Ptr& ptr) override;
virtual void undeleteObject (const Ptr& ptr); void undeleteObject (const Ptr& ptr) override;
virtual MWWorld::Ptr moveObject (const Ptr& ptr, float x, float y, float z); MWWorld::Ptr moveObject (const Ptr& ptr, float x, float y, float z) override;
///< @return an updated Ptr in case the Ptr's cell changes ///< @return an updated Ptr in case the Ptr's cell changes
virtual MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, float x, float y, float z, bool movePhysics=true); MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, float x, float y, float z, bool movePhysics=true) override;
///< @return an updated Ptr ///< @return an updated Ptr
virtual void scaleObject (const Ptr& ptr, float scale); void scaleObject (const Ptr& ptr, float scale) override;
/// World rotates object, uses radians /// World rotates object, uses radians
/// @note Rotations via this method use a different rotation order than the initial rotations in the CS. This /// @note Rotations via this method use a different rotation order than the initial rotations in the CS. This
/// could be considered a bug, but is needed for MW compatibility. /// could be considered a bug, but is needed for MW compatibility.
/// \param adjust indicates rotation should be set or adjusted /// \param adjust indicates rotation should be set or adjusted
virtual void rotateObject (const Ptr& ptr,float x,float y,float z, bool adjust = false); void rotateObject (const Ptr& ptr,float x,float y,float z, bool adjust = false) override;
virtual MWWorld::Ptr placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos); MWWorld::Ptr placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos) override;
///< Place an object. Makes a copy of the Ptr. ///< Place an object. Makes a copy of the Ptr.
virtual MWWorld::Ptr safePlaceObject (const MWWorld::ConstPtr& ptr, const MWWorld::ConstPtr& referenceObject, MWWorld::CellStore* referenceCell, int direction, float distance); MWWorld::Ptr safePlaceObject (const MWWorld::ConstPtr& ptr, const MWWorld::ConstPtr& referenceObject, MWWorld::CellStore* referenceCell, int direction, float distance) override;
///< Place an object in a safe place next to \a referenceObject. \a direction and \a distance specify the wanted placement ///< Place an object in a safe place next to \a referenceObject. \a direction and \a distance specify the wanted placement
/// relative to \a referenceObject (but the object may be placed somewhere else if the wanted location is obstructed). /// relative to \a referenceObject (but the object may be placed somewhere else if the wanted location is obstructed).
virtual float getMaxActivationDistance(); float getMaxActivationDistance() override;
virtual void indexToPosition (int cellX, int cellY, float &x, float &y, bool centre = false) void indexToPosition (int cellX, int cellY, float &x, float &y, bool centre = false)
const; const override;
///< Convert cell numbers to position. ///< Convert cell numbers to position.
virtual void positionToIndex (float x, float y, int &cellX, int &cellY) const; void positionToIndex (float x, float y, int &cellX, int &cellY) const override;
///< Convert position to cell numbers ///< Convert position to cell numbers
virtual void queueMovement(const Ptr &ptr, const osg::Vec3f &velocity); void queueMovement(const Ptr &ptr, const osg::Vec3f &velocity) override;
///< Queues movement for \a ptr (in local space), to be applied in the next call to ///< Queues movement for \a ptr (in local space), to be applied in the next call to
/// doPhysics. /// doPhysics.
@ -408,139 +408,139 @@ namespace MWWorld
End of tes3mp addition End of tes3mp addition
*/ */
virtual bool castRay (float x1, float y1, float z1, float x2, float y2, float z2); bool castRay (float x1, float y1, float z1, float x2, float y2, float z2) override;
///< cast a Ray and return true if there is an object in the ray path. ///< cast a Ray and return true if there is an object in the ray path.
virtual bool toggleCollisionMode(); bool toggleCollisionMode() override;
///< Toggle collision mode for player. If disabled player object should ignore ///< Toggle collision mode for player. If disabled player object should ignore
/// collisions and gravity. /// collisions and gravity.
///< \return Resulting mode ///< \return Resulting mode
virtual bool toggleRenderMode (MWRender::RenderMode mode); bool toggleRenderMode (MWRender::RenderMode mode) override;
///< Toggle a render mode. ///< Toggle a render mode.
///< \return Resulting mode ///< \return Resulting mode
virtual const ESM::Potion *createRecord (const ESM::Potion& record); const ESM::Potion *createRecord (const ESM::Potion& record) override;
///< Create a new record (of type potion) in the ESM store. ///< Create a new record (of type potion) in the ESM store.
/// \return pointer to created record /// \return pointer to created record
virtual const ESM::Spell *createRecord (const ESM::Spell& record); const ESM::Spell *createRecord (const ESM::Spell& record) override;
///< Create a new record (of type spell) in the ESM store. ///< Create a new record (of type spell) in the ESM store.
/// \return pointer to created record /// \return pointer to created record
virtual const ESM::Class *createRecord (const ESM::Class& record); const ESM::Class *createRecord (const ESM::Class& record) override;
///< Create a new record (of type class) in the ESM store. ///< Create a new record (of type class) in the ESM store.
/// \return pointer to created record /// \return pointer to created record
virtual const ESM::Cell *createRecord (const ESM::Cell& record); const ESM::Cell *createRecord (const ESM::Cell& record) override;
///< Create a new record (of type cell) in the ESM store. ///< Create a new record (of type cell) in the ESM store.
/// \return pointer to created record /// \return pointer to created record
virtual const ESM::NPC *createRecord(const ESM::NPC &record); const ESM::NPC *createRecord(const ESM::NPC &record) override;
///< Create a new record (of type npc) in the ESM store. ///< Create a new record (of type npc) in the ESM store.
/// \return pointer to created record /// \return pointer to created record
virtual const ESM::Creature *createRecord(const ESM::Creature &record); const ESM::Creature *createRecord(const ESM::Creature &record) override;
///< Create a new record (of type creature) in the ESM store. ///< Create a new record (of type creature) in the ESM store.
/// \return pointer to created record /// \return pointer to created record
virtual const ESM::Armor *createRecord (const ESM::Armor& record); const ESM::Armor *createRecord (const ESM::Armor& record) override;
///< Create a new record (of type armor) in the ESM store. ///< Create a new record (of type armor) in the ESM store.
/// \return pointer to created record /// \return pointer to created record
virtual const ESM::Weapon *createRecord (const ESM::Weapon& record); const ESM::Weapon *createRecord (const ESM::Weapon& record) override;
///< Create a new record (of type weapon) in the ESM store. ///< Create a new record (of type weapon) in the ESM store.
/// \return pointer to created record /// \return pointer to created record
virtual const ESM::Clothing *createRecord (const ESM::Clothing& record); const ESM::Clothing *createRecord (const ESM::Clothing& record) override;
///< Create a new record (of type clothing) in the ESM store. ///< Create a new record (of type clothing) in the ESM store.
/// \return pointer to created record /// \return pointer to created record
virtual const ESM::Enchantment *createRecord (const ESM::Enchantment& record); const ESM::Enchantment *createRecord (const ESM::Enchantment& record) override;
///< Create a new record (of type enchantment) in the ESM store. ///< Create a new record (of type enchantment) in the ESM store.
/// \return pointer to created record /// \return pointer to created record
virtual const ESM::Book *createRecord (const ESM::Book& record); const ESM::Book *createRecord (const ESM::Book& record) override;
///< Create a new record (of type book) in the ESM store. ///< Create a new record (of type book) in the ESM store.
/// \return pointer to created record /// \return pointer to created record
virtual const ESM::CreatureLevList *createOverrideRecord (const ESM::CreatureLevList& record); const ESM::CreatureLevList *createOverrideRecord (const ESM::CreatureLevList& record) override;
///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID. ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
/// \return pointer to created record /// \return pointer to created record
virtual const ESM::ItemLevList *createOverrideRecord (const ESM::ItemLevList& record); const ESM::ItemLevList *createOverrideRecord (const ESM::ItemLevList& record) override;
///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID. ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
/// \return pointer to created record /// \return pointer to created record
virtual void update (float duration, bool paused); void update (float duration, bool paused) override;
virtual void updateWindowManager (); void updateWindowManager () override;
virtual MWWorld::Ptr placeObject (const MWWorld::ConstPtr& object, float cursorX, float cursorY, int amount); MWWorld::Ptr placeObject (const MWWorld::ConstPtr& object, float cursorX, float cursorY, int amount) override;
///< copy and place an object into the gameworld at the specified cursor position ///< copy and place an object into the gameworld at the specified cursor position
/// @param object /// @param object
/// @param cursor X (relative 0-1) /// @param cursor X (relative 0-1)
/// @param cursor Y (relative 0-1) /// @param cursor Y (relative 0-1)
/// @param number of objects to place /// @param number of objects to place
virtual MWWorld::Ptr dropObjectOnGround (const MWWorld::Ptr& actor, const MWWorld::ConstPtr& object, int amount); MWWorld::Ptr dropObjectOnGround (const MWWorld::Ptr& actor, const MWWorld::ConstPtr& object, int amount) override;
///< copy and place an object into the gameworld at the given actor's position ///< copy and place an object into the gameworld at the given actor's position
/// @param actor giving the dropped object position /// @param actor giving the dropped object position
/// @param object /// @param object
/// @param number of objects to place /// @param number of objects to place
virtual bool canPlaceObject(float cursorX, float cursorY); bool canPlaceObject(float cursorX, float cursorY) override;
///< @return true if it is possible to place on object at specified cursor location ///< @return true if it is possible to place on object at specified cursor location
virtual void processChangedSettings(const Settings::CategorySettingVector& settings); void processChangedSettings(const Settings::CategorySettingVector& settings) override;
virtual bool isFlying(const MWWorld::Ptr &ptr) const; bool isFlying(const MWWorld::Ptr &ptr) const override;
virtual bool isSlowFalling(const MWWorld::Ptr &ptr) const; bool isSlowFalling(const MWWorld::Ptr &ptr) const override;
///Is the head of the creature underwater? ///Is the head of the creature underwater?
virtual bool isSubmerged(const MWWorld::ConstPtr &object) const; bool isSubmerged(const MWWorld::ConstPtr &object) const override;
virtual bool isSwimming(const MWWorld::ConstPtr &object) const; bool isSwimming(const MWWorld::ConstPtr &object) const override;
virtual bool isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f &pos) const; bool isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f &pos) const override;
virtual bool isUnderwater(const MWWorld::ConstPtr &object, const float heightRatio) const; bool isUnderwater(const MWWorld::ConstPtr &object, const float heightRatio) const override;
virtual bool isWading(const MWWorld::ConstPtr &object) const; bool isWading(const MWWorld::ConstPtr &object) const override;
virtual bool isWaterWalkingCastableOnTarget(const MWWorld::ConstPtr &target) const; bool isWaterWalkingCastableOnTarget(const MWWorld::ConstPtr &target) const override;
virtual bool isOnGround(const MWWorld::Ptr &ptr) const; bool isOnGround(const MWWorld::Ptr &ptr) const override;
virtual osg::Matrixf getActorHeadTransform(const MWWorld::ConstPtr& actor) const; osg::Matrixf getActorHeadTransform(const MWWorld::ConstPtr& actor) const override;
virtual void togglePOV(); void togglePOV() override;
virtual bool isFirstPerson() const; bool isFirstPerson() const override;
virtual void togglePreviewMode(bool enable); void togglePreviewMode(bool enable) override;
virtual bool toggleVanityMode(bool enable); bool toggleVanityMode(bool enable) override;
virtual void allowVanityMode(bool allow); void allowVanityMode(bool allow) override;
virtual void togglePlayerLooking(bool enable); void togglePlayerLooking(bool enable) override;
virtual void changeVanityModeScale(float factor); void changeVanityModeScale(float factor) override;
virtual bool vanityRotateCamera(float * rot); bool vanityRotateCamera(float * rot) override;
virtual void setCameraDistance(float dist, bool adjust = false, bool override = true); void setCameraDistance(float dist, bool adjust = false, bool override = true) override;
virtual void setupPlayer(); void setupPlayer() override;
virtual void renderPlayer(); void renderPlayer() override;
/// open or close a non-teleport door (depending on current state) /// open or close a non-teleport door (depending on current state)
virtual void activateDoor(const MWWorld::Ptr& door); void activateDoor(const MWWorld::Ptr& door) override;
/// update movement state of a non-teleport door as specified /// update movement state of a non-teleport door as specified
/// @param state see MWClass::setDoorState /// @param state see MWClass::setDoorState
/// @note throws an exception when invoked on a teleport door /// @note throws an exception when invoked on a teleport door
virtual void activateDoor(const MWWorld::Ptr& door, int state); void activateDoor(const MWWorld::Ptr& door, int state) override;
/* /*
Start of tes3mp addition Start of tes3mp addition
Useful self-contained method for saving door states Useful self-contained method for saving door states
*/ */
virtual void saveDoorState(const MWWorld::Ptr& door, int state); void saveDoorState(const MWWorld::Ptr& door, int state) override;
/* /*
End of tes3mp addition End of tes3mp addition
*/ */
@ -550,37 +550,37 @@ namespace MWWorld
Make it possible to check whether a cell is active Make it possible to check whether a cell is active
*/ */
virtual bool isCellActive(MWWorld::CellStore* cell); bool isCellActive(MWWorld::CellStore* cell) override;
/* /*
End of tes3mp addition End of tes3mp addition
*/ */
virtual bool getPlayerStandingOn (const MWWorld::ConstPtr& object); ///< @return true if the player is standing on \a object bool getPlayerStandingOn (const MWWorld::ConstPtr& object) override; ///< @return true if the player is standing on \a object
virtual bool getActorStandingOn (const MWWorld::ConstPtr& object); ///< @return true if any actor is standing on \a object bool getActorStandingOn (const MWWorld::ConstPtr& object) override; ///< @return true if any actor is standing on \a object
virtual bool getPlayerCollidingWith(const MWWorld::ConstPtr& object); ///< @return true if the player is colliding with \a object bool getPlayerCollidingWith(const MWWorld::ConstPtr& object) override; ///< @return true if the player is colliding with \a object
virtual bool getActorCollidingWith (const MWWorld::ConstPtr& object); ///< @return true if any actor is colliding with \a object bool getActorCollidingWith (const MWWorld::ConstPtr& object) override; ///< @return true if any actor is colliding with \a object
virtual void hurtStandingActors (const MWWorld::ConstPtr& object, float dmgPerSecond); void hurtStandingActors (const MWWorld::ConstPtr& object, float dmgPerSecond) override;
///< Apply a health difference to any actors standing on \a object. ///< Apply a health difference to any actors standing on \a object.
/// To hurt actors, healthPerSecond should be a positive value. For a negative value, actors will be healed. /// To hurt actors, healthPerSecond should be a positive value. For a negative value, actors will be healed.
virtual void hurtCollidingActors (const MWWorld::ConstPtr& object, float dmgPerSecond); void hurtCollidingActors (const MWWorld::ConstPtr& object, float dmgPerSecond) override;
///< Apply a health difference to any actors colliding with \a object. ///< Apply a health difference to any actors colliding with \a object.
/// To hurt actors, healthPerSecond should be a positive value. For a negative value, actors will be healed. /// To hurt actors, healthPerSecond should be a positive value. For a negative value, actors will be healed.
virtual float getWindSpeed(); float getWindSpeed() override;
virtual void getContainersOwnedBy (const MWWorld::ConstPtr& npc, std::vector<MWWorld::Ptr>& out); void getContainersOwnedBy (const MWWorld::ConstPtr& npc, std::vector<MWWorld::Ptr>& out) override;
///< get all containers in active cells owned by this Npc ///< get all containers in active cells owned by this Npc
virtual void getItemsOwnedBy (const MWWorld::ConstPtr& npc, std::vector<MWWorld::Ptr>& out); void getItemsOwnedBy (const MWWorld::ConstPtr& npc, std::vector<MWWorld::Ptr>& out) override;
///< get all items in active cells owned by this Npc ///< get all items in active cells owned by this Npc
virtual bool getLOS(const MWWorld::ConstPtr& actor,const MWWorld::ConstPtr& targetActor); bool getLOS(const MWWorld::ConstPtr& actor,const MWWorld::ConstPtr& targetActor) override;
///< get Line of Sight (morrowind stupid implementation) ///< get Line of Sight (morrowind stupid implementation)
virtual float getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist, bool includeWater = false); float getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist, bool includeWater = false) override;
virtual void enableActorCollision(const MWWorld::Ptr& actor, bool enable); void enableActorCollision(const MWWorld::Ptr& actor, bool enable) override;
virtual int canRest(); int canRest() override;
///< check if the player is allowed to rest \n ///< check if the player is allowed to rest \n
/// 0 - yes \n /// 0 - yes \n
/// 1 - only waiting \n /// 1 - only waiting \n
@ -588,132 +588,132 @@ namespace MWWorld
/// 3 - enemies are nearby (not implemented) /// 3 - enemies are nearby (not implemented)
/// \todo Probably shouldn't be here /// \todo Probably shouldn't be here
virtual MWRender::Animation* getAnimation(const MWWorld::Ptr &ptr); MWRender::Animation* getAnimation(const MWWorld::Ptr &ptr) override;
virtual const MWRender::Animation* getAnimation(const MWWorld::ConstPtr &ptr) const; const MWRender::Animation* getAnimation(const MWWorld::ConstPtr &ptr) const override;
virtual void reattachPlayerCamera(); void reattachPlayerCamera() override;
/// \todo this does not belong here /// \todo this does not belong here
virtual void screenshot (osg::Image* image, int w, int h); void screenshot (osg::Image* image, int w, int h) override;
/// Find center of exterior cell above land surface /// Find center of exterior cell above land surface
/// \return false if exterior with given name not exists, true otherwise /// \return false if exterior with given name not exists, true otherwise
virtual bool findExteriorPosition(const std::string &name, ESM::Position &pos); bool findExteriorPosition(const std::string &name, ESM::Position &pos) override;
/// Find position in interior cell near door entrance /// Find position in interior cell near door entrance
/// \return false if interior with given name not exists, true otherwise /// \return false if interior with given name not exists, true otherwise
virtual bool findInteriorPosition(const std::string &name, ESM::Position &pos); bool findInteriorPosition(const std::string &name, ESM::Position &pos) override;
/// Enables or disables use of teleport spell effects (recall, intervention, etc). /// Enables or disables use of teleport spell effects (recall, intervention, etc).
virtual void enableTeleporting(bool enable); void enableTeleporting(bool enable) override;
/// Returns true if teleport spell effects are allowed. /// Returns true if teleport spell effects are allowed.
virtual bool isTeleportingEnabled() const; bool isTeleportingEnabled() const override;
/// Enables or disables use of levitation spell effect. /// Enables or disables use of levitation spell effect.
virtual void enableLevitation(bool enable); void enableLevitation(bool enable) override;
/// Returns true if levitation spell effect is allowed. /// Returns true if levitation spell effect is allowed.
virtual bool isLevitationEnabled() const; bool isLevitationEnabled() const override;
virtual bool getGodModeState(); bool getGodModeState() override;
virtual bool toggleGodMode(); bool toggleGodMode() override;
virtual bool toggleScripts(); bool toggleScripts() override;
virtual bool getScriptsEnabled() const; bool getScriptsEnabled() const override;
/** /**
* @brief startSpellCast attempt to start casting a spell. Might fail immediately if conditions are not met. * @brief startSpellCast attempt to start casting a spell. Might fail immediately if conditions are not met.
* @param actor * @param actor
* @return true if the spell can be casted (i.e. the animation should start) * @return true if the spell can be casted (i.e. the animation should start)
*/ */
virtual bool startSpellCast (const MWWorld::Ptr& actor); bool startSpellCast (const MWWorld::Ptr& actor) override;
/** /**
* @brief Cast the actual spell, should be called mid-animation * @brief Cast the actual spell, should be called mid-animation
* @param actor * @param actor
*/ */
virtual void castSpell (const MWWorld::Ptr& actor); void castSpell (const MWWorld::Ptr& actor) override;
virtual void launchMagicBolt (const std::string& spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection) override; void launchMagicBolt (const std::string& spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection) override;
virtual void launchProjectile (MWWorld::Ptr actor, MWWorld::ConstPtr projectile, void launchProjectile (MWWorld::Ptr actor, MWWorld::ConstPtr projectile,
const osg::Vec3f& worldPos, const osg::Quat& orient, MWWorld::Ptr bow, float speed, float attackStrength); const osg::Vec3f& worldPos, const osg::Quat& orient, MWWorld::Ptr bow, float speed, float attackStrength) override;
virtual const std::vector<std::string>& getContentFiles() const; const std::vector<std::string>& getContentFiles() const override;
virtual void breakInvisibility (const MWWorld::Ptr& actor); void breakInvisibility (const MWWorld::Ptr& actor) override;
// Are we in an exterior or pseudo-exterior cell and it's night? // Are we in an exterior or pseudo-exterior cell and it's night?
virtual bool isDark() const; bool isDark() const override;
virtual bool findInteriorPositionInWorldSpace(const MWWorld::CellStore* cell, osg::Vec3f& result); bool findInteriorPositionInWorldSpace(const MWWorld::CellStore* cell, osg::Vec3f& result) override;
/// Teleports \a ptr to the closest reference of \a id (e.g. DivineMarker, PrisonMarker, TempleMarker) /// Teleports \a ptr to the closest reference of \a id (e.g. DivineMarker, PrisonMarker, TempleMarker)
/// @note id must be lower case /// @note id must be lower case
virtual void teleportToClosestMarker (const MWWorld::Ptr& ptr, void teleportToClosestMarker (const MWWorld::Ptr& ptr,
const std::string& id); const std::string& id) override;
/// List all references (filtered by \a type) detected by \a ptr. The range /// List all references (filtered by \a type) detected by \a ptr. The range
/// is determined by the current magnitude of the "Detect X" magic effect belonging to \a type. /// is determined by the current magnitude of the "Detect X" magic effect belonging to \a type.
/// @note This also works for references in containers. /// @note This also works for references in containers.
virtual void listDetectedReferences (const MWWorld::Ptr& ptr, std::vector<MWWorld::Ptr>& out, void listDetectedReferences (const MWWorld::Ptr& ptr, std::vector<MWWorld::Ptr>& out,
DetectionType type); DetectionType type) override;
/// Update the value of some globals according to the world state, which may be used by dialogue entries. /// Update the value of some globals according to the world state, which may be used by dialogue entries.
/// This should be called when initiating a dialogue. /// This should be called when initiating a dialogue.
virtual void updateDialogueGlobals(); void updateDialogueGlobals() override;
/// Moves all stolen items from \a ptr to the closest evidence chest. /// Moves all stolen items from \a ptr to the closest evidence chest.
virtual void confiscateStolenItems(const MWWorld::Ptr& ptr); void confiscateStolenItems(const MWWorld::Ptr& ptr) override;
virtual void goToJail (); void goToJail () override;
/// Spawn a random creature from a levelled list next to the player /// Spawn a random creature from a levelled list next to the player
virtual void spawnRandomCreature(const std::string& creatureList); void spawnRandomCreature(const std::string& creatureList) override;
/// Spawn a blood effect for \a ptr at \a worldPosition /// Spawn a blood effect for \a ptr at \a worldPosition
virtual void spawnBloodEffect (const MWWorld::Ptr& ptr, const osg::Vec3f& worldPosition); void spawnBloodEffect (const MWWorld::Ptr& ptr, const osg::Vec3f& worldPosition) override;
virtual void spawnEffect (const std::string& model, const std::string& textureOverride, const osg::Vec3f& worldPos); void spawnEffect (const std::string& model, const std::string& textureOverride, const osg::Vec3f& worldPos) override;
virtual void explodeSpell(const osg::Vec3f& origin, const ESM::EffectList& effects, const MWWorld::Ptr& caster, const MWWorld::Ptr& ignore, void explodeSpell(const osg::Vec3f& origin, const ESM::EffectList& effects, const MWWorld::Ptr& caster, const MWWorld::Ptr& ignore,
ESM::RangeType rangeType, const std::string& id, const std::string& sourceName, ESM::RangeType rangeType, const std::string& id, const std::string& sourceName,
const bool fromProjectile=false); const bool fromProjectile=false) override;
virtual void activate (const MWWorld::Ptr& object, const MWWorld::Ptr& actor); void activate (const MWWorld::Ptr& object, const MWWorld::Ptr& actor) override;
/// @see MWWorld::WeatherManager::isInStorm /// @see MWWorld::WeatherManager::isInStorm
virtual bool isInStorm() const; bool isInStorm() const override;
/// @see MWWorld::WeatherManager::getStormDirection /// @see MWWorld::WeatherManager::getStormDirection
virtual osg::Vec3f getStormDirection() const; osg::Vec3f getStormDirection() const override;
/// Resets all actors in the current active cells to their original location within that cell. /// Resets all actors in the current active cells to their original location within that cell.
virtual void resetActors(); void resetActors() override;
virtual bool isWalkingOnWater (const MWWorld::ConstPtr& actor) const; bool isWalkingOnWater (const MWWorld::ConstPtr& actor) const override;
/// Return a vector aiming the actor's weapon towards a target. /// Return a vector aiming the actor's weapon towards a target.
/// @note The length of the vector is the distance between actor and target. /// @note The length of the vector is the distance between actor and target.
virtual osg::Vec3f aimToTarget(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target); osg::Vec3f aimToTarget(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target) override;
/// Return the distance between actor's weapon and target's collision box. /// Return the distance between actor's weapon and target's collision box.
virtual float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target); float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target) override;
virtual bool isPlayerInJail() const; bool isPlayerInJail() const override;
/// Return terrain height at \a worldPos position. /// Return terrain height at \a worldPos position.
virtual float getTerrainHeightAt(const osg::Vec3f& worldPos) const; float getTerrainHeightAt(const osg::Vec3f& worldPos) const override;
/// Return physical or rendering half extents of the given actor. /// Return physical or rendering half extents of the given actor.
virtual osg::Vec3f getHalfExtents(const MWWorld::ConstPtr& actor, bool rendering=false) const; osg::Vec3f getHalfExtents(const MWWorld::ConstPtr& actor, bool rendering=false) const override;
/// Export scene graph to a file and return the filename. /// Export scene graph to a file and return the filename.
/// \param ptr object to export scene graph for (if empty, export entire scene graph) /// \param ptr object to export scene graph for (if empty, export entire scene graph)
virtual std::string exportSceneGraph(const MWWorld::Ptr& ptr); std::string exportSceneGraph(const MWWorld::Ptr& ptr) override;
/// Preload VFX associated with this effect list /// Preload VFX associated with this effect list
virtual void preloadEffects(const ESM::EffectList* effectList); void preloadEffects(const ESM::EffectList* effectList) override;
}; };
} }

2
components/compiler/extensions0.cpp
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
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
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);

11
components/esm/loadland.cpp
View file

@ -315,16 +315,7 @@ namespace ESM
bool Land::isDataLoaded(int flags) const bool Land::isDataLoaded(int flags) const
{ {
return mLandData && (mLandData->mDataLoaded & flags) == (flags & mDataTypes); return mLandData && (mLandData->mDataLoaded & flags) == flags;
}
void Land::setDataLoaded(int flags)
{
if (!mLandData)
mLandData = new LandData;
mDataTypes |= flags;
mLandData->mDataLoaded |= flags;
} }
Land::Land (const Land& land) Land::Land (const Land& land)

1
components/esm/loadland.hpp
View file

@ -132,7 +132,6 @@ struct Land
void unloadData() const; void unloadData() const;
/// Check if given data type is loaded /// Check if given data type is loaded
/// @note We only check data types that *can* be loaded (present in mDataTypes)
bool isDataLoaded(int flags) const; bool isDataLoaded(int flags) const;
/// Sets the flags and creates a LandData if needed /// Sets the flags and creates a LandData if needed