mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 18:39:40 +00:00
Code Issues Releases Wiki Activity

Fix cell names on world map not always being translated (Fixes #2832)

Browse source
This commit is contained in:
scrawl 2015-08-06 23:29:19 +02:00
parent 1e18a73b1c
commit e8c9d3ea2a
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/mapwindow.cpp
View file

@ -783,7 +783,7 @@ namespace MWGui
MyGUI::Widget* markerWidget = mGlobalMap->createWidget<MyGUI::Widget>("MarkerButton", MyGUI::Widget* markerWidget = mGlobalMap->createWidget<MyGUI::Widget>("MarkerButton",
widgetCoord, MyGUI::Align::Default); widgetCoord, MyGUI::Align::Default);
markerWidget->setUserString("Caption_TextOneLine", name); markerWidget->setUserString("Caption_TextOneLine", "#{sCell=" + name + "}");
setGlobalMapMarkerTooltip(markerWidget, x, y); setGlobalMapMarkerTooltip(markerWidget, x, y);

3
apps/openmw/mwgui/mapwindow.hpp
View file

@ -190,7 +190,8 @@ namespace MWGui
void renderGlobalMap(Loading::Listener* loadingListener); void renderGlobalMap(Loading::Listener* loadingListener);
// adds the marker to the global map /// adds the marker to the global map
/// @param name The ESM::Cell::mName
void addVisitedLocation(const std::string& name, int x, int y); void addVisitedLocation(const std::string& name, int x, int y);
// reveals this cell's map on the global map // reveals this cell's map on the global map

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

@ -993,7 +993,7 @@ namespace MWGui
if (cell->getCell()->isExterior()) if (cell->getCell()->isExterior())
{ {
if (!cell->getCell()->mName.empty()) if (!cell->getCell()->mName.empty())
mMap->addVisitedLocation ("#{sCell=" + name + "}", cell->getCell()->getGridX (), cell->getCell()->getGridY ()); mMap->addVisitedLocation (name, cell->getCell()->getGridX (), cell->getCell()->getGridY ());
mMap->cellExplored (cell->getCell()->getGridX(), cell->getCell()->getGridY()); mMap->cellExplored (cell->getCell()->getGridX(), cell->getCell()->getGridY());
} }