aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/gfx/osystem
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2013-08-24 12:37:13 +0200
committerWillem Jan Palenstijn2013-09-26 02:17:26 +0200
commit544e4a2f49630cecbf06fe5b1e11bdbab1bdb281 (patch)
tree742c00859f61b198f91901270479899ea482d16b /engines/wintermute/base/gfx/osystem
parent6d1ca9d94eb2d7b1665814b23aa7b56b8dd6bfb3 (diff)
downloadscummvm-rg350-544e4a2f49630cecbf06fe5b1e11bdbab1bdb281.tar.gz
scummvm-rg350-544e4a2f49630cecbf06fe5b1e11bdbab1bdb281.tar.bz2
scummvm-rg350-544e4a2f49630cecbf06fe5b1e11bdbab1bdb281.zip
WINTERMUTE: No longer update ticket->_drawNum
Diffstat (limited to 'engines/wintermute/base/gfx/osystem')
-rw-r--r--engines/wintermute/base/gfx/osystem/base_render_osystem.cpp20
1 files changed, 1 insertions, 19 deletions
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index a7df076c84..afb2cd6978 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -373,15 +373,12 @@ void BaseRenderOSystem::invalidateTicketsFromSurface(BaseSurfaceOSystem *surf) {
void BaseRenderOSystem::drawFromTicket(RenderTicket *renderTicket) {
renderTicket->_wantsDraw = true;
- // A new item always has _drawNum == 0
- assert(renderTicket->_drawNum == 0);
{
++_lastFrameIter;
// In-order
if (_renderQueue.empty() || _lastFrameIter == _renderQueue.end()) {
assert(_renderQueue.empty() || _lastFrameIter == _renderQueue.end());
_lastFrameIter--;
- renderTicket->_drawNum = _drawNum++;
_renderQueue.push_back(renderTicket);
++_lastFrameIter;
assert(*_lastFrameIter == renderTicket);
@@ -393,13 +390,11 @@ void BaseRenderOSystem::drawFromTicket(RenderTicket *renderTicket) {
assert(!_renderQueue.empty() && _lastFrameIter != _renderQueue.end());
assert(pos == _lastFrameIter);
_renderQueue.insert(pos, renderTicket);
- renderTicket->_drawNum = _drawNum++;
--_lastFrameIter;
assert(*_lastFrameIter == renderTicket);
// Increment the following tickets, so they still are in line
RenderQueueIterator it;
for (it = pos; it != _renderQueue.end(); ++it) {
- (*it)->_drawNum++;
assert((*it)->_wantsDraw == false);
(*it)->_wantsDraw = false;
}
@@ -412,29 +407,19 @@ void BaseRenderOSystem::drawFromTicket(RenderTicket *renderTicket) {
void BaseRenderOSystem::drawFromQueuedTicket(const RenderQueueIterator &ticket) {
RenderTicket *renderTicket = *ticket;
renderTicket->_wantsDraw = true;
- assert(renderTicket->_drawNum != 0);
{
++_lastFrameIter;
// Was drawn last round, still in the same order
if (*_lastFrameIter == renderTicket) {
- assert((*_lastFrameIter)->_drawNum == _drawNum);
assert(*_lastFrameIter == renderTicket);
_drawNum++;
++_lastAddedTicket;
} else {
assert(*_lastFrameIter != renderTicket);
--_lastFrameIter;
- assert(_drawNum < renderTicket->_drawNum);
// Remove the ticket from the list
- RenderQueueIterator it = _renderQueue.erase(ticket);
- if (it != _renderQueue.end()) {
- // Decreement the following tickets.
- for (; it != _renderQueue.end(); ++it) {
- (*it)->_drawNum--;
- }
- }
+ _renderQueue.erase(ticket);
// Is not in order, so readd it as if it was a new ticket
- renderTicket->_drawNum = 0;
drawFromTicket(renderTicket);
}
}
@@ -464,7 +449,6 @@ void BaseRenderOSystem::drawTickets() {
delete ticket;
decrement++;
} else {
- (*it)->_drawNum -= decrement;
++it;
}
}
@@ -487,7 +471,6 @@ void BaseRenderOSystem::drawTickets() {
_lastFrameIter = _renderQueue.end();
for (it = _renderQueue.begin(); it != _renderQueue.end(); ++it) {
RenderTicket *ticket = *it;
- assert(ticket->_drawNum == _drawNum);
++_drawNum;
if (ticket->_dstRect.intersects(*_dirtyRect)) {
// dstClip is the area we want redrawn.
@@ -524,7 +507,6 @@ void BaseRenderOSystem::drawTickets() {
delete ticket;
decrement++;
} else {
- (*it)->_drawNum -= decrement;
++it;
}
}