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

Store TerrainType by havlue and handle by reference

Browse Source
This commit is contained in:
Tomasz Zieliński
2022-09-26 09:17:55 +02:00
parent cd3a1a02c2
commit 2bd30556a3
20 changed files with 162 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/widgets/AdventureMapClasses.cpp
View File

@ -499,25 +499,25 @@ std::map<TTerrainId, std::pair<SDL_Color, SDL_Color> > CMinimap::loadColors()
{
std::map<TTerrainId, std::pair<SDL_Color, SDL_Color> > ret;
for(const auto * terrain : CGI->terrainTypeHandler->terrains())
for(const auto & terrain : CGI->terrainTypeHandler->terrains())
{
SDL_Color normal =
{
ui8(terrain->minimapUnblocked[0]),
ui8(terrain->minimapUnblocked[1]),
ui8(terrain->minimapUnblocked[2]),
ui8(terrain.minimapUnblocked[0]),
ui8(terrain.minimapUnblocked[1]),
ui8(terrain.minimapUnblocked[2]),
ui8(255)
};
SDL_Color blocked =
{
ui8(terrain->minimapBlocked[0]),
ui8(terrain->minimapBlocked[1]),
ui8(terrain->minimapBlocked[2]),
ui8(terrain.minimapBlocked[0]),
ui8(terrain.minimapBlocked[1]),
ui8(terrain.minimapBlocked[2]),
ui8(255)
};
ret[terrain->id] = std::make_pair(normal, blocked);
ret[terrain.id] = std::make_pair(normal, blocked);
}
return ret;
}