diff options
author | Einar Johan Trøan Sømåen | 2013-04-19 18:20:43 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2013-04-19 18:20:43 +0200 |
commit | c5bd3ecb130186c8490b4293a5b4eb4d61780c7a (patch) | |
tree | 6ce7132897f948a6860608be1d700c99373d8326 /engines | |
parent | 9184bb5c243604709a44188794f89979e761c605 (diff) | |
download | scummvm-rg350-c5bd3ecb130186c8490b4293a5b4eb4d61780c7a.tar.gz scummvm-rg350-c5bd3ecb130186c8490b4293a5b4eb4d61780c7a.tar.bz2 scummvm-rg350-c5bd3ecb130186c8490b4293a5b4eb4d61780c7a.zip |
WINTERMUTE: Change more int's to int32s.
Diffstat (limited to 'engines')
-rw-r--r-- | engines/wintermute/ad/ad_scene.h | 12 | ||||
-rw-r--r-- | engines/wintermute/base/base_sprite.h | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_sub_frame.h | 4 | ||||
-rw-r--r-- | engines/wintermute/base/particles/part_emitter.h | 30 |
4 files changed, 24 insertions, 24 deletions
diff --git a/engines/wintermute/ad/ad_scene.h b/engines/wintermute/ad/ad_scene.h index 9ddef73b65..a129bfb5e4 100644 --- a/engines/wintermute/ad/ad_scene.h +++ b/engines/wintermute/ad/ad_scene.h @@ -98,14 +98,14 @@ public: void scrollTo(int offsetX, int offsetY); virtual bool update() override; bool _autoScroll; - int _targetOffsetTop; - int _targetOffsetLeft; + int32 _targetOffsetTop; + int32 _targetOffsetLeft; - int _scrollPixelsV; + int32 _scrollPixelsV; uint32 _scrollTimeV; uint32 _lastTimeV; - int _scrollPixelsH; + int32 _scrollPixelsH; uint32 _scrollTimeH; uint32 _lastTimeH; @@ -171,8 +171,8 @@ private: BaseObject *_pfRequester; BaseArray<AdPathPoint *> _pfPath; - int _offsetTop; - int _offsetLeft; + int32 _offsetTop; + int32 _offsetLeft; }; diff --git a/engines/wintermute/base/base_sprite.h b/engines/wintermute/base/base_sprite.h index 24c1f47755..05cb9fc936 100644 --- a/engines/wintermute/base/base_sprite.h +++ b/engines/wintermute/base/base_sprite.h @@ -56,7 +56,7 @@ public: bool loadFile(const Common::String &filename, int lifeTime = -1, TSpriteCacheType cacheType = CACHE_ALL); bool draw(int x, int y, BaseObject *Register = nullptr, float zoomX = 100, float zoomY = 100, uint32 alpha = 0xFFFFFFFF); bool _looping; - int _currentFrame; + int32 _currentFrame; bool addFrame(const char *filename, uint32 delay = 0, int hotspotX = 0, int hotspotY = 0, Rect32 *rect = nullptr); BaseSprite(BaseGame *inGame, BaseObject *owner = nullptr); virtual ~BaseSprite(); diff --git a/engines/wintermute/base/base_sub_frame.h b/engines/wintermute/base/base_sub_frame.h index 1ecf6c671d..37ba34b748 100644 --- a/engines/wintermute/base/base_sub_frame.h +++ b/engines/wintermute/base/base_sub_frame.h @@ -56,8 +56,8 @@ public: bool getBoundingRect(Rect32 *rect, int x, int y, float scaleX = 100, float scaleY = 100); const char* getSurfaceFilename(); - int _hotspotX; - int _hotspotY; + int32 _hotspotX; + int32 _hotspotY; uint32 _alpha; // These two setters and getters are rather usefull, as they allow _rect to be lazily defined // Thus we don't need to load the actual graphics before the rect is actually needed. diff --git a/engines/wintermute/base/particles/part_emitter.h b/engines/wintermute/base/particles/part_emitter.h index cbc0aa49b4..a0d701f338 100644 --- a/engines/wintermute/base/particles/part_emitter.h +++ b/engines/wintermute/base/particles/part_emitter.h @@ -94,31 +94,31 @@ private: float _scale2; bool _scaleZBased; - int _maxParticles; + int32 _maxParticles; - int _lifeTime1; - int _lifeTime2; + int32 _lifeTime1; + int32 _lifeTime2; bool _lifeTimeZBased; - int _genInterval; - int _genAmount; + int32 _genInterval; + int32 _genAmount; bool _running; - int _overheadTime; + int32 _overheadTime; - int _maxBatches; - int _batchesGenerated; + int32 _maxBatches; + int32 _batchesGenerated; Rect32 _border; - int _borderThicknessLeft; - int _borderThicknessRight; - int _borderThicknessTop; - int _borderThicknessBottom; + int32 _borderThicknessLeft; + int32 _borderThicknessRight; + int32 _borderThicknessTop; + int32 _borderThicknessBottom; - int _fadeInTime; + int32 _fadeInTime; - int _alpha1; - int _alpha2; + int32 _alpha1; + int32 _alpha2; bool _alphaTimeBased; bool _useRegion; |