From 9029ea5342b46c76fdef2d2b401358cbdb96046c Mon Sep 17 00:00:00 2001
From: RandumKiwi <RandumKiwi@users.noreply.github.com>
Date: Sun, 13 Jan 2013 19:21:22 +0000
Subject: [PATCH] movin'

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7089 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 config/convert_mapconfig.sh                         |   7 ++++++-
 .../textures/{rattrap => zastrow}/rb_box_07.jpg     | Bin
 .../various => zastrow}/sub_doors256nf_01.jpg       | Bin
 .../{mitaman/various => zastrow}/sub_window23.jpg   | Bin
 .../{mitaman/various => zastrow}/sub_window38.jpg   | Bin
 .../{mitaman/various => zastrow}/vent_cap.jpg       | Bin
 6 files changed, 6 insertions(+), 1 deletion(-)
 rename packages/textures/{rattrap => zastrow}/rb_box_07.jpg (100%)
 rename packages/textures/{mitaman/various => zastrow}/sub_doors256nf_01.jpg (100%)
 rename packages/textures/{mitaman/various => zastrow}/sub_window23.jpg (100%)
 rename packages/textures/{mitaman/various => zastrow}/sub_window38.jpg (100%)
 rename packages/textures/{mitaman/various => zastrow}/vent_cap.jpg (100%)

diff --git a/config/convert_mapconfig.sh b/config/convert_mapconfig.sh
index bd02b958..3fdb7dab 100644
--- a/config/convert_mapconfig.sh
+++ b/config/convert_mapconfig.sh
@@ -112,6 +112,11 @@ if [[ -r "$1" && -w "$1" ]]; then
   sed -i '/^texture/s/\<sub\/sub_sand.jpg\>/zastrow\/sub_sand.jpg/g' $1
   sed -i '/^texture/s/\<sub\/brick_wall_08.jpg\>/zastrow\/brick_wall_08.jpg/g' $1
   sed -i '/^texture/s/\<sub\/brick_wall_09.jpg\>/zastrow\/brick_wall_09.jpg/g' $1
+  sed -i '/^texture/s/\<mitaman\/various\/sub_window23.jpg\>/zastrow\/sub_window23.jpg/g' $1
+  sed -i '/^texture/s/\<mitaman\/various\/vent_cap.jpg\>/zastrow\/vent_cap.jpg/g' $1
+  sed -i '/^texture/s/\<mitaman\/various\/sub_window38.jpg\>/zastrow\/sub_window38.jpg/g' $1
+  sed -i '/^texture/s/\<mitaman\/various\/sub_doors256nf_01.jpg\>/zastrow\/sub_doors256nf_01.jpg/g' $1
+  sed -i '/^texture/s/\<rattrap\/rb_box_07.jpg\>/zastrow\/rb_box_07.jpg/g' $1
 
   echo -e "\a\nConversion finished!"
   echo "Please check your map config file carefully for any inconsistencies."
@@ -119,7 +124,7 @@ else
   if [ "$1" = "" ]; then
     echo -e "\a\E[31m\033[1mERROR:\E[0m Please append the path of your map config file to the end of this script."
     echo "For example, run:"
-    echo -e "\tsh convert_mapconfig.sh ../packages/maps/yourmapname.cfg"
+    echo -e "\tsh $0 ../packages/maps/yourmapname.cfg"
   else
     echo -e "\a\E[31m\033[1mERROR:\E[0m The path you've stated to the map config file is non-readable and/or non-writeable and/or incorrect."
     exit
diff --git a/packages/textures/rattrap/rb_box_07.jpg b/packages/textures/zastrow/rb_box_07.jpg
similarity index 100%
rename from packages/textures/rattrap/rb_box_07.jpg
rename to packages/textures/zastrow/rb_box_07.jpg
diff --git a/packages/textures/mitaman/various/sub_doors256nf_01.jpg b/packages/textures/zastrow/sub_doors256nf_01.jpg
similarity index 100%
rename from packages/textures/mitaman/various/sub_doors256nf_01.jpg
rename to packages/textures/zastrow/sub_doors256nf_01.jpg
diff --git a/packages/textures/mitaman/various/sub_window23.jpg b/packages/textures/zastrow/sub_window23.jpg
similarity index 100%
rename from packages/textures/mitaman/various/sub_window23.jpg
rename to packages/textures/zastrow/sub_window23.jpg
diff --git a/packages/textures/mitaman/various/sub_window38.jpg b/packages/textures/zastrow/sub_window38.jpg
similarity index 100%
rename from packages/textures/mitaman/various/sub_window38.jpg
rename to packages/textures/zastrow/sub_window38.jpg
diff --git a/packages/textures/mitaman/various/vent_cap.jpg b/packages/textures/zastrow/vent_cap.jpg
similarity index 100%
rename from packages/textures/mitaman/various/vent_cap.jpg
rename to packages/textures/zastrow/vent_cap.jpg