AVALANCHE: Remove bytefields, which are set but never used

4 files changed, 3 insertions, 29 deletions

diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index 57f9cdb7c5..89fd16f258 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -170,16 +170,6 @@ bool AnimationType::checkCollision() {
 }
 
 void AnimationType::walk() {
-	if (_visible) {
-		ByteField r;
-		r._x1 = (_x / 8) - 1;
-		if (r._x1 == 255)
-			r._x1 = 0;
-		r._y1 = _y - 2;
-		r._x2 = ((_x + _info._xLength) / 8) + 1;
-		r._y2 = _y + _info._yLength + 2;
-	}
-
 	if (!_anim->_vm->_doingSpriteRun) {
 		_oldX[_anim->_vm->_cp] = _x;
 		_oldY[_anim->_vm->_cp] = _y;
diff --git a/engines/avalanche/avalot.h b/engines/avalanche/avalot.h
index 6c5ef3155b..a9ec69fb3b 100644
--- a/engines/avalanche/avalot.h
+++ b/engines/avalanche/avalot.h
@@ -87,10 +87,6 @@ struct FieldType {
 	int16 _x1, _y1, _x2, _y2;
 };
 
-struct ByteField {
-	byte _x1, _y1, _x2, _y2;
-};
-
 struct LineType : public FieldType {
 	Color _color;
 };
diff --git a/engines/avalanche/background.cpp b/engines/avalanche/background.cpp
index e5835ab95c..e9d3672d4f 100644
--- a/engines/avalanche/background.cpp
+++ b/engines/avalanche/background.cpp
@@ -359,21 +359,10 @@ void Background::draw(int16 destX, int16 destY, byte sprId) {
 	}
 }
 
+/**
+ * @remarks	Originally called 'display_it'
+ */
 void Background::drawSprite(int16 x, int16 y, SpriteType &sprite) {
-	_r._x1 = x;
-	_r._y1 = y;
-	_r._y2 = y + sprite._yl;
-
-	switch (sprite._type) {
-	case kNaturalImage: // Allow fallthrough on purpose.
-	case kBgi:
-		_r._x2 = x + sprite._xl + 1;
-		break;
-	case kEga:
-		_r._x2 = x + sprite._xl;
-		break;
-	}
-
 	// These pictures are practically parts of the background. -10 is for the drop-down menu.
 	_vm->_graphics->drawBackgroundSprite(x, y - 10, sprite);
 }
diff --git a/engines/avalanche/background.h b/engines/avalanche/background.h
index 1ce70e858c..36bb1d486e 100644
--- a/engines/avalanche/background.h
+++ b/engines/avalanche/background.h
@@ -69,7 +69,6 @@ private:
 	int32 _offsets[40];
 	byte _spriteNum;
 	SpriteType _sprites[40];
-	ByteField _r;
 	Common::String _filename;
 	static const int16 kOnDisk; // Value of _sprites[fv]._x when it's not in memory.