AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-29 16:11:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed dialogue script error reporting

Browse Source
This commit is contained in:
Marc Zinnschlag 2012-11-16 12:47:09 +01:00
parent fd5671e6db
commit 89c7936534
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
View File

@ -129,7 +129,7 @@ namespace MWDialogue
mIsInChoice = false; mIsInChoice = false;
mActor = actor; mActor = actor;
MWMechanics::CreatureStats& creatureStats = MWWorld::Class::get (actor).getCreatureStats (actor); MWMechanics::CreatureStats& creatureStats = MWWorld::Class::get (actor).getCreatureStats (actor);
mTalkedTo = creatureStats.hasTalkedToPlayer(); mTalkedTo = creatureStats.hasTalkedToPlayer();
creatureStats.talkedToPlayer(); creatureStats.talkedToPlayer();
@ -175,7 +175,7 @@ namespace MWDialogue
bool DialogueManager::compile (const std::string& cmd,std::vector<Interpreter::Type_Code>& code) bool DialogueManager::compile (const std::string& cmd,std::vector<Interpreter::Type_Code>& code)
{ {
bool success = true; bool success = true;
try try
{ {
mErrorHandler.reset(); mErrorHandler.reset();
@ -197,12 +197,12 @@ namespace MWDialogue
Compiler::ScriptParser parser(mErrorHandler,mCompilerContext, locals, false); Compiler::ScriptParser parser(mErrorHandler,mCompilerContext, locals, false);
scanner.scan (parser); scanner.scan (parser);
if (!mErrorHandler.isGood()) if (!mErrorHandler.isGood())
success = false; success = false;
if (success) if (success)
parser.getCode (code); parser.getCode (code);
} }
catch (const Compiler::SourceException& /* error */) catch (const Compiler::SourceException& /* error */)
{ {
@ -211,7 +211,7 @@ namespace MWDialogue
} }
catch (const std::exception& error) catch (const std::exception& error)
{ {
printError (std::string ("An exception has been thrown: ") + error.what()); std::cerr << std::string ("Dialogue error: An exception has been thrown: ") + error.what() << std::endl;
success = false; success = false;
} }
@ -240,7 +240,7 @@ namespace MWDialogue
} }
catch (const std::exception& error) catch (const std::exception& error)
{ {
printError (std::string ("An exception has been thrown: ") + error.what()); std::cerr << std::string ("Dialogue error: An exception has been thrown: ") + error.what();
} }
} }
} }
@ -264,7 +264,7 @@ namespace MWDialogue
if (filter.search (*iter)) if (filter.search (*iter))
{ {
mActorKnownTopics.push_back (toLower (iter->mId)); mActorKnownTopics.push_back (toLower (iter->mId));
//does the player know the topic? //does the player know the topic?
if (mKnownTopics.find (toLower (iter->mId)) != mKnownTopics.end()) if (mKnownTopics.find (toLower (iter->mId)) != mKnownTopics.end())
{ {
@ -340,8 +340,8 @@ namespace MWDialogue
if (mDialogueMap[keyword].mType == ESM::Dialogue::Topic) if (mDialogueMap[keyword].mType == ESM::Dialogue::Topic)
{ {
Filter filter (mActor, mChoice, mTalkedTo); Filter filter (mActor, mChoice, mTalkedTo);
if (const ESM::DialInfo *info = filter.search (mDialogueMap[keyword])) if (const ESM::DialInfo *info = filter.search (mDialogueMap[keyword]))
{ {
std::string text = info->mResponse; std::string text = info->mResponse;
std::string script = info->mResultScript; std::string script = info->mResultScript;
@ -389,7 +389,7 @@ namespace MWDialogue
if (mDialogueMap[mLastTopic].mType == ESM::Dialogue::Topic) if (mDialogueMap[mLastTopic].mType == ESM::Dialogue::Topic)
{ {
Filter filter (mActor, mChoice, mTalkedTo); Filter filter (mActor, mChoice, mTalkedTo);
if (const ESM::DialInfo *info = filter.search (mDialogueMap[mLastTopic])) if (const ESM::DialInfo *info = filter.search (mDialogueMap[mLastTopic]))
{ {
mChoiceMap.clear(); mChoiceMap.clear();
@ -404,7 +404,7 @@ namespace MWDialogue
} }
} }
} }
updateTopics(); updateTopics();
} }
} }