X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FObject.cpp;h=06665de39c645f74bddf07ff155b0a594e4a6121;hb=cd451341c5ee01374268559885871ca9d454cbd0;hp=c91e5d8c2b3faf84a973c965856403fcc3168c91;hpb=cf610b0dfbf15ffafaefcae72a44957095fd7740;p=lugaru.git diff --git a/Source/Objects/Object.cpp b/Source/Objects/Object.cpp index c91e5d8..06665de 100644 --- a/Source/Objects/Object.cpp +++ b/Source/Objects/Object.cpp @@ -80,35 +80,35 @@ Object::Object(object_type _type, XYZ _position, float _yaw, float _pitch, float switch(type) { case boxtype: - model.loaddecal("Models/Box.solid", 0); + model.loaddecal("Models/Box.solid"); friction = 1.5; break; case cooltype: - model.loaddecal("Models/Cool.solid", 0); + model.loaddecal("Models/Cool.solid"); friction = 1.5; break; case walltype: - model.loaddecal("Models/Wall.solid", 0); + model.loaddecal("Models/Wall.solid"); friction = 1.5; break; case tunneltype: - model.loaddecal("Models/Tunnel.solid", 0); + model.loaddecal("Models/Tunnel.solid"); friction = 1.5; break; case chimneytype: - model.loaddecal("Models/Chimney.solid", 0); + model.loaddecal("Models/Chimney.solid"); friction = 1.5; break; case spiketype: - model.load("Models/Spike.solid", 0); + model.load("Models/Spike.solid"); friction = .4; break; case weirdtype: - model.loaddecal("Models/Weird.solid", 0); + model.loaddecal("Models/Weird.solid"); friction = 1.5; break; case rocktype: - model.loaddecal("Models/Rock.solid", 0); + model.loaddecal("Models/Rock.solid"); if (scale > .5) { friction = 1.5; } else { @@ -116,20 +116,20 @@ Object::Object(object_type _type, XYZ _position, float _yaw, float _pitch, float } break; case treetrunktype: - model.load("Models/TreeTrunk.solid", 0); + model.load("Models/TreeTrunk.solid"); friction = .4; break; case treeleavestype: scale += fabs((float)(Random() % 100) / 900) * scale; - model.load("Models/Leaves.solid", 0); + model.load("Models/Leaves.solid"); friction = 0; break; case bushtype: position.y = terrain.getHeight(position.x, position.z) - .3; - model.load("Models/Bush.solid", 0); + model.load("Models/Bush.solid"); break; case platformtype: - model.loaddecal("Models/Platform.solid", 0); + model.loaddecal("Models/Platform.solid"); model.Rotate(90, 0, 0); friction = 1.5; break;