diff --git a/config/convert_mapconfig.sh b/config/convert_mapconfig.sh index e15c4cb1..bd02b958 100644 --- a/config/convert_mapconfig.sh +++ b/config/convert_mapconfig.sh @@ -13,7 +13,6 @@ if [[ -r "$1" && -w "$1" ]]; then fi echo "Converting $1 to a compatible map config file..." - echo -e "\nConverting mapmodels..." sed -i '/^mapmodel/s/\/jcdpc\/laptop/g' $1 sed -i '/^mapmodel/s/\/jcdpc\/cardboardbox/g' $1 @@ -110,6 +109,9 @@ if [[ -r "$1" && -w "$1" ]]; then sed -i '/^texture/s/\/zastrow\/sub_doors512B05.jpg/g' $1 sed -i '/^texture/s/\/zastrow\/sub_window31.jpg/g' $1 sed -i '/^texture/s/\/zastrow\/sub_window33.jpg/g' $1 + sed -i '/^texture/s/\/zastrow\/sub_sand.jpg/g' $1 + sed -i '/^texture/s/\/zastrow\/brick_wall_08.jpg/g' $1 + sed -i '/^texture/s/\/zastrow\/brick_wall_09.jpg/g' $1 echo -e "\a\nConversion finished!" echo "Please check your map config file carefully for any inconsistencies." diff --git a/packages/models/mapmodels/makke/broken_wood/tris.md3 b/packages/models/mapmodels/makke/broken_wood/tris.md3 index 83a663c4..5033ef35 100644 Binary files a/packages/models/mapmodels/makke/broken_wood/tris.md3 and b/packages/models/mapmodels/makke/broken_wood/tris.md3 differ diff --git a/packages/textures/sub/license.txt b/packages/textures/sub/license.txt deleted file mode 100644 index f54d9d22..00000000 --- a/packages/textures/sub/license.txt +++ /dev/null @@ -1,11 +0,0 @@ -Files within this folder are copyright (all rights reserved) by: - Chris Zastrow (http://www.newlogicmedia.com/subverse/) - -These files are no longer available from this website. When these files were -originally obtained, they allowed redistribution with the following license: - - Greetings from the dark underworld of texture art. Thank you for giving - my textures a try. If you'd like to use these textures commercially, - please contact me via email. Please do not alter these images, or - distribute them without this "info.txt" file. Thanks if you link to my - main page, but please don't link to the files directly. Thanks, have fun! \ No newline at end of file diff --git a/packages/textures/sub/brick_wall_08.jpg b/packages/textures/zastrow/brick_wall_08.jpg similarity index 100% rename from packages/textures/sub/brick_wall_08.jpg rename to packages/textures/zastrow/brick_wall_08.jpg diff --git a/packages/textures/sub/brick_wall_09.jpg b/packages/textures/zastrow/brick_wall_09.jpg similarity index 100% rename from packages/textures/sub/brick_wall_09.jpg rename to packages/textures/zastrow/brick_wall_09.jpg diff --git a/packages/textures/sub/sub_sand.jpg b/packages/textures/zastrow/sub_sand.jpg similarity index 100% rename from packages/textures/sub/sub_sand.jpg rename to packages/textures/zastrow/sub_sand.jpg