diff options
author | Einar Johan Trøan Sømåen | 2013-04-18 17:45:50 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2013-04-18 17:45:50 +0200 |
commit | b6242d0ea5603f73b488ed144ee3807b89829072 (patch) | |
tree | 4a7bf4e8bd367e721aab7ce3c3e8a4e3ee76e0f4 /engines/wintermute/base/gfx | |
parent | 5ddc2ee915bcd470f4ecaf197a64009e05a04bf8 (diff) | |
download | scummvm-rg350-b6242d0ea5603f73b488ed144ee3807b89829072.tar.gz scummvm-rg350-b6242d0ea5603f73b488ed144ee3807b89829072.tar.bz2 scummvm-rg350-b6242d0ea5603f73b488ed144ee3807b89829072.zip |
WINTERMUTE: Use int32 instead of int in classes.
Diffstat (limited to 'engines/wintermute/base/gfx')
-rw-r--r-- | engines/wintermute/base/gfx/base_renderer.h | 32 | ||||
-rw-r--r-- | engines/wintermute/base/gfx/base_surface.h | 6 |
2 files changed, 19 insertions, 19 deletions
diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h index 971d0dfb55..bfef29a5ed 100644 --- a/engines/wintermute/base/gfx/base_renderer.h +++ b/engines/wintermute/base/gfx/base_renderer.h @@ -169,7 +169,7 @@ public: bool isReady() const { return _ready; } bool isWindowed() const { return _windowed; } - int getBPP() const { return _bPP; } + int32 getBPP() const { return _bPP; } uint32 _window; uint32 _forceAlphaColor; @@ -188,33 +188,33 @@ public: bool displayIndicator(); - int getWidth() const { return _width; } - int getHeight() const { return _height; } + int32 getWidth() const { return _width; } + int32 getHeight() const { return _height; } protected: - int _height; - int _width; + int32 _height; + int32 _width; bool _windowed; - int _bPP; + int32 _bPP; Common::String _loadImageName; Common::String _saveImageName; - int _saveImageX; - int _saveImageY; - int _loadImageX; - int _loadImageY; + int32 _saveImageX; + int32 _saveImageY; + int32 _loadImageX; + int32 _loadImageY; BaseSurface *_saveLoadImage; bool _hasDrawnSaveLoadImage; - int _indicatorWidthDrawn; + int32 _indicatorWidthDrawn; uint32 _indicatorColor; - int _indicatorX; - int _indicatorY; - int _indicatorWidth; - int _indicatorHeight; + int32 _indicatorX; + int32 _indicatorY; + int32 _indicatorWidth; + int32 _indicatorHeight; bool _loadInProgress; bool _indicatorDisplay; - int _indicatorProgress; + int32 _indicatorProgress; uint32 _clipperWindow; diff --git a/engines/wintermute/base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h index 1ada900161..b83efa0bb8 100644 --- a/engines/wintermute/base/gfx/base_surface.h +++ b/engines/wintermute/base/gfx/base_surface.h @@ -41,7 +41,7 @@ public: virtual bool prepareToDraw(); uint32 _lastUsedTime; bool _valid; - int _lifeTime; + int32 _lifeTime; bool _pixelOpReady; BaseSurface(BaseGame *inGame); @@ -90,8 +90,8 @@ protected: bool _keepLoaded; Common::String _filename; - int _height; - int _width; + int32 _height; + int32 _width; }; |