mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 19:53:53 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2164 from akortunov/dialoguefix

Browse source 
Allow localization to use implicit keywords
This commit is contained in:
Bret Curtis 2019-03-29 15:07:56 +01:00 committed by GitHub
commit d5051bd43e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -39,6 +39,7 @@
Bug #4827: NiUVController is handled incorrectly
Bug #4828: Potion looping effects VFX are not shown for NPCs
Bug #4837: CTD when a mesh with NiLODNode root node with particles is loaded
Bug #4841: Russian localization ignores implicit keywords
Bug #4860: Actors outside of processing range visible for one frame after spawning
Bug #4867: Arbitrary text after local variable declarations breaks script compilation
Bug #4876: AI ratings handling inconsistencies

3
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
View file

@ -94,9 +94,6 @@ namespace MWDialogue
topicId = mTranslationDataStorage.topicStandardForm(topicId);
}
if (tok->isImplicitKeyword() && mTranslationDataStorage.hasTranslation())
continue;
if (mActorKnownTopics.count( topicId ))
mKnownTopics.insert( topicId );
}

1
apps/openmw/mwdialogue/hypertextparser.hpp
View file

@ -19,7 +19,6 @@ namespace MWDialogue
Token(const std::string & text, Type type) : mText(text), mType(type) {}
bool isExplicitLink() { return mType == ExplicitLink; }
bool isImplicitKeyword() { return mType == ImplicitKeyword; }
std::string mText;
Type mType;