mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-08 17:06:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2400 from Capostrophic/colorcode

Browse source 
Escape number signs in cell/region names (bug #5047)
This commit is contained in:
Andrei Kortunov 2019-06-02 08:06:40 +04:00 committed by GitHub
commit 34fe896f4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -94,6 +94,7 @@
Bug #5025: Data race in the ICO::setMaximumNumOfObjectsToCompilePerFrame() Bug #5025: Data race in the ICO::setMaximumNumOfObjectsToCompilePerFrame()
Bug #5028: Offered price caps are not trading-specific Bug #5028: Offered price caps are not trading-specific
Bug #5038: Enchanting success chance calculations are blatantly wrong Bug #5038: Enchanting success chance calculations are blatantly wrong
Bug #5047: # in cell names sets color
Feature #1774: Handle AvoidNode Feature #1774: Handle AvoidNode
Feature #2229: Improve pathfinding AI Feature #2229: Improve pathfinding AI
Feature #3025: Analogue gamepad movement controls Feature #3025: Analogue gamepad movement controls

2
apps/openmw/mwclass/door.cpp
View file

@ -345,7 +345,7 @@ namespace MWClass
store.get<ESM::Region>().find(cell->mRegion); store.get<ESM::Region>().find(cell->mRegion);
//name as is, not a token //name as is, not a token
return region->mName; return MyGUI::TextIterator::toTagsString(region->mName);
} }
} }

1
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -1183,6 +1183,7 @@ namespace MWGui
else if (tag.compare(0, tokenLength, tokenToFind) == 0) else if (tag.compare(0, tokenLength, tokenToFind) == 0)
{ {
_result = mTranslationDataStorage.translateCellName(tag.substr(tokenLength)); _result = mTranslationDataStorage.translateCellName(tag.substr(tokenLength));
_result = MyGUI::TextIterator::toTagsString(_result);
} }
else if (Gui::replaceTag(tag, _result)) else if (Gui::replaceTag(tag, _result))
{ {