games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Aplly some fix for merge and explicitly specify type for std::max

Browse Source
This commit is contained in:
Arseniy Shestakov 2016-02-08 04:09:02 +03:00
parent 5f23091770
commit a13aec4fd7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/spells/ability.json
View File

@ -35,7 +35,7 @@
"duration" : [ "duration" : [
"UNITL_BEING_ATTACKED", "UNITL_BEING_ATTACKED",
"N_TURNS" "N_TURNS"
]} ]
} }
} }
} }

2
lib/mapObjects/ObjectTemplate.cpp
View File

@ -262,7 +262,7 @@ ui32 ObjectTemplate::getWidth() const
ui32 ret = 0; ui32 ret = 0;
for (auto row : usedTiles) for (auto row : usedTiles)
{ {
ret = std::max(ret, row.size()); ret = std::max<ui32>(ret, row.size());
} }
return ret; return ret;
} }