1 files changed, 14 insertions, 7 deletions
diff --git a/lib/glshape.cc b/lib/glshape.cc
index 831be32..c38d062 100644
--- a/lib/glshape.cc
+++ b/lib/glshape.cc
@@ -1,7 +1,7 @@
 #include <SDL_opengl.h>
 #include "glbase.h"
 #include "glshape.h"
-#include "gltexture.h"
+#include "texture.h"
 #include "glfont.h"
 #include "engine.h"
 
@@ -9,7 +9,7 @@
 #define ENTERT bool was2d = Enter(false)
 #define LEAVE Leave(was2d)
 
-void mogltk::glshape::box(int x1, int y1, int x2, int y2, glColorP c) {
+void mogltk::glshape::box(int x1, int y1, int x2, int y2, ColorP c) {
     ENTER;
     
     c.Bind();
@@ -23,7 +23,7 @@ void mogltk::glshape::box(int x1, int y1, int x2, int y2, glColorP c) {
     LEAVE;
 }
 
-void mogltk::glshape::box(int x1, int y1, int x2, int y2, glColorP c1, glColorP c2, glColorP c3, glColorP c4) {
+void mogltk::glshape::box(int x1, int y1, int x2, int y2, ColorP c1, ColorP c2, ColorP c3, ColorP c4) {
     ENTER;
 
     glBegin(GL_TRIANGLE_STRIP);
@@ -36,7 +36,10 @@ void mogltk::glshape::box(int x1, int y1, int x2, int y2, glColorP c1, glColorP
     LEAVE;
 }
 
-void mogltk::glshape::tbox(mogltk::gltexture * t, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, glColorP c) {
+void mogltk::glshape::tbox(mogltk::texture * t, int x1, int y1, int x2, int y2, int tx, int ty, double f, ColorP c) {
+    shape::tbox(t, x1, y1, x2, y2, tx, ty, f, c);
+}
+void mogltk::glshape::tbox(mogltk::texture * t, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, ColorP c) {
     ENTERT;
     
     c.Bind();
@@ -51,7 +54,11 @@ void mogltk::glshape::tbox(mogltk::gltexture * t, int x1, int y1, int x2, int y2
     LEAVE;
 }
 
-void mogltk::glshape::tbox(mogltk::gltexture * t, int x1, int y1, int x2, int y2, glColorP c1, glColorP c2, glColorP c3, glColorP c4, int tx1, int ty1, int tx2, int ty2) {
+void mogltk::glshape::tbox(mogltk::texture * t, int x1, int y1, int x2, int y2, ColorP c1, ColorP c2, ColorP c3, ColorP c4, int tx, int ty, double f) {
+    shape::tbox(t, x1, y1, x2, y2, c1, c2, c3, c4, tx, ty, f);
+}
+
+void mogltk::glshape::tbox(mogltk::texture * t, int x1, int y1, int x2, int y2, ColorP c1, ColorP c2, ColorP c3, ColorP c4, int tx1, int ty1, int tx2, int ty2) {
     ENTERT;
     
     t->Bind();
@@ -65,7 +72,7 @@ void mogltk::glshape::tbox(mogltk::gltexture * t, int x1, int y1, int x2, int y2
     LEAVE;
 }
 
-void mogltk::glshape::box3d(int x1, int y1, int x2, int y2, glColorP face, glColorP shade1, glColorP shade2, int depth, bool bevel) {
+void mogltk::glshape::box3d(int x1, int y1, int x2, int y2, ColorP face, ColorP shade1, ColorP shade2, int depth, bool bevel) {
     ENTER;
 
     if (!bevel) {
@@ -111,7 +118,7 @@ bool mogltk::glshape::Enter(bool unbind) {
     if (!was2D)
 	mogltk::engine::glbase_o->Enter2DMode();
     
-    if (unbind) mogltk::gltexture::Unbind();
+    if (unbind) mogltk::texture::Unbind();
     
     return was2D;
 }