games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-05 00:49:09 +02:00
Code Issues Releases Activity

Remove pointer to objects from TerrainTile

Browse Source
This commit is contained in:
Ivan Savenko
2025-03-19 14:40:45 +00:00
parent 63d00b080e
commit cd7732456a
26 changed files with 164 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/mapView/MapRendererContext.cpp
View File

@ -278,10 +278,12 @@ std::string MapRendererAdventureContext::overlayText(const int3 & coordinates) c
if (!tile.visitable())
return {};
if ( tile.visitableObjects.back()->ID == Obj::EVENT)
const auto * object = getObject(tile.visitableObjects.back());
if ( object->ID == Obj::EVENT)
return {};
return tile.visitableObjects.back()->getObjectName();
return object->getObjectName();
}
ColorRGBA MapRendererAdventureContext::overlayTextColor(const int3 & coordinates) const
@ -294,7 +296,7 @@ ColorRGBA MapRendererAdventureContext::overlayTextColor(const int3 & coordinates
if (!tile.visitable())
return {};
const auto * object = tile.visitableObjects.back();
const auto * object = getObject(tile.visitableObjects.back());
if (object->getOwner() == GAME->interface()->playerID)
return { 0, 192, 0};