diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-08-15 02:20:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-08-15 02:20:52 +0300 |
| commit | 18b8d9888cd5ee8a533a1059f109d8de1c6b04d1 (patch) | |
| tree | db753995392ae8e6c5202467f417f31deb8717f0 /src/resources | |
| parent | c3b8f951d6e16dfb48cb71bd7ad3d7c43ea56c0a (diff) | |
| download | manaplus-18b8d9888cd5ee8a533a1059f109d8de1c6b04d1.tar.gz manaplus-18b8d9888cd5ee8a533a1059f109d8de1c6b04d1.tar.bz2 manaplus-18b8d9888cd5ee8a533a1059f109d8de1c6b04d1.tar.xz manaplus-18b8d9888cd5ee8a533a1059f109d8de1c6b04d1.zip | |
Fix code style again.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/mapreader.cpp | 8 | ||||
| -rw-r--r-- | src/resources/wallpaper.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 4e38d5b0f..8f38b0dab 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -43,11 +43,11 @@ #include "debug.h" -int inflateMemory(unsigned char *in, unsigned int inLength, - unsigned char *&out, unsigned int &outLength); +static int inflateMemory(unsigned char *in, unsigned int inLength, + unsigned char *&out, unsigned int &outLength); -int inflateMemory(unsigned char *in, unsigned int inLength, - unsigned char *&out); +static int inflateMemory(unsigned char *in, unsigned int inLength, + unsigned char *&out); static std::string resolveRelativePath(std::string base, std::string relative) { diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp index 316419627..9ee87e33a 100644 --- a/src/resources/wallpaper.cpp +++ b/src/resources/wallpaper.cpp @@ -44,7 +44,7 @@ struct WallpaperData int height; }; -bool wallpaperCompare(WallpaperData a, WallpaperData b); +static bool wallpaperCompare(WallpaperData a, WallpaperData b); static std::vector<WallpaperData> wallpaperData; static bool haveBackup; // Is the backup (no size given) version available? @@ -78,7 +78,7 @@ static void initDefaultWallpaperPaths() wallpaperFile = "login_wallpaper.png"; } -bool wallpaperCompare(WallpaperData a, WallpaperData b) +static bool wallpaperCompare(WallpaperData a, WallpaperData b) { int aa = a.width * a.height; int ab = b.width * b.height; |