Fixed Android compilation and warnings

This commit is contained in:
pelya
2021-01-25 21:31:09 +02:00
parent ac91ee617a
commit 2bc0595127
27 changed files with 67 additions and 63 deletions
+1 -1
View File
@@ -208,7 +208,7 @@ static inline int Center(int top, int height, uint size = FONT_HEIGHT_NORMAL)
*/
static inline int RescaleFrom854x480(int value)
{
return min(value * _cur_resolution.width / 854, value * _cur_resolution.height / 480);
return std::min(value * _cur_resolution.width / 854, value * _cur_resolution.height / 480);
}
extern DrawPixelInfo *_cur_dpi;