From 40c35a7c7f8eae9aec28ed5cd0c33d5fd8582841 Mon Sep 17 00:00:00 2001
From: RandumKiwi <RandumKiwi@users.noreply.github.com>
Date: Thu, 17 Jan 2013 07:33:42 +0000
Subject: [PATCH] More moving...

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7104 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 config/convert_mapconfig.sh                       |   4 ++++
 packages/textures/{makke => golgotha}/door.jpg    | Bin
 packages/textures/golgotha/license.txt            |   2 ++
 packages/textures/{makke => golgotha}/panel.jpg   | Bin
 packages/textures/{makke => golgotha}/window.jpg  | Bin
 packages/textures/{makke => golgotha}/windows.jpg | Bin
 6 files changed, 6 insertions(+)
 rename packages/textures/{makke => golgotha}/door.jpg (100%)
 rename packages/textures/{makke => golgotha}/panel.jpg (100%)
 rename packages/textures/{makke => golgotha}/window.jpg (100%)
 rename packages/textures/{makke => golgotha}/windows.jpg (100%)

diff --git a/config/convert_mapconfig.sh b/config/convert_mapconfig.sh
index 2bc6569d..2ef35e62 100644
--- a/config/convert_mapconfig.sh
+++ b/config/convert_mapconfig.sh
@@ -179,6 +179,10 @@ for file in $*; do
     sed -i '/^texture/s/\<mitaman\/various\/063bois.jpg\>/lemog\/063bois.jpg/g' $file
     sed -i '/^texture/s/\<mitaman\/various\/063bois_b.jpg\>/lemog\/063bois_b.jpg/g' $file
     sed -i '/^texture/s/\<mitaman\/various\/027metal.jpg\>/lemog\/027metal.jpg/g' $file
+    sed -i '/^texture/s/\<makke\/windows.jpg\>/golgotha\/windows.jpg/g' $file
+    sed -i '/^texture/s/\<makke\/window.jpg\>/golgotha\/window.jpg/g' $file
+    sed -i '/^texture/s/\<makke\/panel.jpg\>/golgotha\/panel.jpg/g' $file
+    sed -i '/^texture/s/\<makke\/door.jpg\>/golgotha\/door.jpg/g' $file
 
     echo -e "Successfully finished converting: "$file"\n"
   else
diff --git a/packages/textures/makke/door.jpg b/packages/textures/golgotha/door.jpg
similarity index 100%
rename from packages/textures/makke/door.jpg
rename to packages/textures/golgotha/door.jpg
diff --git a/packages/textures/golgotha/license.txt b/packages/textures/golgotha/license.txt
index 69dc49cf..ad81f592 100644
--- a/packages/textures/golgotha/license.txt
+++ b/packages/textures/golgotha/license.txt
@@ -7,6 +7,8 @@ Stephen Wilson or Johnathan Clark:
 
 These files were then modified to fit AssaultCube and added to the game by:
 	Mike "MitaMAN" Poeschl (mitaman1@optonline.net)
+		or
+	Markus "makkE" Bekel
 
 Read Wikipedia for more information about the fate of Golgotha:
 	http://en.wikipedia.org/wiki/Golgotha_%28computer_game%29
diff --git a/packages/textures/makke/panel.jpg b/packages/textures/golgotha/panel.jpg
similarity index 100%
rename from packages/textures/makke/panel.jpg
rename to packages/textures/golgotha/panel.jpg
diff --git a/packages/textures/makke/window.jpg b/packages/textures/golgotha/window.jpg
similarity index 100%
rename from packages/textures/makke/window.jpg
rename to packages/textures/golgotha/window.jpg
diff --git a/packages/textures/makke/windows.jpg b/packages/textures/golgotha/windows.jpg
similarity index 100%
rename from packages/textures/makke/windows.jpg
rename to packages/textures/golgotha/windows.jpg