diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-08-14 23:05:09 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-08-14 23:05:09 +0300 |
| commit | d30dbea925c769d9e1e073a14c55e739e0ce3f79 (patch) | |
| tree | 28e71ff454902088086d239309faeef8eec5c2f7 | |
| parent | 2d76c0c4a439a52a5beb1b5475c7c0dbb46482a0 (diff) | |
| download | mv-d30dbea925c769d9e1e073a14c55e739e0ce3f79.tar.gz mv-d30dbea925c769d9e1e073a14c55e739e0ce3f79.tar.bz2 mv-d30dbea925c769d9e1e073a14c55e739e0ce3f79.tar.xz mv-d30dbea925c769d9e1e073a14c55e739e0ce3f79.zip | |
fix compilation warnings.
| -rw-r--r-- | src/graphics.cpp | 2 | ||||
| -rw-r--r-- | src/gui/socialwindow.cpp | 4 | ||||
| -rw-r--r-- | src/gui/theme.cpp | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/graphics.cpp b/src/graphics.cpp index 8f6b805cd..a14d630bf 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -50,9 +50,11 @@ #endif #endif +#if SDL_BYTEORDER == SDL_LIL_ENDIAN static unsigned int *cR = nullptr; static unsigned int *cG = nullptr; static unsigned int *cB = nullptr; +#endif int MSDL_gfxBlitRGBA(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect) diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 38f8d22f5..34973f347 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -261,7 +261,7 @@ public: mConfirmDialog->addActionListener(this); } - void buildCounter(const int online0, const int total0) + void buildCounter(const int online0 A_UNUSED, const int total0 A_UNUSED) { if (online0 || total0) { @@ -338,7 +338,7 @@ public: { } - void buildCounter(const int online0, const int total0) + void buildCounter(const int online0 A_UNUSED, const int total0 A_UNUSED) { if (!player_node) return; diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 36841b53d..affec0b8c 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -1205,8 +1205,8 @@ ImageSet *Theme::getImageSetFromThemeXml(const std::string &name, if (rect.grid[0]) { Image *const image = rect.grid[0]; - const SDL_Rect &rect = image->mBounds; - if (rect.w && rect.h) + const SDL_Rect &rect2 = image->mBounds; + if (rect2.w && rect2.h) { ResourceManager *const resman = ResourceManager::getInstance(); ImageSet *const imageSet = resman->getSubImageSet(image, w, h); |