X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects.h;h=a99c646f7e445b240629d0a59f660cc67c999c2d;hb=3d9b1d366f1b3607c40eb5bcbbe631794ed899de;hp=4d35552acd773694affea99fd543070c06ca2467;hpb=9e06cb73424ca3f0eb971350c5dfb3cdaec0d5bf;p=lugaru.git diff --git a/Source/Objects.h b/Source/Objects.h index 4d35552..a99c646 100644 --- a/Source/Objects.h +++ b/Source/Objects.h @@ -31,6 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Models.h" #include "Terrain.h" #include "Sprite.h" +#include "Texture.h" #include // // Model Structures @@ -73,10 +74,10 @@ public: float scale[max_objects]; float messedwith[max_objects]; float checked[max_objects]; - GLuint boxtextureptr; - GLuint treetextureptr; - GLuint bushtextureptr; - GLuint rocktextureptr; + Texture boxtextureptr; + Texture treetextureptr; + Texture bushtextureptr; + Texture rocktextureptr; float shadowed[max_objects]; float occluded[max_objects]; bool checkcollide(XYZ startpoint, XYZ endpoint,int which);