diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-04-21 18:57:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-04-21 18:57:48 +0300 |
| commit | 35cfd460655878c9a615abc8ea1cb2f7577a7f3b (patch) | |
| tree | 2b4cb899f7f442912f89de30f4a5ab0add0727ce /src/resources | |
| parent | cfe4c893ba4ba30379919636d3c508ebf1594e23 (diff) | |
| download | manaverse-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.gz manaverse-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.bz2 manaverse-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.xz manaverse-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.zip | |
some other fixes from cpplint.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/iteminfo.h | 4 | ||||
| -rw-r--r-- | src/resources/sdlimagehelper.cpp | 2 | ||||
| -rw-r--r-- | src/resources/subimage.cpp | 8 | ||||
| -rw-r--r-- | src/resources/wallpaper.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 12dbb3c03..01b5b2e6c 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -56,7 +56,7 @@ enum EquipmentSlot EQUIP_FIGHT1_SLOT = 8, EQUIP_FIGHT2_SLOT = 9, // Projectile: - // this item does not amount to one, it only + // this item does not amount to one, it only // indicates the chosen projectile. EQUIP_PROJECTILE_SLOT = 10 }; @@ -173,7 +173,7 @@ class ItemInfo final void setAttackAction(const std::string &attackAction); - // Handlers for seting and getting the string + // Handlers for seting and getting the string // used for particles when attacking void setMissileParticleFile(const std::string &s) { mMissileParticleFile = s; } diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp index 0318014cd..881368fd3 100644 --- a/src/resources/sdlimagehelper.cpp +++ b/src/resources/sdlimagehelper.cpp @@ -305,7 +305,7 @@ int SDLImageHelper::useOpenGL() const return 0; } -SDL_Surface *SDLImageHelper::create32BitSurface(int width,int height) const +SDL_Surface *SDLImageHelper::create32BitSurface(int width, int height) const { #if SDL_BYTEORDER == SDL_BIG_ENDIAN const int rmask = 0xff000000; diff --git a/src/resources/subimage.cpp b/src/resources/subimage.cpp index cad476f2f..c7e250b78 100644 --- a/src/resources/subimage.cpp +++ b/src/resources/subimage.cpp @@ -59,8 +59,8 @@ SubImage::SubImage(Image *const parent, SDL_Surface *const image, } // Set up the rectangle. - mBounds.x = static_cast<short>(x); - mBounds.y = static_cast<short>(y); + mBounds.x = static_cast<int16_t>(x); + mBounds.y = static_cast<int16_t>(y); mBounds.w = static_cast<uint16_t>(width); mBounds.h = static_cast<uint16_t>(height); if (mParent) @@ -92,8 +92,8 @@ SubImage::SubImage(Image *const parent, const GLuint image, mParent->incRef(); // Set up the rectangle. - mBounds.x = static_cast<short>(x); - mBounds.y = static_cast<short>(y); + mBounds.x = static_cast<int16_t>(x); + mBounds.y = static_cast<int16_t>(y); mBounds.w = static_cast<uint16_t>(width); mBounds.h = static_cast<uint16_t>(height); if (mParent) diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp index 6f81e99aa..58dffa131 100644 --- a/src/resources/wallpaper.cpp +++ b/src/resources/wallpaper.cpp @@ -108,7 +108,7 @@ void Wallpaper::loadWallpapers() // First, get the base filename of the image: std::string filename = *i; - unsigned long separator = filename.rfind("_"); + size_t separator = filename.rfind("_"); filename = filename.substr(0, separator); // Check that the base filename doesn't have any '%' markers. |