diff options
| author | Johannes Schickel | 2009-12-09 16:41:08 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-12-09 16:41:08 +0000 |
| commit | 421363a13258c149bdf976938e7dc8d8438aa9db (patch) | |
| tree | a5146aade6553dbcc2e01f7b6dad8411447908b1 | |
| parent | 5df86e4cccf294f6e4eccd08fb82c94fe3817a60 (diff) | |
| download | scummvm-rg350-421363a13258c149bdf976938e7dc8d8438aa9db.tar.gz scummvm-rg350-421363a13258c149bdf976938e7dc8d8438aa9db.tar.bz2 scummvm-rg350-421363a13258c149bdf976938e7dc8d8438aa9db.zip | |
Slightly modified commit of patch #2911414 "MSVC: conversions warnings in common code".
svn-id: r46308
| -rw-r--r-- | common/rect.h | 2 | ||||
| -rw-r--r-- | graphics/cursorman.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/rect.h b/common/rect.h index 38bd2c00af..54b219394c 100644 --- a/common/rect.h +++ b/common/rect.h @@ -198,7 +198,7 @@ struct Rect { else if (right < r.left) right = r.left; } - void clip(int maxw, int maxh) { + void clip(int16 maxw, int16 maxh) { clip(Rect(0, 0, maxw, maxh)); } diff --git a/graphics/cursorman.h b/graphics/cursorman.h index a0f01886b2..b6afa10fa7 100644 --- a/graphics/cursorman.h +++ b/graphics/cursorman.h @@ -175,7 +175,7 @@ private: int _hotspotY; uint32 _keycolor; Graphics::PixelFormat _format; - byte _targetScale; + int _targetScale; uint _size; Cursor(const byte *data, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int targetScale = 1, const Graphics::PixelFormat *format = NULL) { |