From 66fa5b45e5b9d8ed1838f2ea336771cc1839cf92 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Wed, 9 Jun 2010 11:29:08 -0600
Subject: Add error.xml to client repository and move error.png

There is no reason why error.xml shouldn't be in this repository, as it is used
when no sprite data is present and is a very small file anyways. Servers can
still replace these if they want to. error.png is only used in sprites, so
should be in the new sprites folder too.

Reviewed-by: 4144
---
 data/graphics/CMakeLists.txt         |   1 +
 data/graphics/Makefile.am            |   2 +-
 data/graphics/images/CMakeLists.txt  |   1 -
 data/graphics/images/Makefile.am     |   3 +--
 data/graphics/images/error.png       | Bin 314 -> 0 bytes
 data/graphics/sprites/CMakeLists.txt |   6 ++++++
 data/graphics/sprites/Makefile.am    |   9 +++++++++
 data/graphics/sprites/error.png      | Bin 0 -> 314 bytes
 data/graphics/sprites/error.xml      |  10 ++++++++++
 9 files changed, 28 insertions(+), 4 deletions(-)
 delete mode 100644 data/graphics/images/error.png
 create mode 100644 data/graphics/sprites/CMakeLists.txt
 create mode 100644 data/graphics/sprites/Makefile.am
 create mode 100644 data/graphics/sprites/error.png
 create mode 100644 data/graphics/sprites/error.xml

(limited to 'data')

diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt
index 58d75523..5a9b0f65 100644
--- a/data/graphics/CMakeLists.txt
+++ b/data/graphics/CMakeLists.txt
@@ -1,2 +1,3 @@
 ADD_SUBDIRECTORY(gui)
 ADD_SUBDIRECTORY(images)
+ADD_SUBDIRECTORY(sprites)
diff --git a/data/graphics/Makefile.am b/data/graphics/Makefile.am
index e0003154..b77b57ca 100644
--- a/data/graphics/Makefile.am
+++ b/data/graphics/Makefile.am
@@ -1,4 +1,4 @@
 
 EXTRA_DIST = CMakeLists.txt
 
-SUBDIRS = gui images
+SUBDIRS = gui images sprites
diff --git a/data/graphics/images/CMakeLists.txt b/data/graphics/images/CMakeLists.txt
index 5181b4e1..6694f254 100644
--- a/data/graphics/images/CMakeLists.txt
+++ b/data/graphics/images/CMakeLists.txt
@@ -1,5 +1,4 @@
 SET(FILES
-    error.png
     login_wallpaper.png
     )
 
diff --git a/data/graphics/images/Makefile.am b/data/graphics/images/Makefile.am
index 0bc2a5cd..20ea859f 100644
--- a/data/graphics/images/Makefile.am
+++ b/data/graphics/images/Makefile.am
@@ -1,9 +1,8 @@
 imagesdir = $(pkgdatadir)/data/graphics/images
 
 images_DATA =				\
-	error.png				\
 	login_wallpaper.png
 
 EXTRA_DIST =				\
-	$(images_DATA) \
+	$(images_DATA)			\
 	CMakeLists.txt
diff --git a/data/graphics/images/error.png b/data/graphics/images/error.png
deleted file mode 100644
index 6fd7c1a8..00000000
Binary files a/data/graphics/images/error.png and /dev/null differ
diff --git a/data/graphics/sprites/CMakeLists.txt b/data/graphics/sprites/CMakeLists.txt
new file mode 100644
index 00000000..1d98772d
--- /dev/null
+++ b/data/graphics/sprites/CMakeLists.txt
@@ -0,0 +1,6 @@
+SET(FILES
+    error.png
+    error.xml
+    )
+
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/sprits)
diff --git a/data/graphics/sprites/Makefile.am b/data/graphics/sprites/Makefile.am
new file mode 100644
index 00000000..249ca5cd
--- /dev/null
+++ b/data/graphics/sprites/Makefile.am
@@ -0,0 +1,9 @@
+spritesdir = $(pkgdatadir)/data/graphics/sprites
+
+sprites_DATA =				\
+	error.png			\
+	error.xml
+
+EXTRA_DIST =				\
+	$(sprites_DATA)			\
+	CMakeLists.txt
diff --git a/data/graphics/sprites/error.png b/data/graphics/sprites/error.png
new file mode 100644
index 00000000..6fd7c1a8
Binary files /dev/null and b/data/graphics/sprites/error.png differ
diff --git a/data/graphics/sprites/error.xml b/data/graphics/sprites/error.xml
new file mode 100644
index 00000000..3504bd01
--- /dev/null
+++ b/data/graphics/sprites/error.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<sprite>
+	<imageset name="base" src="graphics/sprites/error.png" width="29" height="9" />
+	
+	<action name="default" imageset="base">
+		<animation direction="default">
+			<frame index="0" />
+		</animation>
+	</action>
+</sprite>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2