From 36527119ae021b317f8405c4cf40251ddcc037b9 Mon Sep 17 00:00:00 2001 From: pixel Date: Wed, 2 Apr 2003 16:49:55 +0000 Subject: Color fix --- include/shape.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'include/shape.h') diff --git a/include/shape.h b/include/shape.h index 720d4a2..07e88ed 100644 --- a/include/shape.h +++ b/include/shape.h @@ -40,18 +40,18 @@ namespace mogltk { int GetX() const; int GetY() const; void walk(fillwalker *); + point * look(int); private: int x; point * next; sline * header; - point * look(int); }; int y; sline * next; + fill * header; sline * look(int); protected: point * pheader; - fill * header; friend class point; }; protected: @@ -63,15 +63,17 @@ namespace mogltk { virtual void pixel(int x, int y, ColorP = WHITE); virtual void circle(int x, int y, int r, ColorP = WHITE); virtual void pcircle(int x, int y, int r, ColorP = WHITE); - virtual void arc(int x, int y, int r, double a1, double a2, ColorP = WHITE); - virtual void arc(int x, int y, int r, int x1, int y1, int x2, int y2, ColorP = WHITE); - virtual void box(int x1, int y1, int x2, int y2, ColorP = WHITE); + virtual fill * fcircle(int x, int y, int r); + virtual void fdraw(fill *, ColorP = WHITE); + virtual void arc(int x, int y, int r, double a1, double a2, ColorP = DOS_WHITE); + virtual void arc(int x, int y, int r, int x1, int y1, int x2, int y2, ColorP = DOS_WHITE); + virtual void box(int x1, int y1, int x2, int y2, ColorP = DOS_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 obox(int x1, int y1, int x2, int y2, ColorP = WHITE); + virtual void obox(int x1, int y1, int x2, int y2, ColorP = DOS_WHITE); virtual void obox3d(int x1, int y1, int x2, int y2, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, bool = false); - virtual void hline(int x1, int x2, int y, ColorP = WHITE); + virtual void hline(int x1, int x2, int y, ColorP = DOS_WHITE); virtual void hline3d(int x1, int x2, int y, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, bool = false); - virtual void vline(int x, int y1, int y2, ColorP = WHITE); + virtual void vline(int x, int y1, int y2, ColorP = DOS_WHITE); virtual void vline3d(int x, int y1, int y2, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, bool = false); virtual void window(int x1, int y1, int x2, int y2, const String & title = "", -- cgit v1.2.3