diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-12-22 02:10:59 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-12-22 02:10:59 +0300 |
commit | 1ff17739796e327e30a78b544be9865420d4c807 (patch) | |
tree | 929dd877616f25ca74943f4225e51cc01aecf928 | |
parent | 5133814218de74d57c7febadf61b3ab05216dc25 (diff) | |
download | manaplus-1ff17739796e327e30a78b544be9865420d4c807.tar.gz manaplus-1ff17739796e327e30a78b544be9865420d4c807.tar.bz2 manaplus-1ff17739796e327e30a78b544be9865420d4c807.tar.xz manaplus-1ff17739796e327e30a78b544be9865420d4c807.zip |
Remove default parameters from imageset.
-rw-r--r-- | src/resources/imageset.h | 7 | ||||
-rw-r--r-- | src/resources/loaders/imagesetloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/subimagesetloader.cpp | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/resources/imageset.h b/src/resources/imageset.h index 78907fbba..e31317731 100644 --- a/src/resources/imageset.h +++ b/src/resources/imageset.h @@ -40,8 +40,11 @@ class ImageSet notfinal : public Resource /** * Cuts the passed image in a grid of sub images. */ - ImageSet(Image *const img, const int w, const int h, - const int margin = 0, const int spacing = 0); + ImageSet(Image *const img, + const int w, + const int h, + const int margin, + const int spacing); A_DELETE_COPY(ImageSet) diff --git a/src/resources/loaders/imagesetloader.cpp b/src/resources/loaders/imagesetloader.cpp index 63b56d1fe..4afb4c40d 100644 --- a/src/resources/loaders/imagesetloader.cpp +++ b/src/resources/loaders/imagesetloader.cpp @@ -56,7 +56,7 @@ struct ImageSetLoader final reportAlways("Image loading error: %s", rl->path.c_str()); return nullptr; } - ImageSet *const res = new ImageSet(img, rl->w, rl->h); + ImageSet *const res = new ImageSet(img, rl->w, rl->h, 0, 0); img->decRef(); return res; } diff --git a/src/resources/loaders/subimagesetloader.cpp b/src/resources/loaders/subimagesetloader.cpp index ef47b164d..bef66e081 100644 --- a/src/resources/loaders/subimagesetloader.cpp +++ b/src/resources/loaders/subimagesetloader.cpp @@ -52,7 +52,10 @@ namespace if (rl->parent == nullptr) return nullptr; ImageSet *const res = new ImageSet(rl->parent, - rl->width, rl->height); + rl->width, + rl->height, + 0, + 0); return res; } }; |