aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/gfx/animationresource.h
diff options
context:
space:
mode:
authorEugene Sandulenko2010-08-06 13:13:25 +0000
committerEugene Sandulenko2010-10-12 22:35:55 +0000
commit47904bc7b2992189bb554833f00a79ff0fea9fb8 (patch)
tree1cec51758c6741b970bd064fafee77607b9f884f /engines/sword25/gfx/animationresource.h
parentca17def625154e5f758b797e4fc48c76b0566320 (diff)
downloadscummvm-rg350-47904bc7b2992189bb554833f00a79ff0fea9fb8.tar.gz
scummvm-rg350-47904bc7b2992189bb554833f00a79ff0fea9fb8.tar.bz2
scummvm-rg350-47904bc7b2992189bb554833f00a79ff0fea9fb8.zip
SWORD25: Mass-astyle.
svn-id: r53222
Diffstat (limited to 'engines/sword25/gfx/animationresource.h')
-rw-r--r--engines/sword25/gfx/animationresource.h58
1 files changed, 39 insertions, 19 deletions
diff --git a/engines/sword25/gfx/animationresource.h b/engines/sword25/gfx/animationresource.h
index 1eff3edcc8..f67963e6f8 100644
--- a/engines/sword25/gfx/animationresource.h
+++ b/engines/sword25/gfx/animationresource.h
@@ -23,7 +23,7 @@
*
*/
-/*
+/*
* This code is based on Broken Sword 2.5 engine
*
* Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdoerfer
@@ -63,34 +63,54 @@ class BS_PackageManager;
// Class Definition
// -----------------------------------------------------------------------------
-class BS_AnimationResource : public BS_Resource, public BS_AnimationDescription
-{
+class BS_AnimationResource : public BS_Resource, public BS_AnimationDescription {
public:
- BS_AnimationResource(const Common::String & FileName);
+ BS_AnimationResource(const Common::String &FileName);
virtual ~BS_AnimationResource();
- virtual const Frame & GetFrame(unsigned int Index) const { BS_ASSERT(Index < m_Frames.size()); return m_Frames[Index]; }
- virtual unsigned int GetFrameCount() const { return m_Frames.size(); }
- virtual void Unlock() { Release(); }
-
- BS_Animation::ANIMATION_TYPES GetAnimationType() const { return m_AnimationType; }
- int GetFPS() const { return m_FPS; }
- int GetMillisPerFrame() const { return m_MillisPerFrame; }
- bool IsScalingAllowed() const { return m_ScalingAllowed; }
- bool IsAlphaAllowed() const { return m_AlphaAllowed; }
- bool IsColorModulationAllowed() const { return m_ColorModulationAllowed; }
- bool IsValid() const { return m_Valid; }
+ virtual const Frame &GetFrame(unsigned int Index) const {
+ BS_ASSERT(Index < m_Frames.size());
+ return m_Frames[Index];
+ }
+ virtual unsigned int GetFrameCount() const {
+ return m_Frames.size();
+ }
+ virtual void Unlock() {
+ Release();
+ }
+
+ BS_Animation::ANIMATION_TYPES GetAnimationType() const {
+ return m_AnimationType;
+ }
+ int GetFPS() const {
+ return m_FPS;
+ }
+ int GetMillisPerFrame() const {
+ return m_MillisPerFrame;
+ }
+ bool IsScalingAllowed() const {
+ return m_ScalingAllowed;
+ }
+ bool IsAlphaAllowed() const {
+ return m_AlphaAllowed;
+ }
+ bool IsColorModulationAllowed() const {
+ return m_ColorModulationAllowed;
+ }
+ bool IsValid() const {
+ return m_Valid;
+ }
private:
- bool m_Valid;
+ bool m_Valid;
- Common::Array<Frame> m_Frames;
+ Common::Array<Frame> m_Frames;
//@{
/** @name Dokument-Parser Methoden */
- bool ParseAnimationTag(TiXmlElement& AnimationTag, int& FPS, BS_Animation::ANIMATION_TYPES & AnimationType);
- bool ParseFrameTag(TiXmlElement& FrameTag, Frame& Frame, BS_PackageManager& PackageManager);
+ bool ParseAnimationTag(TiXmlElement &AnimationTag, int &FPS, BS_Animation::ANIMATION_TYPES &AnimationType);
+ bool ParseFrameTag(TiXmlElement &FrameTag, Frame &Frame, BS_PackageManager &PackageManager);
//@}