From 449e7b67734e85ba99d0a11fa46c4c7cc8b6bd2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20W=2E=20Urba=C5=84czyk?= <mwu-tow@gazeta.pl>
Date: Mon, 21 Jan 2008 18:22:51 +0000
Subject: [PATCH] Hopefully fixed buttons without making leak.

---
 AdventureMapButton.h | 4 +++-
 CPlayerInterface.cpp | 6 ++++++
 CPlayerInterface.h   | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/AdventureMapButton.h b/AdventureMapButton.h
index c27d3934a..0d5263964 100644
--- a/AdventureMapButton.h
+++ b/AdventureMapButton.h
@@ -25,7 +25,8 @@ AdventureMapButton<T>::AdventureMapButton
 	name=Name;
 	helpBox=HelpBox;
 	int est = LOCPLINT->playerID;
-	CDefHandler * temp = CGI->spriteh->giveDef(defName); //todo: moze cieknac
+	CDefHandler * temp = CGI->spriteh->giveDef(defName); 
+	temp->notFreeImgs = true;
 	for (int i=0;i<temp->ourImages.size();i++)
 	{
 		imgs.resize(1);
@@ -39,6 +40,7 @@ AdventureMapButton<T>::AdventureMapButton
 		for (int i=0; i<add->size();i++)
 		{
 			temp = CGI->spriteh->giveDef((*add)[i]);
+			temp->notFreeImgs = true;
 			for (int j=0;j<temp->ourImages.size();j++)
 			{
 				imgs[i+1].push_back(temp->ourImages[j].bitmap);
diff --git a/CPlayerInterface.cpp b/CPlayerInterface.cpp
index 25dc35009..ddd66be3a 100644
--- a/CPlayerInterface.cpp
+++ b/CPlayerInterface.cpp
@@ -316,6 +316,12 @@ CButtonBase::CButtonBase()
 	ourObj=NULL;
 	state=0;
 }
+CButtonBase::~CButtonBase()
+{
+	for(int i =0; i<imgs.size();i++)
+		for(int j=0;j<imgs[i].size();j++)
+			SDL_FreeSurface(imgs[i][j]);
+}
 void CButtonBase::show(SDL_Surface * to)
 {
 	if(!to)
diff --git a/CPlayerInterface.h b/CPlayerInterface.h
index 91225e8da..cfebe9ecc 100644
--- a/CPlayerInterface.h
+++ b/CPlayerInterface.h
@@ -55,7 +55,7 @@ public:
 	virtual void activate()=0;
 	virtual void deactivate()=0;
 	CButtonBase();
-	virtual ~CButtonBase(){};
+	virtual ~CButtonBase();
 };
 class ClickableL : public virtual CIntObject  //for left-clicks
 {