X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects.cpp;h=dd4f4a73ecd370d681c711e607e72f98f5155d4d;hb=f66f0e0b961dd138e4a60554373de9e64abd973b;hp=efb2c00b6373157cf6c0381f4cf1b0849a3bafc4;hpb=af1d37a1d6e36f63c514c20dc6413e9d61146ec6;p=lugaru.git

diff --git a/Source/Objects.cpp b/Source/Objects.cpp
index efb2c00..dd4f4a7 100644
--- a/Source/Objects.cpp
+++ b/Source/Objects.cpp
@@ -546,17 +546,17 @@ void Objects::MakeObject(int atype, XYZ where, float ayaw, float ascale)
         rotx[numobjects] = 0;
         roty[numobjects] = 0;
 
-        if (atype == boxtype)           model[numobjects].loaddecal((char *)"Models/Box.solid", 0);
-        if (atype == cooltype)          model[numobjects].loaddecal((char *)"Models/Cool.solid", 0);
-        if (atype == walltype)          model[numobjects].loaddecal((char *)"Models/Wall.solid", 0);
-        if (atype == tunneltype)        model[numobjects].loaddecal((char *)"Models/Tunnel.solid", 0);
-        if (atype == chimneytype)       model[numobjects].loaddecal((char *)"Models/Chimney.solid", 0);
-        if (atype == spiketype)         model[numobjects].load((char *)"Models/Spike.solid", 0);
-        if (atype == weirdtype)         model[numobjects].loaddecal((char *)"Models/Weird.solid", 0);
-        if (atype == rocktype)          model[numobjects].loaddecal((char *)"Models/Rock.solid", 0);
-        if (atype == treetrunktype)     model[numobjects].load((char *)"Models/TreeTrunk.solid", 0);
-        if (atype == treeleavestype)    model[numobjects].load((char *)"Models/Leaves.solid", 0);
-        if (atype == bushtype)          model[numobjects].load((char *)"Models/Bush.solid", 0);
+        if (atype == boxtype)           model[numobjects].loaddecal("Models/Box.solid", 0);
+        if (atype == cooltype)          model[numobjects].loaddecal("Models/Cool.solid", 0);
+        if (atype == walltype)          model[numobjects].loaddecal("Models/Wall.solid", 0);
+        if (atype == tunneltype)        model[numobjects].loaddecal("Models/Tunnel.solid", 0);
+        if (atype == chimneytype)       model[numobjects].loaddecal("Models/Chimney.solid", 0);
+        if (atype == spiketype)         model[numobjects].load("Models/Spike.solid", 0);
+        if (atype == weirdtype)         model[numobjects].loaddecal("Models/Weird.solid", 0);
+        if (atype == rocktype)          model[numobjects].loaddecal("Models/Rock.solid", 0);
+        if (atype == treetrunktype)     model[numobjects].load("Models/TreeTrunk.solid", 0);
+        if (atype == treeleavestype)    model[numobjects].load("Models/Leaves.solid", 0);
+        if (atype == bushtype)          model[numobjects].load("Models/Bush.solid", 0);
 
         if (atype == boxtype)           friction[numobjects] = 1.5;
         if (atype == cooltype)          friction[numobjects] = 1.5;
@@ -572,7 +572,7 @@ void Objects::MakeObject(int atype, XYZ where, float ayaw, float ascale)
         if (atype == treeleavestype)    friction[numobjects] = 0;
 
         if (atype == platformtype) {
-            model[numobjects].loaddecal((char *)"Models/Platform.solid", 0);
+            model[numobjects].loaddecal("Models/Platform.solid", 0);
             model[numobjects].Rotate(90, 0, 0);
         }
 
@@ -636,17 +636,17 @@ void Objects::MakeObject(int atype, XYZ where, float ayaw, float apitch, float a
         rotx[numobjects] = 0;
         roty[numobjects] = 0;
 
-        if (atype == boxtype)           model[numobjects].loaddecal((char *)"Models/Box.solid", 0);
-        if (atype == cooltype)          model[numobjects].loaddecal((char *)"Models/Cool.solid", 0);
-        if (atype == walltype)          model[numobjects].loaddecal((char *)"Models/Wall.solid", 0);
-        if (atype == tunneltype)        model[numobjects].loaddecal((char *)"Models/Tunnel.solid", 0);
-        if (atype == chimneytype)       model[numobjects].loaddecal((char *)"Models/Chimney.solid", 0);
-        if (atype == spiketype)         model[numobjects].load((char *)"Models/Spike.solid", 0);
-        if (atype == weirdtype)         model[numobjects].loaddecal((char *)"Models/Weird.solid", 0);
-        if (atype == rocktype)          model[numobjects].loaddecal((char *)"Models/Rock.solid", 0);
-        if (atype == treetrunktype)     model[numobjects].load((char *)"Models/TreeTrunk.solid", 0);
-        if (atype == treeleavestype)    model[numobjects].load((char *)"Models/Leaves.solid", 0);
-        if (atype == bushtype)          model[numobjects].load((char *)"Models/Bush.solid", 0);
+        if (atype == boxtype)           model[numobjects].loaddecal("Models/Box.solid", 0);
+        if (atype == cooltype)          model[numobjects].loaddecal("Models/Cool.solid", 0);
+        if (atype == walltype)          model[numobjects].loaddecal("Models/Wall.solid", 0);
+        if (atype == tunneltype)        model[numobjects].loaddecal("Models/Tunnel.solid", 0);
+        if (atype == chimneytype)       model[numobjects].loaddecal("Models/Chimney.solid", 0);
+        if (atype == spiketype)         model[numobjects].load("Models/Spike.solid", 0);
+        if (atype == weirdtype)         model[numobjects].loaddecal("Models/Weird.solid", 0);
+        if (atype == rocktype)          model[numobjects].loaddecal("Models/Rock.solid", 0);
+        if (atype == treetrunktype)     model[numobjects].load("Models/TreeTrunk.solid", 0);
+        if (atype == treeleavestype)    model[numobjects].load("Models/Leaves.solid", 0);
+        if (atype == bushtype)          model[numobjects].load("Models/Bush.solid", 0);
 
         if (atype == boxtype)           friction[numobjects] = 1.5;
         if (atype == cooltype)          friction[numobjects] = 1.5;
@@ -665,7 +665,7 @@ void Objects::MakeObject(int atype, XYZ where, float ayaw, float apitch, float a
             friction[numobjects] = .5;
 
         if (atype == platformtype) {
-            model[numobjects].loaddecal((char *)"Models/Platform.solid", 0);
+            model[numobjects].loaddecal("Models/Platform.solid", 0);
             model[numobjects].Rotate(90, 0, 0);
         }