From 98efd444074e3c9d42a4a646ffb2445348c6a0e8 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 2 Oct 2013 10:54:43 +0200
Subject: WINTERMUTE: Remove unused _drawNum

---
 engines/wintermute/base/gfx/osystem/base_render_osystem.cpp | 13 ++-----------
 engines/wintermute/base/gfx/osystem/base_render_osystem.h   |  1 -
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'engines/wintermute/base/gfx')

diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index 3eba3b34b5..b53aef802d 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -51,7 +51,6 @@ BaseRenderer *makeOSystemRenderer(BaseGame *inGame) {
 BaseRenderOSystem::BaseRenderOSystem(BaseGame *inGame) : BaseRenderer(inGame) {
 	_renderSurface = new Graphics::Surface();
 	_blankSurface = new Graphics::Surface();
-	_drawNum = 1;
 	_lastFrameIter = _renderQueue.end();
 	_needsFlip = true;
 	_skipThisFrame = false;
@@ -159,7 +158,6 @@ bool BaseRenderOSystem::flip() {
 		_needsFlip = false;
 
 		// Reset ticketing state
-		_drawNum = 1;
 		_lastFrameIter = _renderQueue.end();
 		RenderQueueIterator it;
 		for (it = _renderQueue.begin(); it != _renderQueue.end(); ++it) {
@@ -195,7 +193,6 @@ bool BaseRenderOSystem::flip() {
 		g_system->updateScreen();
 		_needsFlip = false;
 	}
-	_drawNum = 1;
 	_lastFrameIter = _renderQueue.end();
 
 	return STATUS_OK;
@@ -326,7 +323,6 @@ void BaseRenderOSystem::invalidateTicketsFromSurface(BaseSurfaceOSystem *surf) {
 void BaseRenderOSystem::drawFromTicket(RenderTicket *renderTicket) {
 	renderTicket->_wantsDraw = true;
 
-	_drawNum++;
 	++_lastFrameIter;
 	// In-order
 	if (_renderQueue.empty() || _lastFrameIter == _renderQueue.end()) {
@@ -349,10 +345,8 @@ void BaseRenderOSystem::drawFromQueuedTicket(const RenderQueueIterator &ticket)
 	renderTicket->_wantsDraw = true;
 
 	++_lastFrameIter;
-	// Was drawn last round, still in the same order
-	if (*_lastFrameIter == renderTicket) {
-		_drawNum++;
-	} else {
+	// Not in the same order?
+	if (*_lastFrameIter != renderTicket) {
 		--_lastFrameIter;
 		// Remove the ticket from the list
 		assert(*_lastFrameIter != renderTicket);
@@ -399,11 +393,9 @@ void BaseRenderOSystem::drawTickets() {
 
 	// Apply the clear-color to the dirty rect.
 	_renderSurface->fillRect(*_dirtyRect, _clearColor);
-	_drawNum = 1;
 	_lastFrameIter = _renderQueue.end();
 	for (it = _renderQueue.begin(); it != _renderQueue.end(); ++it) {
 		RenderTicket *ticket = *it;
-		++_drawNum;
 		if (ticket->_dstRect.intersects(*_dirtyRect)) {
 			// dstClip is the area we want redrawn.
 			Common::Rect dstClip(ticket->_dstRect);
@@ -561,7 +553,6 @@ void BaseRenderOSystem::endSaveLoad() {
 	// HACK: After a save the buffer will be drawn before the scripts get to update it,
 	// so just skip this single frame.
 	_skipThisFrame = true;
-	_drawNum = 1;
 	_lastFrameIter = _renderQueue.end();
 
 	_renderSurface->fillRect(Common::Rect(0, 0, _renderSurface->h, _renderSurface->w), _renderSurface->format.ARGBToColor(255, 0, 0, 0));
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
index 6dc8948717..fa0b2afc40 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
@@ -130,7 +130,6 @@ private:
 	Common::List<RenderTicket *> _renderQueue;
 
 	bool _needsFlip;
-	uint32 _drawNum; ///< The global number of the current draw-operation.
 	RenderQueueIterator _lastFrameIter;
 	Common::Rect _renderRect;
 	Graphics::Surface *_renderSurface;
-- 
cgit v1.2.3