Merge commit 'v1.1.11.27' into strippedstripped1.1.11.27

Conflicts:
	data/Makefile.am

10 files changed, 30 insertions, 1 deletions

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 8641854f0..100e1229c 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -3,6 +3,7 @@ SET(DATA_DIR ${PKG_DATADIR}/data)
 ADD_SUBDIRECTORY(graphics)
 ADD_SUBDIRECTORY(help)
 ADD_SUBDIRECTORY(icons)
+ADD_SUBDIRECTORY(perserver)
 ADD_SUBDIRECTORY(sfx)
 ADD_SUBDIRECTORY(themes)
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 7cebe7eb5..544e0c4aa 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = graphics help icons sfx themes
+SUBDIRS = graphics help icons perserver sfx themes
 
 EXTRA_DIST = CMakeLists.txt items.xsd
 
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index a7c21e5ea..2c6e4b933 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -10,6 +10,7 @@ SET (FILES
     close_button.png
     colors.xml
     deepbox.png
+    equipmentbox.png
     hscroll_left_default.png
     hscroll_left_highlight.png
     hscroll_left_pressed.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 6d04666a5..388d01663 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -13,6 +13,7 @@ gui_DATA =				\
 	close_button.png		\
 	colors.xml			\
 	deepbox.png			\
+	equipmentbox.png	\
 	hscroll_left_default.png	\
 	hscroll_left_highlight.png	\
 	hscroll_left_pressed.png	\
diff --git a/data/graphics/gui/equipmentbox.png b/data/graphics/gui/equipmentbox.png
new file mode 100644
index 000000000..a1a737a82
--- /dev/null
+++ b/data/graphics/gui/equipmentbox.png
diff --git a/data/perserver/CMakeLists.txt b/data/perserver/CMakeLists.txt
new file mode 100644
index 000000000..8b86a84b0
--- /dev/null
+++ b/data/perserver/CMakeLists.txt
@@ -0,0 +1 @@
+ADD_SUBDIRECTORY(default)
diff --git a/data/perserver/Makefile.am b/data/perserver/Makefile.am
new file mode 100644
index 000000000..b754c27f8
--- /dev/null
+++ b/data/perserver/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = default
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/data/perserver/default/CMakeLists.txt b/data/perserver/default/CMakeLists.txt
new file mode 100644
index 000000000..61bd98df1
--- /dev/null
+++ b/data/perserver/default/CMakeLists.txt
@@ -0,0 +1,5 @@
+SET (FILES
+    charcreation.xml
+    )
+
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/perserver/default)
diff --git a/data/perserver/default/Makefile.am b/data/perserver/default/Makefile.am
new file mode 100644
index 000000000..7ab87da67
--- /dev/null
+++ b/data/perserver/default/Makefile.am
@@ -0,0 +1,8 @@
+defaultdir = $(pkgdatadir)/data/perserver/default
+
+default_DATA =				\
+	charcreation.xml
+
+EXTRA_DIST =				\
+	$(default_DATA) \
+	CMakeLists.txt
diff --git a/data/perserver/default/charcreation.xml b/data/perserver/default/charcreation.xml
new file mode 100644
index 000000000..a7cb1a091
--- /dev/null
+++ b/data/perserver/default/charcreation.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author : 4144
+(C) ManaPlus Developers 2011. -->
+
+<chars>
+    <haircolor min="0" max="11" />
+    <hairstyle min="0" max="19" />
+    <stat min="1" max="9" sum="30" />
+</chars>