aboutsummaryrefslogtreecommitdiff
path: root/engines/toon/picture.h
diff options
context:
space:
mode:
authorD G Turner2012-06-21 02:21:21 +0100
committerD G Turner2012-06-28 07:07:08 +0100
commit78b8ca5c7fd7296d88c381695534844879673b75 (patch)
tree2e5013ac1f6af5ee296050f27a592fd0fc78a6da /engines/toon/picture.h
parentd73ed91051f9155f77162c50b99ca9efbb7d3b46 (diff)
downloadscummvm-rg350-78b8ca5c7fd7296d88c381695534844879673b75.tar.gz
scummvm-rg350-78b8ca5c7fd7296d88c381695534844879673b75.tar.bz2
scummvm-rg350-78b8ca5c7fd7296d88c381695534844879673b75.zip
TOON: Replace remaining int32 x,y,w and h coordinates with int16.
Diffstat (limited to 'engines/toon/picture.h')
-rw-r--r--engines/toon/picture.h24
1 files changed, 13 insertions, 11 deletions
diff --git a/engines/toon/picture.h b/engines/toon/picture.h
index 460c5b58a2..5e79612a39 100644
--- a/engines/toon/picture.h
+++ b/engines/toon/picture.h
@@ -33,25 +33,27 @@
namespace Toon {
class ToonEngine;
-class Picture {
+class Picture {
public:
Picture(ToonEngine *vm);
~Picture();
+
bool loadPicture(const Common::String &file);
void setupPalette();
- void draw(Graphics::Surface &surface, int32 x, int32 y, int32 dx, int32 dy);
- void drawWithRectList(Graphics::Surface& surface, int32 x, int32 y, int32 dx, int32 dy, Common::Array<Common::Rect>& rectArray);
- void drawMask(Graphics::Surface &surface, int32 x, int32 y, int32 dx, int32 dy);
- void drawLineOnMask(int32 x, int32 y, int32 x2, int32 y2, bool walkable);
- void floodFillNotWalkableOnMask(int32 x, int32 y);
- uint8 getData(int32 x, int32 y);
+ void draw(Graphics::Surface &surface, int16 x, int16 y, int16 dx, int16 dy);
+ void drawWithRectList(Graphics::Surface& surface, int16 x, int16 y, int16 dx, int16 dy, Common::Array<Common::Rect>& rectArray);
+ void drawMask(Graphics::Surface &surface, int16 x, int16 y, int16 dx, int16 dy);
+ void drawLineOnMask(int16 x, int16 y, int16 x2, int16 y2, bool walkable);
+ void floodFillNotWalkableOnMask(int16 x, int16 y);
+ uint8 getData(int16 x, int16 y);
uint8 *getDataPtr() { return _data; }
- int32 getWidth() const { return _width; }
- int32 getHeight() const { return _height; }
+ int16 getWidth() const { return _width; }
+ int16 getHeight() const { return _height; }
+
protected:
- int32 _width;
- int32 _height;
+ int16 _width;
+ int16 _height;
uint8 *_data;
uint8 *_palette; // need to be copied at 3-387
int32 _paletteEntries;