Rename fur textures for clarity

For now keeping FurBW2.jpg, Fur2.png and Fur.jpg which are
hardcoded into several maps. I will eventually get rid of them
as part of #91.

diff --git a/Data/Textures/BW2.jpg b/Data/Textures/BW2.jpg
deleted file mode 100644 (file)
index 9e9bb83..0000000
Binary files a/Data/Textures/BW2.jpg and /dev/null differ

diff --git a/Data/Textures/Chocolate.jpg b/Data/Textures/Chocolate.jpg
deleted file mode 100644 (file)
index 15ecf89..0000000
Binary files a/Data/Textures/Chocolate.jpg and /dev/null differ

diff --git a/Data/Textures/DarkWolf.jpg b/Data/Textures/DarkWolf.jpg
deleted file mode 100644 (file)
index 92fa5ea..0000000
Binary files a/Data/Textures/DarkWolf.jpg and /dev/null differ

diff --git a/Data/Textures/David.jpg b/Data/Textures/David.jpg
deleted file mode 100644 (file)
index 184cd2d..0000000
Binary files a/Data/Textures/David.jpg and /dev/null differ

diff --git a/Data/Textures/Fur2.jpg b/Data/Textures/Fur2.jpg
deleted file mode 100644 (file)
index b3178db..0000000
Binary files a/Data/Textures/Fur2.jpg and /dev/null differ

diff --git a/Data/Textures/Fur3.jpg b/Data/Textures/Fur3.jpg
deleted file mode 100644 (file)
index 1240324..0000000
Binary files a/Data/Textures/Fur3.jpg and /dev/null differ

diff --git a/Data/Textures/FurBlack.jpg b/Data/Textures/FurBlack.jpg
new file mode 100644 (file)
index 0000000..b3178db
Binary files /dev/null and b/Data/Textures/FurBlack.jpg differ

diff --git a/Data/Textures/FurBlackWhite.jpg b/Data/Textures/FurBlackWhite.jpg
new file mode 100644 (file)
index 0000000..9e9bb83
Binary files /dev/null and b/Data/Textures/FurBlackWhite.jpg differ

diff --git a/Data/Textures/FurBrown.jpg b/Data/Textures/FurBrown.jpg
new file mode 100644 (file)
index 0000000..1240324
Binary files /dev/null and b/Data/Textures/FurBrown.jpg differ

diff --git a/Data/Textures/FurBrownWhite.jpg b/Data/Textures/FurBrownWhite.jpg
new file mode 100644 (file)
index 0000000..1bc190d
Binary files /dev/null and b/Data/Textures/FurBrownWhite.jpg differ

diff --git a/Data/Textures/FurChocolate.jpg b/Data/Textures/FurChocolate.jpg
new file mode 100644 (file)
index 0000000..15ecf89
Binary files /dev/null and b/Data/Textures/FurChocolate.jpg differ

diff --git a/Data/Textures/FurDavid.jpg b/Data/Textures/FurDavid.jpg
new file mode 100644 (file)
index 0000000..184cd2d
Binary files /dev/null and b/Data/Textures/FurDavid.jpg differ

diff --git a/Data/Textures/FurLynx.jpg b/Data/Textures/FurLynx.jpg
new file mode 100644 (file)
index 0000000..a3d03f1
Binary files /dev/null and b/Data/Textures/FurLynx.jpg differ

diff --git a/Data/Textures/FurOpal.jpg b/Data/Textures/FurOpal.jpg
new file mode 100644 (file)
index 0000000..305264d
Binary files /dev/null and b/Data/Textures/FurOpal.jpg differ

diff --git a/Data/Textures/FurOtter.jpg b/Data/Textures/FurOtter.jpg
new file mode 100644 (file)
index 0000000..4986dbe
Binary files /dev/null and b/Data/Textures/FurOtter.jpg differ

diff --git a/Data/Textures/FurSable.jpg b/Data/Textures/FurSable.jpg
new file mode 100644 (file)
index 0000000..1503601
Binary files /dev/null and b/Data/Textures/FurSable.jpg differ

diff --git a/Data/Textures/FurWhite.jpg b/Data/Textures/FurWhite.jpg
new file mode 100644 (file)
index 0000000..25a6d3d
Binary files /dev/null and b/Data/Textures/FurWhite.jpg differ

diff --git a/Data/Textures/FurWolfDark.jpg b/Data/Textures/FurWolfDark.jpg
new file mode 100644 (file)
index 0000000..92fa5ea
Binary files /dev/null and b/Data/Textures/FurWolfDark.jpg differ

diff --git a/Data/Textures/FurWolfGrey.jpg b/Data/Textures/FurWolfGrey.jpg
new file mode 100644 (file)
index 0000000..19c7181
Binary files /dev/null and b/Data/Textures/FurWolfGrey.jpg differ

diff --git a/Data/Textures/FurWolfLizard.jpg b/Data/Textures/FurWolfLizard.jpg
new file mode 100644 (file)
index 0000000..ba06355
Binary files /dev/null and b/Data/Textures/FurWolfLizard.jpg differ

diff --git a/Data/Textures/FurWolfSnow.jpg b/Data/Textures/FurWolfSnow.jpg
new file mode 100644 (file)
index 0000000..3157cab
Binary files /dev/null and b/Data/Textures/FurWolfSnow.jpg differ

diff --git a/Data/Textures/LizardWolf.jpg b/Data/Textures/LizardWolf.jpg
deleted file mode 100644 (file)
index ba06355..0000000
Binary files a/Data/Textures/LizardWolf.jpg and /dev/null differ

diff --git a/Data/Textures/Lynx.jpg b/Data/Textures/Lynx.jpg
deleted file mode 100644 (file)
index a3d03f1..0000000
Binary files a/Data/Textures/Lynx.jpg and /dev/null differ

diff --git a/Data/Textures/Opal.jpg b/Data/Textures/Opal.jpg
deleted file mode 100644 (file)
index 305264d..0000000
Binary files a/Data/Textures/Opal.jpg and /dev/null differ

diff --git a/Data/Textures/Otter.jpg b/Data/Textures/Otter.jpg
deleted file mode 100644 (file)
index 4986dbe..0000000
Binary files a/Data/Textures/Otter.jpg and /dev/null differ

diff --git a/Data/Textures/Sable.jpg b/Data/Textures/Sable.jpg
deleted file mode 100644 (file)
index 1503601..0000000
Binary files a/Data/Textures/Sable.jpg and /dev/null differ

diff --git a/Data/Textures/SnowWolf.jpg b/Data/Textures/SnowWolf.jpg
deleted file mode 100644 (file)
index 3157cab..0000000
Binary files a/Data/Textures/SnowWolf.jpg and /dev/null differ

diff --git a/Data/Textures/WB2.jpg b/Data/Textures/WB2.jpg
deleted file mode 100644 (file)
index 1bc190d..0000000
Binary files a/Data/Textures/WB2.jpg and /dev/null differ

diff --git a/Data/Textures/Wolf.jpg b/Data/Textures/Wolf.jpg
deleted file mode 100644 (file)
index 19c7181..0000000
Binary files a/Data/Textures/Wolf.jpg and /dev/null differ

diff --git a/Misc/list-hardcoded-paths-fixes.txt b/Misc/list-hardcoded-paths-fixes.txt
index d7143afa0bb1dca5108d4efffdbd9a3e905daed9..0949fc2620dcf3b3080f879ee53b898bdac862a9 100644 (file)
--- a/Misc/list-hardcoded-paths-fixes.txt
+++ b/Misc/list-hardcoded-paths-fixes.txt
@@ -1,6 +1,4 @@
-:Data:Textures:all.png Textures/All.png
 :Data:Textures:armor.png       Textures/LeatherArmor.png
-:Data:Textures:blackfur.png    Textures/Fur2.png
 :Data:Textures:bloodapril.png  Textures/BloodApril.png
 :Data:Textures:bloodclover.png Textures/BloodClover.png
 :Data:Textures:bloodjack.png   Textures/BloodJack.png
@@ -19,10 +17,7 @@
 :Data:Textures:fancypants.png  Textures/FancyPants.png
 :Data:Textures:femaleshirt.png Textures/ShirtFemale.png
 :Data:Textures:fire.png        Textures/Fire.jpg
-:Data:Textures:footwrap.png    Textures:FootWrap.png
-:Data:Textures:furbw2.png      Textures/FurBW.jpg
-:Data:Textures:furWB2.png      Textures/FurBW.jpg
-:Data:Textures:furwhite.png    Textures/Fur.jpg
+:Data:Textures:footwrap.png    Textures/FootWrap.png
 :Data:Textures:gibottom.png    Textures/GiBottom.png
 :Data:Textures:gi.png  Textures/Gi.png
 :Data:Textures:giteared.png    Textures/GiTeared.png
@@ -46,5 +41,4 @@
 :Data:Textures:shirt.png       Textures/Shirt.png
 :Data:Textures:shirts.png      Textures/Shirt.png
 :Data:Textures:shrit.png       Textures/Shirt.png
-:Data:Textures:whitefur.png    Textures/Fur.jpg
 :Data:Textures:world.png       Textures/World.png

diff --git a/Source/Devtools/ConsoleCmds.cpp b/Source/Devtools/ConsoleCmds.cpp
index fba2400a3277b01ee1548197b4a8551db39073fa..f6e9dc83b162c0e453a5f394445fe7ea9ac7c4f1 100644 (file)
--- a/Source/Devtools/ConsoleCmds.cpp
+++ b/Source/Devtools/ConsoleCmds.cpp
@@ -311,7 +311,7 @@ void ch_save(const char* args)
 
 void ch_cellar(const char*)
 {
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Furdarko.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
+    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurDarko.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
 }
 
 void ch_tint(const char* args)
@@ -469,37 +469,37 @@ void ch_wolfie(const char*)
 
 void ch_wolf(const char*)
 {
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Wolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
+    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurWolfGrey.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
 }
 
 void ch_snowwolf(const char*)
 {
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/SnowWolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
+    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurWolfSnow.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
 }
 
 void ch_darkwolf(const char*)
 {
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/DarkWolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
+    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurWolfDark.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
 }
 
 void ch_lizardwolf(const char*)
 {
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/LizardWolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
+    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurWolfLizard.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
 }
 
 void ch_white(const char*)
 {
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Fur.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
+    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurWhite.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
 }
 
 void ch_brown(const char*)
 {
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Fur3.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
+    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurBrown.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
 }
 
 void ch_black(const char*)
 {
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Fur2.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
+    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurBlack.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
 }
 
 void ch_sizemin(const char*)

diff --git a/Source/Objects/PersonType.cpp b/Source/Objects/PersonType.cpp
index b22200a0324df216d0591eda0e0ede6eebc877ad..b3a803fb7801d1bcd799cad689a78afc8c12bb5f 100644 (file)
--- a/Source/Objects/PersonType.cpp
+++ b/Source/Objects/PersonType.cpp
@@ -71,9 +71,9 @@ void PersonType::Load()
     types[wolftype].modelClothesFileName = "Models/Belt.solid";
 
     types[wolftype].skins.resize(3);
-    types[wolftype].skins[0] = "Textures/Wolf.jpg";
-    types[wolftype].skins[1] = "Textures/DarkWolf.jpg";
-    types[wolftype].skins[2] = "Textures/SnowWolf.jpg";
+    types[wolftype].skins[0] = "Textures/FurWolfGrey.jpg";
+    types[wolftype].skins[1] = "Textures/FurWolfDark.jpg";
+    types[wolftype].skins[2] = "Textures/FurWolfSnow.jpg";
 
     /* Rabbit */
     types[rabbittype].proportions[0] = 1.2;
@@ -112,14 +112,14 @@ void PersonType::Load()
     types[rabbittype].modelClothesFileName = "Models/Belt.solid";
 
     types[rabbittype].skins.resize(10);
-    types[rabbittype].skins[0] = "Textures/Fur3.jpg";
-    types[rabbittype].skins[1] = "Textures/Fur.jpg";
-    types[rabbittype].skins[2] = "Textures/Fur2.jpg";
-    types[rabbittype].skins[3] = "Textures/Lynx.jpg";
-    types[rabbittype].skins[4] = "Textures/Otter.jpg";
-    types[rabbittype].skins[5] = "Textures/Opal.jpg";
-    types[rabbittype].skins[6] = "Textures/Sable.jpg";
-    types[rabbittype].skins[7] = "Textures/Chocolate.jpg";
-    types[rabbittype].skins[8] = "Textures/BW2.jpg";
-    types[rabbittype].skins[9] = "Textures/WB2.jpg";
+    types[rabbittype].skins[0] = "Textures/FurBrown.jpg";
+    types[rabbittype].skins[1] = "Textures/FurWhite.jpg";
+    types[rabbittype].skins[2] = "Textures/FurBlack.jpg";
+    types[rabbittype].skins[3] = "Textures/FurLynx.jpg";
+    types[rabbittype].skins[4] = "Textures/FurOtter.jpg";
+    types[rabbittype].skins[5] = "Textures/FurOpal.jpg";
+    types[rabbittype].skins[6] = "Textures/FurSable.jpg";
+    types[rabbittype].skins[7] = "Textures/FurChocolate.jpg";
+    types[rabbittype].skins[8] = "Textures/FurBlackWhite.jpg";
+    types[rabbittype].skins[9] = "Textures/FurBrownWhite.jpg";
 }