GNAP: Remove some unused variables in resources

3 files changed, 9 insertions, 18 deletions

diff --git a/engines/gnap/gamesys.cpp b/engines/gnap/gamesys.cpp
index c2c0e42a8a..7cfa01610c 100644
--- a/engines/gnap/gamesys.cpp
+++ b/engines/gnap/gamesys.cpp
@@ -123,7 +123,6 @@ void GameSys::requestClear2(bool resetFl) {
 			gfxItem->_currFrame._duration = 0;
 			gfxItem->_currFrame._spriteId = -1;
 			gfxItem->_currFrame._soundId = -1;
-			gfxItem->_currFrame._unusedVal = -1;
 			gfxItem->_updFlag = true;
 		} else {
 			gfxItem->_updFlag = false;
@@ -463,7 +462,6 @@ void GameSys::seqInsertGfx(int index, int duration) {
 		gfxItem->_prevFrame._duration = 0;
 		gfxItem->_prevFrame._spriteId = -1;
 		gfxItem->_prevFrame._soundId = -1;
-		gfxItem->_prevFrame._unusedVal = -1;
 		int totalDuration = duration;
 		if ((seqItem->_flags & 4) && totalDuration > 0) {
 			gfxItem->_prevFrame._duration = 1;
@@ -530,7 +528,6 @@ void GameSys::seqRemoveGfx(int sequenceId, int id) {
 				gfxItem->_currFrame._duration = 0;
 				gfxItem->_currFrame._spriteId = -1;
 				gfxItem->_currFrame._soundId = -1;
-				gfxItem->_currFrame._unusedVal = -1;
 				gfxItem->_updFlag = true;
 				++gfxIndex;
 				gfxItem = &_gfxItems[gfxIndex];
@@ -960,7 +957,6 @@ void GameSys::handleReqRemoveSequenceItems() {
 					gfxItem->_currFrame._duration = 0;
 					gfxItem->_currFrame._spriteId = -1;
 					gfxItem->_currFrame._soundId = -1;
-					gfxItem->_currFrame._unusedVal = -1;
 					gfxItem->_updFlag = true;
 				} else {
 					gfxItem->_updFlag = false;
@@ -983,7 +979,6 @@ void GameSys::handleReqRemoveSpriteDrawItems() {
 					gfxItem->_currFrame._duration = 0;
 					gfxItem->_currFrame._spriteId = -1;
 					gfxItem->_currFrame._soundId = -1;
-					gfxItem->_currFrame._unusedVal = -1;
 					gfxItem->_updFlag = true;
 				}
 			}
@@ -1024,14 +1019,12 @@ void GameSys::fatUpdateFrame() {
 					gfxItem->_currFrame._duration = 0;
 					gfxItem->_currFrame._spriteId = -1;
 					gfxItem->_currFrame._soundId = -1;
-					gfxItem->_currFrame._unusedVal = -1;
 					gfxItem->_updFlag = true;
 				} else if (!seqItem) {
 					gfxItem->_animation = nullptr;
 					gfxItem->_currFrame._duration = 0;
 					gfxItem->_currFrame._spriteId = -1;
 					gfxItem->_currFrame._soundId = -1;
-					gfxItem->_currFrame._unusedVal = -1;
 					gfxItem->_updFlag = true;
 				} else if ((seqItem->_flags & 4) && clockDelta > 1) {
 					if (gfxItem->_delayTicks < clockDelta) {
@@ -1133,13 +1126,11 @@ void GameSys::fatUpdateFrame() {
 				gfxItem->_prevFrame._duration = 0;
 				gfxItem->_prevFrame._spriteId = -1;
 				gfxItem->_prevFrame._soundId = -1;
-				gfxItem->_prevFrame._unusedVal = -1;
 				gfxItem->_currFrame._duration = 0;
 				gfxItem->_currFrame._isScaled = false;
 				gfxItem->_currFrame._rect = _newSpriteDrawItems[k]._rect;
 				gfxItem->_currFrame._spriteId = _newSpriteDrawItems[k]._surface ? 0xCAFEBABE : -1;// TODO
 				gfxItem->_currFrame._soundId = -1;
-				gfxItem->_currFrame._unusedVal = -1;
 			}
 		}
 		_newSpriteDrawItemsCount = 0;
@@ -1155,7 +1146,6 @@ void GameSys::fatUpdateFrame() {
 					gfxItem->_currFrame._rect = _grabSpriteRect;
 					gfxItem->_currFrame._spriteId = _grabSpriteSurface2 ? 1 : -1;// TODO
 					gfxItem->_currFrame._soundId = -1;
-					gfxItem->_currFrame._unusedVal = -1;
 					gfxItem->_updFlag = true;
 					gfxItem->_surface = _grabSpriteSurface2;
 					break;
diff --git a/engines/gnap/resource.cpp b/engines/gnap/resource.cpp
index 9936324c2b..bb5dba0382 100644
--- a/engines/gnap/resource.cpp
+++ b/engines/gnap/resource.cpp
@@ -36,7 +36,9 @@ void SequenceFrame::loadFromStream(Common::MemoryReadStream &stream) {
 	_rect.bottom = stream.readUint32LE();
 	_spriteId = stream.readUint32LE();
 	_soundId = stream.readUint32LE();
-	_unusedVal = stream.readUint32LE();
+
+	// Skip an unused value
+	stream.readUint32LE();
 
 	debugC(kDebugBasic, "SequenceFrame() spriteId: %d; soundId: %d", _spriteId, _soundId);
 }
@@ -44,8 +46,9 @@ void SequenceFrame::loadFromStream(Common::MemoryReadStream &stream) {
 // SequenceAnimation
 
 void SequenceAnimation::loadFromStream(Common::MemoryReadStream &stream) {
-	_unusedVal1 = stream.readUint16LE();
-	_unusedVal2 = stream.readUint16LE();
+	// Skip two unused values
+	stream.readUint32LE();
+
 	_additionalDelay = stream.readUint32LE();
 	_framesCount = stream.readUint16LE();
 	_maxTotalDuration = stream.readUint16LE();
@@ -59,7 +62,9 @@ void SequenceAnimation::loadFromStream(Common::MemoryReadStream &stream) {
 
 SequenceResource::SequenceResource(int resourceId, byte *data, uint32 size) {
 	Common::MemoryReadStream stream(data, size, DisposeAfterUse::NO);
-	_unusedVal1 = stream.readUint32LE();
+	// Skip an unused value
+	stream.readUint32LE();
+
 	_sequenceId = stream.readUint32LE();
 	_defaultId = stream.readUint32LE();
 	_sequenceId2 = stream.readUint32LE();
diff --git a/engines/gnap/resource.h b/engines/gnap/resource.h
index 35787fa48d..1b228de81e 100644
--- a/engines/gnap/resource.h
+++ b/engines/gnap/resource.h
@@ -51,13 +51,10 @@ struct SequenceFrame {
 	Common::Rect _rect;
 	int32 _spriteId;
 	int32 _soundId;
-	int32 _unusedVal;
 	void loadFromStream(Common::MemoryReadStream &stream);
 };
 
 struct SequenceAnimation {
-	int16 _unusedVal1;
-	int16 _unusedVal2;
 	int32 _additionalDelay;
 	int16 _framesCount;
 	int16 _maxTotalDuration;
@@ -72,7 +69,6 @@ public:
 	SequenceResource(int resourceId, byte *data, uint32 size);
 	~SequenceResource();
 public:
-	uint32 _unusedVal1;
 	int32 _sequenceId;
 	int32 _defaultId;
 	int32 _sequenceId2;