aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/gfx/animationtemplate.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2010-09-02 12:14:04 +0000
committerEugene Sandulenko2010-10-12 23:30:00 +0000
commit086f5961b6575c50bb386750b6e9a3ed1efdd8cd (patch)
tree75c532790d67ccd3b8fdc5c371a3ce3bf0705dca /engines/sword25/gfx/animationtemplate.cpp
parent0cdb2ded85d17150cb108a5d63dd8957c29af2a5 (diff)
downloadscummvm-rg350-086f5961b6575c50bb386750b6e9a3ed1efdd8cd.tar.gz
scummvm-rg350-086f5961b6575c50bb386750b6e9a3ed1efdd8cd.tar.bz2
scummvm-rg350-086f5961b6575c50bb386750b6e9a3ed1efdd8cd.zip
SWORD25: unsigned int -> uint
svn-id: r53309
Diffstat (limited to 'engines/sword25/gfx/animationtemplate.cpp')
-rw-r--r--engines/sword25/gfx/animationtemplate.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/sword25/gfx/animationtemplate.cpp b/engines/sword25/gfx/animationtemplate.cpp
index 426cbabfea..0c6f28c07e 100644
--- a/engines/sword25/gfx/animationtemplate.cpp
+++ b/engines/sword25/gfx/animationtemplate.cpp
@@ -53,7 +53,7 @@ namespace Sword25 {
// Konstruktion / Destruktion
// -----------------------------------------------------------------------------
-unsigned int AnimationTemplate::Create(const Common::String &SourceAnimation) {
+uint AnimationTemplate::Create(const Common::String &SourceAnimation) {
AnimationTemplate *AnimationTemplatePtr = new AnimationTemplate(SourceAnimation);
if (AnimationTemplatePtr->IsValid()) {
@@ -66,7 +66,7 @@ unsigned int AnimationTemplate::Create(const Common::String &SourceAnimation) {
// -----------------------------------------------------------------------------
-unsigned int AnimationTemplate::Create(const AnimationTemplate &Other) {
+uint AnimationTemplate::Create(const AnimationTemplate &Other) {
AnimationTemplate *AnimationTemplatePtr = new AnimationTemplate(Other);
if (AnimationTemplatePtr->IsValid()) {
@@ -79,7 +79,7 @@ unsigned int AnimationTemplate::Create(const AnimationTemplate &Other) {
// -----------------------------------------------------------------------------
-unsigned int AnimationTemplate::Create(InputPersistenceBlock &Reader, unsigned int Handle) {
+uint AnimationTemplate::Create(InputPersistenceBlock &Reader, uint Handle) {
AnimationTemplate *AnimationTemplatePtr = new AnimationTemplate(Reader, Handle);
if (AnimationTemplatePtr->IsValid()) {
@@ -133,7 +133,7 @@ AnimationTemplate::AnimationTemplate(const AnimationTemplate &Other) {
// -----------------------------------------------------------------------------
-AnimationTemplate::AnimationTemplate(InputPersistenceBlock &Reader, unsigned int Handle) {
+AnimationTemplate::AnimationTemplate(InputPersistenceBlock &Reader, uint Handle) {
// Objekt registrieren.
AnimationTemplateRegistry::GetInstance().RegisterObject(this, Handle);
@@ -183,7 +183,7 @@ void AnimationTemplate::SetFrame(int DestIndex, int SrcIndex) {
// -----------------------------------------------------------------------------
-bool AnimationTemplate::ValidateSourceIndex(unsigned int Index) const {
+bool AnimationTemplate::ValidateSourceIndex(uint Index) const {
if (Index > m_SourceAnimationPtr->GetFrameCount()) {
BS_LOG_WARNINGLN("Tried to insert a frame (\"%d\") that does not exist in the source animation (\"%s\"). Ignoring call.",
Index, m_SourceAnimationPtr->GetFileName().c_str());
@@ -194,7 +194,7 @@ bool AnimationTemplate::ValidateSourceIndex(unsigned int Index) const {
// -----------------------------------------------------------------------------
-bool AnimationTemplate::ValidateDestIndex(unsigned int Index) const {
+bool AnimationTemplate::ValidateDestIndex(uint Index) const {
if (Index > m_Frames.size()) {
BS_LOG_WARNINGLN("Tried to change a nonexistent frame (\"%d\") in a template animation. Ignoring call.",
Index);
@@ -249,11 +249,11 @@ bool AnimationTemplate::Unpersist(InputPersistenceBlock &Reader) {
Result &= AnimationDescription::Unpersist(Reader);
// Frameanzahl lesen.
- unsigned int FrameCount;
+ uint FrameCount;
Reader.Read(FrameCount);
// Frames einzeln wieder herstellen.
- for (unsigned int i = 0; i < FrameCount; ++i) {
+ for (uint i = 0; i < FrameCount; ++i) {
Frame frame;
Reader.Read(frame.HotspotX);
Reader.Read(frame.HotspotY);