[Scummvm-cvs-logs] scummvm master -> fc9595efdc22aecb77800dca29fbe23291855c48

Strangerke Strangerke at scummvm.org
Mon Dec 22 19:18:05 CET 2014


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fc9595efdc ACCESS: Remove an unused variable in Animation manager


Commit: fc9595efdc22aecb77800dca29fbe23291855c48
    https://github.com/scummvm/scummvm/commit/fc9595efdc22aecb77800dca29fbe23291855c48
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-12-22T19:16:11+01:00

Commit Message:
ACCESS: Remove an unused variable in Animation manager

Changed paths:
    engines/access/animation.cpp
    engines/access/animation.h



diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index cc699a2..14d7c0d 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -63,7 +63,6 @@ Animation::Animation(AccessEngine *vm, Common::SeekableReadStream *stream) : Man
 	_countdownTicks = stream->readUint16LE();
 	_currentLoopCount = stream->readSint16LE();
 	stream->readUint16LE(); // unk
-	_field10 = 0;
 
 	Common::Array<uint16> frameOffsets;
 	uint16 ofs;
@@ -311,9 +310,7 @@ Animation *AnimationManager::setAnimation(int animId) {
 	anim->_countdownTicks = anim->_initialTicks;
 	anim->_frameNumber = 0;
 
-	anim->_currentLoopCount = (anim->_type != 3 && anim->_type != 4) ? 0 :
-		anim->_loopCount;
-	anim->_field10 = 0;
+	anim->_currentLoopCount = (anim->_type != 3 && anim->_type != 4) ? 0 : anim->_loopCount;
 
 	return anim;
 }
diff --git a/engines/access/animation.h b/engines/access/animation.h
index 722f543..72621c4 100644
--- a/engines/access/animation.h
+++ b/engines/access/animation.h
@@ -106,7 +106,6 @@ public:
 	int _loopCount;
 	int _countdownTicks;
 	int _currentLoopCount;
-	int _field10;
 public:
 	Animation(AccessEngine *vm, Common::SeekableReadStream *stream);
 	~Animation();






More information about the Scummvm-git-logs mailing list