AVALANCHE: Merge branch 'avalanche' of https://github.com/urukgit/scummvm into avalanche

Conflicts:
	engines/avalanche/animation.cpp

5 files changed, 6 insertions, 6 deletions

diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp
index 939f50f712..384d274210 100644
--- a/engines/avalanche/acci2.cpp
+++ b/engines/avalanche/acci2.cpp
@@ -1277,7 +1277,7 @@ void Acci::personSpeaks() {
 
 	bool found = false; // The _person we're looking for's code is in _person.
 
-	for (int16 i = 0; i < _vm->_animation->kSpriteNumbMax; i++) {
+	for (byte i = 0; i < _vm->_animation->kSpriteNumbMax; i++) {
 		if (_vm->_animation->_sprites[i]._quick && ((_vm->_animation->_sprites[i]._stat._acciNum + 149) == _person)) {
 			_vm->_scrolls->displayText(Common::String(_vm->_scrolls->kControlRegister) + byte(i + 49) + _vm->_scrolls->kControlToBuffer);
 			found = true;
diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index 0875dd223e..006ed5a3d3 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -172,7 +172,7 @@ void AnimationType::appear(int16 wx, int16 wy, byte wf) {
  * @remarks	Originally called 'collision_check'
  */
 bool AnimationType::checkCollision() {
-	for (int16 i = 0; i < _anim->kSpriteNumbMax; i++) {
+	for (byte i = 0; i < _anim->kSpriteNumbMax; i++) {
 		if (_anim->_sprites[i]._quick && (_anim->_sprites[i]._id != _id) &&
 			((_x + _info._xLength) > _anim->_sprites[i]._x) &&
 			(_x < (_anim->_sprites[i]._x + _anim->_sprites[i]._info._xLength)) &&
diff --git a/engines/avalanche/animation.h b/engines/avalanche/animation.h
index f78d0b157b..73abadac2e 100644
--- a/engines/avalanche/animation.h
+++ b/engines/avalanche/animation.h
@@ -98,7 +98,7 @@ public:
 		kDirStopped
 	};
 
-	static const int16 kSpriteNumbMax = 5; // current max no. of sprites
+	static const byte kSpriteNumbMax = 5; // current max no. of sprites
 
 	enum Proc {
 		kProcFollowAvvyY = 1,
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index d59c18b23e..d2e9a8de9b 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -282,7 +282,7 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) {
 
 	byte spriteNum = 0;
 	if (sz.isSaving()) {
-		for (int16 i = 0; i < _animation->kSpriteNumbMax; i++) {
+		for (byte i = 0; i < _animation->kSpriteNumbMax; i++) {
 			if (_animation->_sprites[i]._quick)
 				spriteNum++;
 		}
@@ -290,7 +290,7 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) {
 	sz.syncAsByte(spriteNum);
 
 	if (sz.isLoading()) {
-		for (int16 i = 0; i < _animation->kSpriteNumbMax; i++) { // Deallocate sprites.
+		for (byte i = 0; i < _animation->kSpriteNumbMax; i++) { // Deallocate sprites.
 			if (_animation->_sprites[i]._quick)
 				_animation->_sprites[i].remove();
 		}
diff --git a/engines/avalanche/visa2.cpp b/engines/avalanche/visa2.cpp
index d7e1563fce..81e46712b4 100644
--- a/engines/avalanche/visa2.cpp
+++ b/engines/avalanche/visa2.cpp
@@ -248,7 +248,7 @@ void Visa::talkTo(byte whom) {
 		whom -= 149;
 
 	bool noMatches = true;
-	for (int16 i = 0; i <= _vm->_animation->kSpriteNumbMax; i++) {
+	for (byte i = 0; i <= _vm->_animation->kSpriteNumbMax; i++) {
 		if (_vm->_animation->_sprites[i]._stat._acciNum == whom) {
 			_vm->_scrolls->displayText(Common::String(_vm->_scrolls->kControlRegister) + (i + 49) + _vm->_scrolls->kControlToBuffer);
 			noMatches = false;