summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/emotecontainer.cpp4
-rw-r--r--src/gui/emoteshortcutcontainer.cpp2
2 files changed, 1 insertions, 5 deletions
diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp
index cba744dd..fa63d4bb 100644
--- a/src/gui/emotecontainer.cpp
+++ b/src/gui/emotecontainer.cpp
@@ -23,10 +23,10 @@
#include <guichan/selectionlistener.hpp>
#include "emotecontainer.h"
-#include "emoteshortcut.h"
#include "../animatedsprite.h"
#include "../configuration.h"
+#include "../emoteshortcut.h"
#include "../graphics.h"
#include "../localplayer.h"
#include "../log.h"
@@ -69,8 +69,6 @@ EmoteContainer::EmoteContainer():
EmoteContainer::~EmoteContainer()
{
- delete_all(mEmoteImg);
-
if (!mSelImg)
{
mSelImg->decRef();
diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index f7917f85..f5ee9843 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -69,8 +69,6 @@ EmoteShortcutContainer::EmoteShortcutContainer():
EmoteShortcutContainer::~EmoteShortcutContainer()
{
mBackgroundImg->decRef();
-
- delete_all(mEmoteImg);
}
void EmoteShortcutContainer::draw(gcn::Graphics *graphics)