X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects.cpp;h=d67044eee0923ea543436805384068352c0cf457;hb=decb00e82a2e65e25dbcdd8f16fff5a6a07d31d6;hp=133f65921997c01382251bcfd95b26793fecb8b6;hpb=9b02e6c2c1987b983584afc69e60ae2efa5dccc7;p=lugaru.git

diff --git a/Source/Objects.cpp b/Source/Objects.cpp
index 133f659..d67044e 100644
--- a/Source/Objects.cpp
+++ b/Source/Objects.cpp
@@ -505,17 +505,17 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, 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 *)":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)friction[numobjects]=1.5;
 		if(atype==cooltype)friction[numobjects]=1.5;
@@ -531,7 +531,7 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float ascale){
 		if(atype==treeleavestype)friction[numobjects]=0;
 
 		if(atype==platformtype){
-			model[numobjects].loaddecal((char *)"/Data/Models/Platform.solid",0);
+			model[numobjects].loaddecal((char *)":Data:Models:Platform.solid",0);
 			model[numobjects].Rotate(90,0,0);
 		}
 
@@ -593,17 +593,17 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float arotation2
 		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 *)":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)friction[numobjects]=1.5;
 		if(atype==cooltype)friction[numobjects]=1.5;
@@ -621,7 +621,7 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float arotation2
 		if(friction[numobjects]==1.5&&fabs(arotation2)>5)friction[numobjects]=.5;
 
 		if(atype==platformtype){
-			model[numobjects].loaddecal((char *)"/Data/Models/Platform.solid",0);
+			model[numobjects].loaddecal((char *)":Data:Models:Platform.solid",0);
 			model[numobjects].Rotate(90,0,0);
 		}