From 90f1819d8d2cb8988bec80904f456ffb3c28c655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 11 Jan 2020 02:05:26 +0100 Subject: [PATCH] Fix warnings raised by GCC 8 --- desktop_version/src/BinaryBlob.cpp | 2 +- desktop_version/src/Graphics.cpp | 8 ++++++-- desktop_version/src/GraphicsUtil.cpp | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/desktop_version/src/BinaryBlob.cpp b/desktop_version/src/BinaryBlob.cpp index 110b58f1..2102d22e 100644 --- a/desktop_version/src/BinaryBlob.cpp +++ b/desktop_version/src/BinaryBlob.cpp @@ -108,7 +108,7 @@ bool binaryBlob::unPackBinary(const char* name) } PHYSFS_close(handle); - printf("The complete reloaded file size: %li\n", size); + printf("The complete reloaded file size: %lli\n", size); for (int i = 0; i < 128; i += 1) { diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp index 52e4eb85..16ca99cb 100644 --- a/desktop_version/src/Graphics.cpp +++ b/desktop_version/src/Graphics.cpp @@ -3078,8 +3078,12 @@ void Graphics::bigrprint(int x, int y, std::string& t, int r, int g, int b, bool x -= (len(t)); - if (r < -1) r = -1; if (g < 0) g = 0; if (b < 0) b = 0; - if (r > 255) r = 255; if (g > 255) g = 255; if (b > 255) b = 255; + if (r < -1) r = -1; + if (g < 0) g = 0; + if (b < 0) b = 0; + if (r > 255) r = 255; + if (g > 255) g = 255; + if (b > 255) b = 255; ct.colour = getRGB(r, g, b); if (cen) diff --git a/desktop_version/src/GraphicsUtil.cpp b/desktop_version/src/GraphicsUtil.cpp index 11845432..f07c11c4 100644 --- a/desktop_version/src/GraphicsUtil.cpp +++ b/desktop_version/src/GraphicsUtil.cpp @@ -200,7 +200,7 @@ SDL_Surface * ScaleSurfaceSlow( SDL_Surface *_surface, int Width, int Height) // DrawPixel(_ret, static_cast(_stretch_factor_x * x) + o_x, //static_cast(_stretch_factor_y * y) + o_y, ReadPixel(_surface, x, y)); - return _ret; + return _ret; } SDL_Surface * FlipSurfaceHorizontal(SDL_Surface* _src)