diff options
| author | Willem Jan Palenstijn | 2013-09-30 22:05:32 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-09-30 22:05:32 +0200 |
| commit | 8e58be7a1d39d8235ddd7beb876de1ff3988fca5 (patch) | |
| tree | 64cebc37a319e17299a6a37a8b13b35742174d58 /engines/sword25/gfx/animation.h | |
| parent | 057b01951a92cc17e6c7a5121d2bd866841c4f75 (diff) | |
| parent | 17df6b343a0fdb2168b4d3a22927cd0f584ce735 (diff) | |
| download | scummvm-rg350-8e58be7a1d39d8235ddd7beb876de1ff3988fca5.tar.gz scummvm-rg350-8e58be7a1d39d8235ddd7beb876de1ff3988fca5.tar.bz2 scummvm-rg350-8e58be7a1d39d8235ddd7beb876de1ff3988fca5.zip | |
Merge branch 'master' into wme_rendering
Diffstat (limited to 'engines/sword25/gfx/animation.h')
| -rw-r--r-- | engines/sword25/gfx/animation.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h index 44255e3b64..ced1995ae9 100644 --- a/engines/sword25/gfx/animation.h +++ b/engines/sword25/gfx/animation.h @@ -159,18 +159,18 @@ private: BACKWARD }; - int _relX; - int _relY; + int32 _relX; + int32 _relY; float _scaleFactorX; float _scaleFactorY; - uint _modulationColor; - uint _currentFrame; - int _currentFrameTime; + uint32 _modulationColor; + uint32 _currentFrame; + int32 _currentFrameTime; bool _running; bool _finished; Direction _direction; AnimationResource *_animationResourcePtr; - uint _animationTemplateHandle; + uint32 _animationTemplateHandle; bool _framesLocked; ANIMATION_CALLBACK _loopPointCallback; |