Switched all data access to the new methods

[lugaru.git] / Source / Objects.cpp

diff --git a/Source/Objects.cpp b/Source/Objects.cpp
index 6f98ead6d536f158581f024dd1d652e439708c07..3ae0afba3d5c69fb5615bd574eae8aaf623bb27e 100644 (file)
--- 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 *)":Data:Models:Box.solid", 0);
-        if (atype == cooltype)          model[numobjects].loaddecal((char *)":Data:Models:Cool.solid", 0);
-        if (atype == walltype)          model[numobjects].loaddecal((char *)":Data:Models:Wall.solid", 0);
-        if (atype == tunneltype)        model[numobjects].loaddecal((char *)":Data:Models:Tunnel.solid", 0);
-        if (atype == chimneytype)       model[numobjects].loaddecal((char *)":Data:Models:Chimney.solid", 0);
-        if (atype == spiketype)         model[numobjects].load((char *)":Data:Models:Spike.solid", 0);
-        if (atype == weirdtype)         model[numobjects].loaddecal((char *)":Data:Models:Weird.solid", 0);
-        if (atype == rocktype)          model[numobjects].loaddecal((char *)":Data:Models:Rock.solid", 0);
-        if (atype == treetrunktype)     model[numobjects].load((char *)":Data:Models:Treetrunk.solid", 0);
-        if (atype == treeleavestype)    model[numobjects].load((char *)":Data:Models:Leaves.solid", 0);
-        if (atype == bushtype)          model[numobjects].load((char *)":Data:Models:Bush.solid", 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)           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 *)":Data:Models:Platform.solid", 0);
+            model[numobjects].loaddecal((char *)"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 *)":Data:Models:Box.solid", 0);
-        if (atype == cooltype)          model[numobjects].loaddecal((char *)":Data:Models:Cool.solid", 0);
-        if (atype == walltype)          model[numobjects].loaddecal((char *)":Data:Models:Wall.solid", 0);
-        if (atype == tunneltype)        model[numobjects].loaddecal((char *)":Data:Models:Tunnel.solid", 0);
-        if (atype == chimneytype)       model[numobjects].loaddecal((char *)":Data:Models:Chimney.solid", 0);
-        if (atype == spiketype)         model[numobjects].load((char *)":Data:Models:Spike.solid", 0);
-        if (atype == weirdtype)         model[numobjects].loaddecal((char *)":Data:Models:Weird.solid", 0);
-        if (atype == rocktype)          model[numobjects].loaddecal((char *)":Data:Models:Rock.solid", 0);
-        if (atype == treetrunktype)     model[numobjects].load((char *)":Data:Models:Treetrunk.solid", 0);
-        if (atype == treeleavestype)    model[numobjects].load((char *)":Data:Models:Leaves.solid", 0);
-        if (atype == bushtype)          model[numobjects].load((char *)":Data:Models:Bush.solid", 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)           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 *)":Data:Models:Platform.solid", 0);
+            model[numobjects].loaddecal((char *)"Models/Platform.solid", 0);
             model[numobjects].Rotate(90, 0, 0);
         }