summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-04-13 22:45:36 +0300
committerAndrei Karas <akaras@inbox.ru>2018-04-13 22:45:36 +0300
commit7820d0268944116a2ebd590b85dab7f320276f3f (patch)
treead27a42375f80e919515a2aae2e9f946ddfa3687
parent82ed6c45226da8e7324764cc1abeb33b7d36a818 (diff)
downloadmv-7820d0268944116a2ebd590b85dab7f320276f3f.tar.gz
mv-7820d0268944116a2ebd590b85dab7f320276f3f.tar.bz2
mv-7820d0268944116a2ebd590b85dab7f320276f3f.tar.xz
mv-7820d0268944116a2ebd590b85dab7f320276f3f.zip
Fix code style.
-rw-r--r--src/progs/manaplus/actions/actions.cpp1
-rw-r--r--src/resources/image/subimage.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp
index 9c9f34a1f..188b76591 100644
--- a/src/progs/manaplus/actions/actions.cpp
+++ b/src/progs/manaplus/actions/actions.cpp
@@ -102,7 +102,6 @@
#include "resources/resourcemanager/resourcemanager.h"
#include "utils/chatutils.h"
-#include "utils/delete2.h"
#include "utils/foreach.h"
#include "utils/gettext.h"
#include "utils/parameters.h"
diff --git a/src/resources/image/subimage.cpp b/src/resources/image/subimage.cpp
index 1f747ed43..cf2b22dd8 100644
--- a/src/resources/image/subimage.cpp
+++ b/src/resources/image/subimage.cpp
@@ -231,5 +231,5 @@ int SubImage::calcMemoryLocal() const
{
return static_cast<int>(sizeof(SubImage) +
sizeof(std::map<float, SDL_Surface*>)) +
- Resource::calcMemoryLocal();
+ Image::calcMemoryLocal();
}