WINTERMUTE: Use int32 instead of int in classes.

14 files changed, 36 insertions, 36 deletions

diff --git a/engines/wintermute/ad/ad_actor.h b/engines/wintermute/ad/ad_actor.h
index ebf686f74b..49ee39b65d 100644
--- a/engines/wintermute/ad/ad_actor.h
+++ b/engines/wintermute/ad/ad_actor.h
@@ -100,7 +100,7 @@ private:
 	double _pFStepY;
 	double _pFX;
 	double _pFY;
-	int _pFCount;
+	int32 _pFCount;
 };
 
 } // end of namespace Wintermute
diff --git a/engines/wintermute/ad/ad_game.h b/engines/wintermute/ad/ad_game.h
index dfb7f1fe8e..8361dad1cb 100644
--- a/engines/wintermute/ad/ad_game.h
+++ b/engines/wintermute/ad/ad_game.h
@@ -86,10 +86,10 @@ public:
 	AdSceneState *getSceneState(const char *filename, bool saving);
 	BaseViewport *_sceneViewport;
 
-	int _texItemLifeTime;
-	int _texWalkLifeTime;
-	int _texStandLifeTime;
-	int _texTalkLifeTime;
+	int32 _texItemLifeTime;
+	int32 _texWalkLifeTime;
+	int32 _texStandLifeTime;
+	int32 _texTalkLifeTime;
 
 	TTalkSkipButton _talkSkipButton;
 
diff --git a/engines/wintermute/ad/ad_inventory.h b/engines/wintermute/ad/ad_inventory.h
index f226a65612..999200b465 100644
--- a/engines/wintermute/ad/ad_inventory.h
+++ b/engines/wintermute/ad/ad_inventory.h
@@ -44,7 +44,7 @@ public:
 	AdInventory(BaseGame *inGame);
 	virtual ~AdInventory();
 	BaseArray<AdItem *> _takenItems;
-	int _scrollOffset;
+	int32 _scrollOffset;
 };
 
 } // end of namespace Wintermute
diff --git a/engines/wintermute/ad/ad_inventory_box.h b/engines/wintermute/ad/ad_inventory_box.h
index cb6d084562..efbec2d851 100644
--- a/engines/wintermute/ad/ad_inventory_box.h
+++ b/engines/wintermute/ad/ad_inventory_box.h
@@ -43,8 +43,8 @@ public:
 	bool _visible;
 	virtual bool display();
 	UIButton *_closeButton;
-	int _spacing;
-	int _scrollOffset;
+	int32 _spacing;
+	int32 _scrollOffset;
 	Rect32 _itemsArea;
 	bool listen(BaseScriptHolder *param1, uint32 param2);
 	UIWindow *_window;
@@ -55,9 +55,9 @@ public:
 	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent);
 private:
 	bool _exclusive;
-	int _scrollBy;
-	int _itemHeight;
-	int _itemWidth;
+	int32 _scrollBy;
+	int32 _itemHeight;
+	int32 _itemWidth;
 };
 
 } // end of namespace Wintermute
diff --git a/engines/wintermute/ad/ad_item.h b/engines/wintermute/ad/ad_item.h
index 79978f9f72..4c9b8d998f 100644
--- a/engines/wintermute/ad/ad_item.h
+++ b/engines/wintermute/ad/ad_item.h
@@ -57,9 +57,9 @@ public:
 	virtual const char *scToString();
 private:
 	bool _displayAmount;
-	int _amount;
-	int _amountOffsetX;
-	int _amountOffsetY;
+	int32 _amount;
+	int32 _amountOffsetX;
+	int32 _amountOffsetY;
 	TTextAlign _amountAlign;
 	char *_amountString;
 };
diff --git a/engines/wintermute/ad/ad_layer.h b/engines/wintermute/ad/ad_layer.h
index de65e2822f..95f96617f5 100644
--- a/engines/wintermute/ad/ad_layer.h
+++ b/engines/wintermute/ad/ad_layer.h
@@ -36,8 +36,8 @@ public:
 	bool _closeUp;
 	DECLARE_PERSISTENT(AdLayer, BaseObject)
 	bool _active;
-	int _height;
-	int _width;
+	int32 _height;
+	int32 _width;
 	bool _main;
 	AdLayer(BaseGame *inGame);
 	virtual ~AdLayer();
diff --git a/engines/wintermute/ad/ad_object.h b/engines/wintermute/ad/ad_object.h
index 39480e3446..81ecaf11f2 100644
--- a/engines/wintermute/ad/ad_object.h
+++ b/engines/wintermute/ad/ad_object.h
@@ -109,13 +109,13 @@ protected:
 	bool getScale(float *scaleX, float *scaleY);
 private:
 	bool _partFollowParent;
-	int _partOffsetX;
-	int _partOffsetY;
+	int32 _partOffsetX;
+	int32 _partOffsetY;
 	bool _subtitlesModRelative;
 	bool _subtitlesModXCenter;
-	int _subtitlesModX;
-	int _subtitlesModY;
-	int _subtitlesWidth;
+	int32 _subtitlesModX;
+	int32 _subtitlesModY;
+	int32 _subtitlesWidth;
 	AdRegion *_currentRegions[MAX_NUM_REGIONS];
 	BaseArray<AdObject *> _attachmentsPre;
 	BaseArray<AdObject *> _attachmentsPost;
diff --git a/engines/wintermute/ad/ad_path.h b/engines/wintermute/ad/ad_path.h
index 6b043197aa..3f38355b94 100644
--- a/engines/wintermute/ad/ad_path.h
+++ b/engines/wintermute/ad/ad_path.h
@@ -47,7 +47,7 @@ public:
 	AdPath(BaseGame *inGame);
 	virtual ~AdPath();
 	BaseArray<BasePoint *> _points;
-	int _currIndex;
+	int32 _currIndex;
 	bool _ready;
 };
 
diff --git a/engines/wintermute/ad/ad_path_point.h b/engines/wintermute/ad/ad_path_point.h
index 58457976c8..04648b1733 100644
--- a/engines/wintermute/ad/ad_path_point.h
+++ b/engines/wintermute/ad/ad_path_point.h
@@ -42,7 +42,7 @@ public:
 	virtual ~AdPathPoint();
 	AdPathPoint *_origin;
 	bool _marked;
-	int _distance;
+	int32 _distance;
 };
 
 } // end of namespace Wintermute
diff --git a/engines/wintermute/ad/ad_response_box.h b/engines/wintermute/ad/ad_response_box.h
index e1b766cbdb..d7b2931ef6 100644
--- a/engines/wintermute/ad/ad_response_box.h
+++ b/engines/wintermute/ad/ad_response_box.h
@@ -78,13 +78,13 @@ public:
 	UIWindow *getResponseWindow();
 	uint32 getNumResponses() const;
 private:
-	int _spacing;
-	int _scrollOffset;
+	int32 _spacing;
+	int32 _scrollOffset;
 	BaseFont *_fontHover;
 	BaseFont *_font;
 	bool _horizontal;
 	Rect32 _responseArea;
-	int _verticalAlign;
+	int32 _verticalAlign;
 	TTextAlign _align;
 	BaseArray<UIButton *> _respButtons;
 	BaseArray<const AdResponse *> _responses;
diff --git a/engines/wintermute/ad/ad_response_context.h b/engines/wintermute/ad/ad_response_context.h
index f2e2a45b21..dd0008a728 100644
--- a/engines/wintermute/ad/ad_response_context.h
+++ b/engines/wintermute/ad/ad_response_context.h
@@ -38,7 +38,7 @@ class AdResponseContext : public BaseClass {
 public:
 	void setContext(const char *context);
 	const char *getContext() const { return _context; }
-	int _id;
+	int32 _id;
 
 	DECLARE_PERSISTENT(AdResponseContext, BaseClass)
 	AdResponseContext(BaseGame *inGame);
diff --git a/engines/wintermute/ad/ad_scene.h b/engines/wintermute/ad/ad_scene.h
index a820157361..a8cf9b4e28 100644
--- a/engines/wintermute/ad/ad_scene.h
+++ b/engines/wintermute/ad/ad_scene.h
@@ -125,12 +125,12 @@ public:
 	BaseArray<AdWaypointGroup *> _waypointGroups;
 	bool loadFile(const char *filename);
 	bool loadBuffer(byte *buffer, bool complete = true);
-	int _width;
-	int _height;
+	int32 _width;
+	int32 _height;
 	bool addObject(AdObject *Object);
 	bool removeObject(AdObject *Object);
-	int _editorMarginH;
-	int _editorMarginV;
+	int32 _editorMarginH;
+	int32 _editorMarginV;
 	uint32 _editorColFrame;
 	uint32 _editorColEntity;
 	uint32 _editorColRegion;
diff --git a/engines/wintermute/ad/ad_sentence.h b/engines/wintermute/ad/ad_sentence.h
index e7c94030b9..6f255578f7 100644
--- a/engines/wintermute/ad/ad_sentence.h
+++ b/engines/wintermute/ad/ad_sentence.h
@@ -56,14 +56,14 @@ public:
 	BaseSound *_sound;
 	TTextAlign _align;
 	bool display();
-	int _width;
+	int32 _width;
 	Point32 _pos;
 	BaseFont *_font;
 	char *getNextStance();
 	char *getCurrentStance();
 	void setStances(const char *stances);
 	void setText(const char *text);
-	int _currentStance;
+	int32 _currentStance;
 	uint32 _startTime;
 	char *_stances;
 	char *_text;
diff --git a/engines/wintermute/ad/ad_waypoint_group.h b/engines/wintermute/ad/ad_waypoint_group.h
index 7e427313e6..c44967c38e 100644
--- a/engines/wintermute/ad/ad_waypoint_group.h
+++ b/engines/wintermute/ad/ad_waypoint_group.h
@@ -50,10 +50,10 @@ public:
 	virtual ScValue *scGetProperty(const Common::String &name);
 	virtual bool scSetProperty(const char *name, ScValue *value);
 private:
-	int _editorSelectedPoint;
+	int32 _editorSelectedPoint;
 	float _lastMimicScale;
-	int _lastMimicX;
-	int _lastMimicY;
+	int32 _lastMimicX;
+	int32 _lastMimicY;
 };
 
 } // end of namespace Wintermute