From f269d5a68e6a22676c49961c7529b9c00dc90649 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sun, 9 May 2010 14:31:43 -0600 Subject: Move target cursor management into ActorSprite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This simplifies handling of target cursors, centralizing their logic into a single class, instead of two. Also make them more flexible and move the image files outside of the theme so servers can can control them and give them better names. Reviewed-by: Thorbjørn Lindeijer --- data/graphics/CMakeLists.txt | 9 +++++++++ data/graphics/Makefile.am | 8 ++++++++ data/graphics/gui/CMakeLists.txt | 6 ------ data/graphics/gui/Makefile.am | 6 ------ data/graphics/gui/target-cursor-blue-l.png | Bin 23803 -> 0 bytes data/graphics/gui/target-cursor-blue-m.png | Bin 18439 -> 0 bytes data/graphics/gui/target-cursor-blue-s.png | Bin 8353 -> 0 bytes data/graphics/gui/target-cursor-red-l.png | Bin 25586 -> 0 bytes data/graphics/gui/target-cursor-red-m.png | Bin 17950 -> 0 bytes data/graphics/gui/target-cursor-red-s.png | Bin 8361 -> 0 bytes data/graphics/target-cursor-in-range-l.png | Bin 0 -> 23803 bytes data/graphics/target-cursor-in-range-m.png | Bin 0 -> 18439 bytes data/graphics/target-cursor-in-range-s.png | Bin 0 -> 8353 bytes data/graphics/target-cursor-normal-l.png | Bin 0 -> 25586 bytes data/graphics/target-cursor-normal-m.png | Bin 0 -> 17950 bytes data/graphics/target-cursor-normal-s.png | Bin 0 -> 8361 bytes 16 files changed, 17 insertions(+), 12 deletions(-) delete mode 100644 data/graphics/gui/target-cursor-blue-l.png delete mode 100644 data/graphics/gui/target-cursor-blue-m.png delete mode 100644 data/graphics/gui/target-cursor-blue-s.png delete mode 100644 data/graphics/gui/target-cursor-red-l.png delete mode 100644 data/graphics/gui/target-cursor-red-m.png delete mode 100644 data/graphics/gui/target-cursor-red-s.png create mode 100644 data/graphics/target-cursor-in-range-l.png create mode 100644 data/graphics/target-cursor-in-range-m.png create mode 100644 data/graphics/target-cursor-in-range-s.png create mode 100644 data/graphics/target-cursor-normal-l.png create mode 100644 data/graphics/target-cursor-normal-m.png create mode 100644 data/graphics/target-cursor-normal-s.png (limited to 'data/graphics') diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt index 58d75523..d7e78c30 100644 --- a/data/graphics/CMakeLists.txt +++ b/data/graphics/CMakeLists.txt @@ -1,2 +1,11 @@ ADD_SUBDIRECTORY(gui) ADD_SUBDIRECTORY(images) + +SET (FILES + target-cursor-in-range-l.png + target-cursor-in-range-m.png + target-cursor-in-range-s.png + target-cursor-normal-l.png + target-cursor-normal-m.png + target-cursor-normal-s.png + ) \ No newline at end of file diff --git a/data/graphics/Makefile.am b/data/graphics/Makefile.am index e0003154..babe2b96 100644 --- a/data/graphics/Makefile.am +++ b/data/graphics/Makefile.am @@ -2,3 +2,11 @@ EXTRA_DIST = CMakeLists.txt SUBDIRS = gui images + +EXTRA_DIST = \ + target-cursor-in-range-l.png \ + target-cursor-in-range-m.png \ + target-cursor-in-range-s.png \ + target-cursor-normal-l.png \ + target-cursor-normal-m.png \ + target-cursor-normal-s.png \ No newline at end of file diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index fc825139..9943fb0f 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -31,12 +31,6 @@ SET (FILES tab.png tab_hilight.png tabselected.png - target-cursor-blue-l.png - target-cursor-blue-m.png - target-cursor-blue-s.png - target-cursor-red-l.png - target-cursor-red-m.png - target-cursor-red-s.png unknown-item.png vscroll_down_default.png vscroll_down_highlight.png diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index 6d04666a..04f957b7 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -35,12 +35,6 @@ gui_DATA = \ tab.png \ tab_hilight.png \ tabselected.png \ - target-cursor-blue-l.png \ - target-cursor-blue-m.png \ - target-cursor-blue-s.png \ - target-cursor-red-l.png \ - target-cursor-red-m.png \ - target-cursor-red-s.png \ unknown-item.png \ vscroll_down_default.png \ vscroll_down_highlight.png \ diff --git a/data/graphics/gui/target-cursor-blue-l.png b/data/graphics/gui/target-cursor-blue-l.png deleted file mode 100644 index 77cdf4b6..00000000 Binary files a/data/graphics/gui/target-cursor-blue-l.png and /dev/null differ diff --git a/data/graphics/gui/target-cursor-blue-m.png b/data/graphics/gui/target-cursor-blue-m.png deleted file mode 100644 index c0107357..00000000 Binary files a/data/graphics/gui/target-cursor-blue-m.png and /dev/null differ diff --git a/data/graphics/gui/target-cursor-blue-s.png b/data/graphics/gui/target-cursor-blue-s.png deleted file mode 100644 index 3e81c75d..00000000 Binary files a/data/graphics/gui/target-cursor-blue-s.png and /dev/null differ diff --git a/data/graphics/gui/target-cursor-red-l.png b/data/graphics/gui/target-cursor-red-l.png deleted file mode 100644 index 76d2101b..00000000 Binary files a/data/graphics/gui/target-cursor-red-l.png and /dev/null differ diff --git a/data/graphics/gui/target-cursor-red-m.png b/data/graphics/gui/target-cursor-red-m.png deleted file mode 100644 index e2ab79c2..00000000 Binary files a/data/graphics/gui/target-cursor-red-m.png and /dev/null differ diff --git a/data/graphics/gui/target-cursor-red-s.png b/data/graphics/gui/target-cursor-red-s.png deleted file mode 100644 index 09195f44..00000000 Binary files a/data/graphics/gui/target-cursor-red-s.png and /dev/null differ diff --git a/data/graphics/target-cursor-in-range-l.png b/data/graphics/target-cursor-in-range-l.png new file mode 100644 index 00000000..77cdf4b6 Binary files /dev/null and b/data/graphics/target-cursor-in-range-l.png differ diff --git a/data/graphics/target-cursor-in-range-m.png b/data/graphics/target-cursor-in-range-m.png new file mode 100644 index 00000000..c0107357 Binary files /dev/null and b/data/graphics/target-cursor-in-range-m.png differ diff --git a/data/graphics/target-cursor-in-range-s.png b/data/graphics/target-cursor-in-range-s.png new file mode 100644 index 00000000..3e81c75d Binary files /dev/null and b/data/graphics/target-cursor-in-range-s.png differ diff --git a/data/graphics/target-cursor-normal-l.png b/data/graphics/target-cursor-normal-l.png new file mode 100644 index 00000000..76d2101b Binary files /dev/null and b/data/graphics/target-cursor-normal-l.png differ diff --git a/data/graphics/target-cursor-normal-m.png b/data/graphics/target-cursor-normal-m.png new file mode 100644 index 00000000..e2ab79c2 Binary files /dev/null and b/data/graphics/target-cursor-normal-m.png differ diff --git a/data/graphics/target-cursor-normal-s.png b/data/graphics/target-cursor-normal-s.png new file mode 100644 index 00000000..09195f44 Binary files /dev/null and b/data/graphics/target-cursor-normal-s.png differ -- cgit v1.2.3-70-g09d2