[Scummvm-git-logs] scummvm master -> 852e6c2954fa12f2f71cb97e3aeffd8b22e976e2

[sluicebox]

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:
852e6c2954 SCI: Removed unused GfxPicture::_animationNr


Commit: 852e6c2954fa12f2f71cb97e3aeffd8b22e976e2
    https://github.com/scummvm/scummvm/commit/852e6c2954fa12f2f71cb97e3aeffd8b22e976e2
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-08-02T22:20:48-07:00

Commit Message:
SCI: Removed unused GfxPicture::_animationNr

Changed paths:
    engines/sci/graphics/paint16.cpp
    engines/sci/graphics/paint16.h
    engines/sci/graphics/picture.cpp
    engines/sci/graphics/picture.h


diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp
index 80349f119a..62812498c1 100644
--- a/engines/sci/graphics/paint16.cpp
+++ b/engines/sci/graphics/paint16.cpp
@@ -63,14 +63,14 @@ void GfxPaint16::debugSetEGAdrawingVisualize(bool state) {
 	_EGAdrawingVisualize = state;
 }
 
-void GfxPaint16::drawPicture(GuiResourceId pictureId, int16 animationNr, bool mirroredFlag, bool addToFlag, GuiResourceId paletteId) {
+void GfxPaint16::drawPicture(GuiResourceId pictureId, bool mirroredFlag, bool addToFlag, GuiResourceId paletteId) {
 	GfxPicture *picture = new GfxPicture(_resMan, _coordAdjuster, _ports, _screen, _palette, pictureId, _EGAdrawingVisualize);
 
 	// do we add to a picture? if not -> clear screen with white
 	if (!addToFlag)
 		clearScreen(_screen->getColorWhite());
 
-	picture->draw(animationNr, mirroredFlag, addToFlag, paletteId);
+	picture->draw(mirroredFlag, addToFlag, paletteId);
 	delete picture;
 
 	// We make a call to SciPalette here, for increasing sys timestamp and also loading targetpalette, if palvary active
@@ -376,7 +376,7 @@ void GfxPaint16::kernelDrawPicture(GuiResourceId pictureId, int16 animationNr, b
 
 	if (_ports->isFrontWindow(_ports->_picWind)) {
 		_screen->_picNotValid = 1;
-		drawPicture(pictureId, animationNr, mirroredFlag, addToFlag, EGApaletteNo);
+		drawPicture(pictureId, mirroredFlag, addToFlag, EGApaletteNo);
 		_transitions->setup(animationNr, animationBlackoutFlag);
 	} else {
 		// We need to set it for SCI1EARLY+ (sierra sci also did so), otherwise we get at least the following issues:
@@ -388,7 +388,7 @@ void GfxPaint16::kernelDrawPicture(GuiResourceId pictureId, int16 animationNr, b
 		if (getSciVersion() >= SCI_VERSION_1_EARLY)
 			_screen->_picNotValid = 1;
 		_ports->beginUpdate(_ports->_picWind);
-		drawPicture(pictureId, animationNr, mirroredFlag, addToFlag, EGApaletteNo);
+		drawPicture(pictureId, mirroredFlag, addToFlag, EGApaletteNo);
 		_ports->endUpdate(_ports->_picWind);
 	}
 	_ports->setPort(oldPort);
diff --git a/engines/sci/graphics/paint16.h b/engines/sci/graphics/paint16.h
index db19efa261..b2fb048130 100644
--- a/engines/sci/graphics/paint16.h
+++ b/engines/sci/graphics/paint16.h
@@ -43,7 +43,7 @@ public:
 
 	void debugSetEGAdrawingVisualize(bool state);
 
-	void drawPicture(GuiResourceId pictureId, int16 animationNr, bool mirroredFlag, bool addToFlag, GuiResourceId paletteId);
+	void drawPicture(GuiResourceId pictureId, bool mirroredFlag, bool addToFlag, GuiResourceId paletteId);
 	void drawCelAndShow(GuiResourceId viewId, int16 loopNo, int16 celNo, uint16 leftPos, uint16 topPos, byte priority, uint16 paletteNo, uint16 scaleX = 128, uint16 scaleY = 128, uint16 scaleSignal = 0);
 	void drawCel(GuiResourceId viewId, int16 loopNo, int16 celNo, const Common::Rect &celRect, byte priority, uint16 paletteNo, uint16 scaleX = 128, uint16 scaleY = 128, uint16 scaleSignal = 0);
 	void drawCel(GfxView *view, int16 loopNo, int16 celNo, const Common::Rect &celRect, byte priority, uint16 paletteNo, uint16 scaleX = 128, uint16 scaleY = 128, uint16 scaleSignal = 0);
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp
index e71961791f..5ed8c61baa 100644
--- a/engines/sci/graphics/picture.cpp
+++ b/engines/sci/graphics/picture.cpp
@@ -60,10 +60,9 @@ GuiResourceId GfxPicture::getResourceId() {
 // differentiation between various picture formats can NOT get done using sci-version checks.
 //  Games like PQ1 use the "old" vector data picture format, but are actually SCI1.1
 //  We should leave this that way to decide the format on-the-fly instead of hardcoding it in any way
-void GfxPicture::draw(int16 animationNr, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo) {
+void GfxPicture::draw(bool mirroredFlag, bool addToFlag, int16 EGApaletteNo) {
 	uint16 headerSize;
 
-	_animationNr = animationNr;
 	_mirroredFlag = mirroredFlag;
 	_addToFlag = addToFlag;
 	_EGApaletteNo = EGApaletteNo;
diff --git a/engines/sci/graphics/picture.h b/engines/sci/graphics/picture.h
index 48f80323b1..3385427ed6 100644
--- a/engines/sci/graphics/picture.h
+++ b/engines/sci/graphics/picture.h
@@ -54,7 +54,7 @@ public:
 	~GfxPicture();
 
 	GuiResourceId getResourceId();
-	void draw(int16 animationNr, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo);
+	void draw(bool mirroredFlag, bool addToFlag, int16 EGApaletteNo);
 
 private:
 	void initData(GuiResourceId resourceId);
@@ -85,7 +85,6 @@ private:
 	Resource *_resource;
 	int _resourceType;
 
-	int16 _animationNr;
 	bool _mirroredFlag;
 	bool _addToFlag;
 	int16 _EGApaletteNo;