Merge commit 'v1.2.1.22' into stripped

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/CMakeLists.txt
	src/Makefile.am
	src/guichan/gui.cpp

1 files changed, 4 insertions, 1 deletions

diff --git a/src/map.h b/src/map.h
index 79dd01c41..db8b092de 100644
--- a/src/map.h
+++ b/src/map.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2004-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011  The ManaPlus Developers
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -498,6 +498,9 @@ class Map : public Properties, public ConfigListener
 
         void redrawMap();
 
+        bool empty()
+        { return mLayers.empty(); }
+
     protected:
         friend class Actor;
         friend class Minimap;