Turn some methods into functions (potentially gives better code, and we may want to move some of those into the graphics/ module one day)

svn-id: r15703

1 files changed, 13 insertions, 12 deletions

diff --git a/saga/gfx.h b/saga/gfx.h
index b99881d0c9..3adb33243f 100644
--- a/saga/gfx.h
+++ b/saga/gfx.h
@@ -82,19 +82,21 @@ struct SURFACE : Graphics::Surface {
 #define GREEN_WEIGHT 0.587
 #define BLUE_WEIGHT 0.114
 
+int drawPalette(SURFACE *dst_s);
+int bufToSurface(SURFACE *ds, const byte *src, int src_w, int src_h, Rect *src_rect, Point *dst_pt);
+int bufToBuffer(byte * dst_buf, int dst_w, int dst_h, const byte *src,
+	int src_w, int src_h, Rect *src_rect, Point *dst_pt);
+int getClipInfo(CLIPINFO *clipinfo);
+int drawRect(SURFACE *ds, Rect *dst_rect, int color);
+int drawFrame(SURFACE *ds, const Point *p1, const Point *p2, int color);
+int drawPolyLine(SURFACE *ds, const Point *pts, int pt_ct, int draw_color);
+int clipLine(SURFACE *ds, const Point *src_p1, const Point *src_p2, Point *dst_p1, Point *dst_p2);
+void drawLine(SURFACE * ds, const Point *p1, const Point *p2, int color);
+
+bool hitTestPoly(const Point *points, unsigned int npoints, const Point& test_point);
+
 class Gfx {
 public:
-	int simpleBlit(SURFACE *dst_s, SURFACE *src_s);
-	int drawPalette(SURFACE *dst_s);
-	int bufToSurface(SURFACE *ds, const byte *src, int src_w, int src_h, Rect *src_rect, Point *dst_pt);
-	int bufToBuffer(byte * dst_buf, int dst_w, int dst_h, const byte *src,
-		int src_w, int src_h, Rect *src_rect, Point *dst_pt);
-	int drawRect(SURFACE *ds, Rect *dst_rect, int color);
-	int drawFrame(SURFACE *ds, const Point *p1, const Point *p2, int color);
-	int drawPolyLine(SURFACE *ds, const Point *pts, int pt_ct, int draw_color);
-	int getClipInfo(CLIPINFO *clipinfo);
-	int clipLine(SURFACE *ds, const Point *src_p1, const Point *src_p2, Point *dst_p1, Point *dst_p2);
-	void drawLine(SURFACE * ds, const Point *p1, const Point *p2, int color);
 
 	Gfx(OSystem *system, int width, int height);
 	SURFACE *getBackBuffer();
@@ -105,7 +107,6 @@ public:
 	int getCurrentPal(PALENTRY *src_pal);
 	int palToBlack(SURFACE *surface, PALENTRY *src_pal, double percent);
 	int blackToPal(SURFACE *surface, PALENTRY *src_pal, double percent);
-	bool hitTestPoly(const Point *points, unsigned int npoints, const Point& test_point);
 
 private:
 	void setCursor(int best_white);