Merge branch '0.5' of gitorious.org:mana/mana

Conflicts:
	src/being.cpp
	src/client.cpp
	src/commandhandler.cpp
	src/gui/setup_video.cpp
	src/gui/socialwindow.cpp
	src/gui/viewport.cpp
	src/gui/widgets/browserbox.cpp
	src/gui/widgets/itemcontainer.cpp
	src/imageparticle.cpp
	src/localplayer.cpp
	src/localplayer.h
	src/map.cpp
	src/net/tmwa/beinghandler.cpp
	src/particle.cpp
	src/particle.h
	src/player.cpp
	src/player.h

1 files changed, 15 insertions, 0 deletions

diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index c63b626e..00e4726e 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -533,3 +533,18 @@ SDL_Surface *ResourceManager::loadSDLSurface(const std::string &filename)
 
     return tmp;
 }
+
+void ResourceManager::scheduleDelete(SDL_Surface* surface)
+{
+    mDeletedSurfaces.insert(surface);
+}
+
+void ResourceManager::clearScheduled()
+{
+    for (std::set<SDL_Surface*>::iterator i = mDeletedSurfaces.begin(),
+         i_end = mDeletedSurfaces.end(); i != i_end; ++i)
+    {
+        SDL_FreeSurface(*i);
+    }
+    mDeletedSurfaces.clear();
+}