diff options
| author | Paul Gilbert | 2016-08-27 13:59:08 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-27 13:59:08 -0400 |
| commit | f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7 (patch) | |
| tree | 771a8d2b3fddf96c17a1d81d42cb08dfba09d110 /engines/sci/graphics/paint32.h | |
| parent | 873d555add9aaf5eb0d021518f5134142e2c2ff6 (diff) | |
| parent | 5ea32efbb0ecb3e6b8336ad3c2edd3905ea5b89a (diff) | |
| download | scummvm-rg350-f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7.tar.gz scummvm-rg350-f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7.tar.bz2 scummvm-rg350-f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'engines/sci/graphics/paint32.h')
| -rw-r--r-- | engines/sci/graphics/paint32.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/graphics/paint32.h b/engines/sci/graphics/paint32.h index 6d5a957fcd..3c3b7b4343 100644 --- a/engines/sci/graphics/paint32.h +++ b/engines/sci/graphics/paint32.h @@ -24,8 +24,8 @@ #define SCI_GRAPHICS_PAINT32_H namespace Sci { -class BitmapResource; class Plane; +class SciBitmap; class ScreenItem; class SegManager; @@ -54,7 +54,7 @@ public: private: typedef struct { - BitmapResource *bitmap; + SciBitmap *bitmap; bool pattern[16]; uint8 patternIndex; bool solid; @@ -64,7 +64,7 @@ private: static void plotter(int x, int y, int color, void *data); - BitmapResource makeLineBitmap(const Common::Point &startPoint, const Common::Point &endPoint, const int16 priority, const uint8 color, const LineStyle style, const uint16 pattern, const uint8 thickness, Common::Rect &outRect); + reg_t makeLineBitmap(const Common::Point &startPoint, const Common::Point &endPoint, const int16 priority, const uint8 color, const LineStyle style, const uint16 pattern, const uint8 thickness, Common::Rect &outRect); }; } // End of namespace Sci |