diff options
| author | pixel <pixel> | 2003-04-04 16:31:03 +0000 |
|---|---|---|
| committer | pixel <pixel> | 2003-04-04 16:31:03 +0000 |
| commit | a099991354e31b55a0d0903ba5755f13aeb43824 (patch) | |
| tree | 3c4e3d9b2265857f4f18de4418ec0012bceffaaf /include | |
| parent | feba563611f39efe4f71cf09347d5aa9cd13ada6 (diff) | |
Backport fixing
Diffstat (limited to 'include')
| -rw-r--r-- | include/base.h | 2 | ||||
| -rw-r--r-- | include/glshape.h | 2 | ||||
| -rw-r--r-- | include/shape.h | 8 |
3 files changed, 12 insertions, 0 deletions
diff --git a/include/base.h b/include/base.h index 4e4cd5a..25e914b 100644 --- a/include/base.h +++ b/include/base.h @@ -13,6 +13,8 @@ namespace mogltk { int GetHeight(void); virtual void Flip(void); SDL_Surface * getsurface(); + void Enter2DMode(); + void Leave2DMode(); protected: base(int, int, int, int); void setsurface(SDL_Surface *) throw (GeneralException); diff --git a/include/glshape.h b/include/glshape.h index c2e8b59..fb5e1d9 100644 --- a/include/glshape.h +++ b/include/glshape.h @@ -16,7 +16,9 @@ namespace mogltk { 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 = DOS_WHITE); 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 = DOS_WHITE); virtual void hline(int x1, int x2, int y, ColorP, ColorP); + virtual void vline(int x, int y1, int y2, ColorP = DOS_WHITE); 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); diff --git a/include/shape.h b/include/shape.h index 6bbf94e..8152f5a 100644 --- a/include/shape.h +++ b/include/shape.h @@ -78,12 +78,20 @@ namespace mogltk { 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 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 = DOS_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 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 hline(int x1, int x2, int y, ColorP, ColorP); 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 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); + 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 window(int x1, int y1, int x2, int y2, const String & title = "", ColorP titlecolor = DOS_HIGH_WHITE, |