[Scummvm-cvs-logs] scummvm master -> 2625f3931a946180de617fa0e04b8b4d3f30cb2d

somaen einarjohants at gmail.com
Sat Apr 20 17:37:59 CEST 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2625f3931a WINTERMUTE: Fix a few more int->int32's spotted by fuzzie.


Commit: 2625f3931a946180de617fa0e04b8b4d3f30cb2d
    https://github.com/scummvm/scummvm/commit/2625f3931a946180de617fa0e04b8b4d3f30cb2d
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-04-20T08:37:19-07:00

Commit Message:
WINTERMUTE: Fix a few more int->int32's spotted by fuzzie.

Changed paths:
    engines/wintermute/ad/ad_scene.h
    engines/wintermute/base/base_game.cpp
    engines/wintermute/ui/ui_tiled_image.cpp
    engines/wintermute/ui/ui_tiled_image.h



diff --git a/engines/wintermute/ad/ad_scene.h b/engines/wintermute/ad/ad_scene.h
index a129bfb..d418f4e 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 aaa6c90..f5b63e4 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 7e1de95..abccdd6 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 4868710..a6cd22d 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;






More information about the Scummvm-git-logs mailing list