Moved all calls to skeleton Load to Person

[lugaru.git] / Source / ConsoleCmds.cpp

diff --git a/Source/ConsoleCmds.cpp b/Source/ConsoleCmds.cpp
index 8fc1da892982abcb2889c44d0089e512c86949c6..cdce93cec9cf014e6c14b0b7d2931d9f798a5f59 100644 (file)
--- a/Source/ConsoleCmds.cpp
+++ b/Source/ConsoleCmds.cpp
@@ -442,15 +442,8 @@ void ch_cellophane(const char *args)
 
 void ch_funnybunny(const char *args)
 {
-    Person::players[0]->skeleton.id = 0;
-    Person::players[0]->skeleton.Load("Skeleton/Basic Figure", "Skeleton/Basic Figurelow",
-                            "Skeleton/Rabbitbelt", "Models/Body.solid",
-                            "Models/Body2.solid", "Models/Body3.solid",
-                            "Models/Body4.solid", "Models/Body5.solid",
-                            "Models/Body6.solid", "Models/Body7.solid",
-                            "Models/Bodylow.solid", "Models/Belt.solid", 1);
-    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]->creature = rabbittype;
+    Person::players[0]->skeletonLoad(true);
     Person::players[0]->scale = .2;
     Person::players[0]->headless = 0;
     Person::players[0]->damagetolerance = 200;
@@ -459,15 +452,8 @@ void ch_funnybunny(const char *args)
 
 void ch_wolfie(const char *args)
 {
-    Person::players[0]->skeleton.id = 0;
-    Person::players[0]->skeleton.Load("Skeleton/Basic Figure Wolf", "Skeleton/Basic Figure Wolf Low",
-                            "Skeleton/Rabbitbelt", "Models/Wolf.solid",
-                            "Models/Wolf2.solid", "Models/Wolf3.solid",
-                            "Models/Wolf4.solid", "Models/Wolf5.solid",
-                            "Models/Wolf6.solid", "Models/Wolf7.solid",
-                            "Models/Wolflow.solid", "Models/Belt.solid", 0);
-    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]->creature = wolftype;
+    Person::players[0]->skeletonLoad();
     Person::players[0]->damagetolerance = 300;
     set_proportion(0, "1 1 1 1");
 }
@@ -494,22 +480,22 @@ void ch_darkwolf(const char *args)
 
 void ch_lizardwolf(const char *args)
 {
-    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/LizardWolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
 }
 
 void ch_white(const char *args)
 {
-    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/Fur.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
 }
 
 void ch_brown(const char *args)
 {
-    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/Fur3.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
 }
 
 void ch_black(const char *args)
 {
-    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/Fur2.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
 }
 
 void ch_sizemin(const char *args)