games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Fix checking PlayerColor's for validness

Browse Source
This commit is contained in:
Ivan Savenko
2023-08-27 01:35:38 +03:00
parent 3b06abd0d7
commit ce20d913e0
25 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mapeditor/graphics.cpp
+1 -1
View File
@@ -227,7 +227,7 @@ void Graphics::blueToPlayersAdv(QImage * sur, PlayerColor player)
if(sur->format() == QImage::Format_Indexed8)
{
auto palette = sur->colorTable();
if(player < PlayerColor::PLAYER_LIMIT)
if(player.isValidPlayer())
{
for(int i = 0; i < 32; ++i)
palette[224 + i] = playerColorPalette[player.getNum() * 32 + i];
mapeditor/maphandler.cpp
+1 -1
View File
@@ -419,7 +419,7 @@ QRgb MapHandler::getTileColor(int x, int y, int z)
if(player == PlayerColor::NEUTRAL)
return graphics->neutralColor;
else
if (player < PlayerColor::PLAYER_LIMIT)
if (player.isValidPlayer())
return graphics->playerColors[player.getNum()];
}