SDL backend mostly finished

4 files changed, 6 insertions, 8 deletions

diff --git a/include/glshape.h b/include/glshape.h
index bca4410..e3654f5 100644
--- a/include/glshape.h
+++ b/include/glshape.h
@@ -10,9 +10,13 @@
 namespace mogltk {
     class glshape : public shape {
       public:
+        virtual void pixel(int x, int y, ColorP = WHITE);
         virtual void box(int x1, int y1, int x2, int y2, ColorP = WHITE);
         virtual void box3d(int x1, int y1, int x2, int y2, ColorP = DOS_WHITE, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, int = 2, bool = false);
 	virtual void box(int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP);
+	virtual void obox(int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP);
+	virtual void hline(int x1, int x2, int y, ColorP, ColorP);
+	virtual void vline(int x, int y1, int y2, ColorP, ColorP);
 	virtual void tbox(texture *, int x1, int y1, int x2, int y2, int tx = 0, int ty = 0, double = 1.0, ColorP = WHITE);
 	virtual void tbox(texture *, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, ColorP = WHITE);
 	virtual void tbox(texture *, int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP, int tx = 0, int ty = 0, double = 1.0);
diff --git a/include/mcolor.h b/include/mcolor.h
index bbad479..88ca27f 100644
--- a/include/mcolor.h
+++ b/include/mcolor.h
@@ -10,6 +10,7 @@ namespace mogltk {
           ColorP(const Color &);
 	  ColorP(Uint8, Uint8, Uint8, Uint8);
 	void Bind();
+	Uint32 toSDL(SDL_PixelFormat * = 0);
 	static Color Min;
 	static Color Max;
         Color c;
diff --git a/include/shape.h b/include/shape.h
index 1aa8168..2c7addf 100644
--- a/include/shape.h
+++ b/include/shape.h
@@ -17,20 +17,12 @@ namespace mogltk {
         virtual void pixel(int x, int y, ColorP = WHITE);
         virtual void box(int x1, int y1, int x2, int y2, ColorP = WHITE);
         virtual void box3d(int x1, int y1, int x2, int y2, ColorP = DOS_WHITE, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, int = 2, bool = false);
-	virtual void box(int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP);
         virtual void obox(int x1, int y1, int x2, int y2, ColorP = WHITE);
         virtual void obox3d(int x1, int y1, int x2, int y2, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, bool = false);
-	virtual void obox(int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP);	
-	virtual void tbox(texture *, int x1, int y1, int x2, int y2, int tx = 0, int ty = 0, double = 1.0, ColorP = WHITE);
-	virtual void tbox(texture *, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, ColorP = WHITE);
-	virtual void tbox(texture *, int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP, int tx = 0, int ty = 0, double = 1.0);
-	virtual void tbox(texture *, int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP, int tx1, int ty1, int tx2, int ty2);
 	virtual void hline(int x1, int x2, int y, ColorP = WHITE);
 	virtual void hline3d(int x1, int x2, int y, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, bool = false);
-	virtual void hline(int x1, int x2, int y, ColorP, ColorP);
 	virtual void vline(int x, int y1, int y2, ColorP = WHITE);
 	virtual void vline3d(int x, int y1, int y2, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, bool = false);
-	virtual void vline(int x, int y1, int y2, ColorP, ColorP);
 	virtual void window(int x1, int y1, int x2, int y2,
 			    const String & title = "",
 	                    ColorP titlecolor = DOS_HIGH_WHITE, 
diff --git a/include/sprite.h b/include/sprite.h
index dcc4dda..c9e6653 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -32,6 +32,7 @@ namespace mogltk {
 	    const TexList * GetNext() const;
 	    TexList * GetNext();
 	    void Bind() const;
+	    SDL_Surface * GetSurface();
 	  private:
 	    texture * tex;
 	    static TexList * header;