From 2625f3931a946180de617fa0e04b8b4d3f30cb2d Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Sat, 20 Apr 2013 17:37:19 +0200 Subject: WINTERMUTE: Fix a few more int->int32's spotted by fuzzie. --- engines/wintermute/ad/ad_scene.h | 2 +- engines/wintermute/base/base_game.cpp | 6 +++--- engines/wintermute/ui/ui_tiled_image.cpp | 2 +- engines/wintermute/ui/ui_tiled_image.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'engines') diff --git a/engines/wintermute/ad/ad_scene.h b/engines/wintermute/ad/ad_scene.h index a129bfb5e4..d418f4e58f 100644 --- a/engines/wintermute/ad/ad_scene.h +++ b/engines/wintermute/ad/ad_scene.h @@ -71,7 +71,7 @@ public: bool getViewportOffset(int *offsetX = nullptr, int *offsetY = nullptr); BaseViewport *_viewport; BaseFader *_fader; - int _pfPointsNum; + int32 _pfPointsNum; void pfPointsAdd(int x, int y, int distance); void pfPointsStart(); bool _initialized; diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp index aaa6c90e9b..f5b63e46cc 100644 --- a/engines/wintermute/base/base_game.cpp +++ b/engines/wintermute/base/base_game.cpp @@ -602,7 +602,7 @@ int BaseGame::getSequence() { ////////////////////////////////////////////////////////////////////////// -void BaseGame::setOffset(int offsetX, int offsetY) { +void BaseGame::setOffset(int32 offsetX, int32 offsetY) { _offsetX = offsetX; _offsetY = offsetY; } @@ -2995,7 +2995,7 @@ bool BaseGame::showCursor() { ////////////////////////////////////////////////////////////////////////// -bool BaseGame::saveGame(int slot, const char *desc, bool quickSave) { +bool BaseGame::saveGame(int32 slot, const char *desc, bool quickSave) { return SaveLoad::saveGame(slot, desc, quickSave, _gameRef); } @@ -3840,7 +3840,7 @@ bool BaseGame::isRightDoubleClick() { } ////////////////////////////////////////////////////////////////////////// -bool BaseGame::isDoubleClick(int buttonIndex) { +bool BaseGame::isDoubleClick(int32 buttonIndex) { uint32 maxDoubleCLickTime = 500; int maxMoveX = 4; int maxMoveY = 4; diff --git a/engines/wintermute/ui/ui_tiled_image.cpp b/engines/wintermute/ui/ui_tiled_image.cpp index 7e1de951cf..abccdd6c39 100644 --- a/engines/wintermute/ui/ui_tiled_image.cpp +++ b/engines/wintermute/ui/ui_tiled_image.cpp @@ -358,7 +358,7 @@ bool UITiledImage::saveAsText(BaseDynamicBuffer *buffer, int indent) { } ////////////////////////////////////////////////////////////////////////// -void UITiledImage::correctSize(int *width, int *height) { +void UITiledImage::correctSize(int32 *width, int32 *height) { int tileWidth = _middleMiddle.right - _middleMiddle.left; int tileHeight = _middleMiddle.bottom - _middleMiddle.top; diff --git a/engines/wintermute/ui/ui_tiled_image.h b/engines/wintermute/ui/ui_tiled_image.h index 4868710264..a6cd22d53d 100644 --- a/engines/wintermute/ui/ui_tiled_image.h +++ b/engines/wintermute/ui/ui_tiled_image.h @@ -38,7 +38,7 @@ class BaseSubFrame; class UITiledImage : public BaseObject { public: DECLARE_PERSISTENT(UITiledImage, BaseObject) - void correctSize(int *width, int *height); + void correctSize(int32 *width, int32 *height); bool loadFile(const char *filename); bool loadBuffer(byte *buffer, bool complete = true); virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent) override; -- cgit v1.2.3