diff options
Diffstat (limited to 'engines/toltecs/render.cpp')
| -rw-r--r-- | engines/toltecs/render.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/engines/toltecs/render.cpp b/engines/toltecs/render.cpp index 4c41e6ce00..bf68eee94c 100644 --- a/engines/toltecs/render.cpp +++ b/engines/toltecs/render.cpp @@ -8,17 +8,16 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * */ #include "common/system.h" @@ -65,7 +64,7 @@ void RenderQueue::addSprite(SpriteDrawItem &sprite) { // Add sprite sorted by priority RenderQueueArray::iterator iter = _currQueue->begin(); while (iter != _currQueue->end() && (*iter).priority <= item.priority) { - iter++; + ++iter; } _currQueue->insert(iter, item); @@ -104,7 +103,7 @@ void RenderQueue::addMask(SegmapMaskRect &mask) { if (rectIntersectsItem(item.rect)) { RenderQueueArray::iterator iter = _currQueue->begin(); while (iter != _currQueue->end() && (*iter).priority <= item.priority) { - iter++; + ++iter; } _currQueue->insert(iter, item); } @@ -119,7 +118,7 @@ void RenderQueue::update() { if (!doFullRefresh) { - for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); iter++) { + for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); ++iter) { RenderQueueItem *item = &(*iter); RenderQueueItem *prevItem = findItemInQueue(_prevQueue, *item); if (prevItem) { @@ -134,7 +133,7 @@ void RenderQueue::update() { } } - for (RenderQueueArray::iterator iter = _prevQueue->begin(); iter != _prevQueue->end(); iter++) { + for (RenderQueueArray::iterator iter = _prevQueue->begin(); iter != _prevQueue->end(); ++iter) { RenderQueueItem *prevItem = &(*iter); RenderQueueItem *item = findItemInQueue(_currQueue, *prevItem); if (!item) { @@ -145,7 +144,7 @@ void RenderQueue::update() { restoreDirtyBackground(); - for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); iter++) { + for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); ++iter) { RenderQueueItem *item = &(*iter); if (item->flags != kUnchanged) invalidateItemsByRect(item->rect, item); @@ -156,7 +155,7 @@ void RenderQueue::update() { byte *srcp = _vm->_screen->_backScreen + _vm->_cameraX + _vm->_cameraY * _vm->_sceneWidth; int16 w = MIN<int16>(640, _vm->_sceneWidth); int16 h = MIN<int16>(400, _vm->_cameraHeight); - while (h--) { + while (h--) { memcpy(destp, srcp, w); destp += 640; srcp += _vm->_sceneWidth; @@ -164,7 +163,7 @@ void RenderQueue::update() { _vm->_screen->_fullRefresh = false; } - for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); iter++) { + for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); ++iter) { const RenderQueueItem *item = &(*iter); if (item->flags == kRefresh || doFullRefresh) { @@ -209,7 +208,7 @@ void RenderQueue::clear() { } bool RenderQueue::rectIntersectsItem(const Common::Rect &rect) { - for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); iter++) { + for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); ++iter) { const RenderQueueItem *item = &(*iter); if (rect.intersects(item->rect)) return true; @@ -221,7 +220,7 @@ RenderQueueItem *RenderQueue::findItemInQueue(RenderQueueArray *queue, const Ren /* This checks if the given item also exists in the previously drawn frame. The state of the item (position, color etc) is handled elsewhere. */ - for (RenderQueueArray::iterator iter = queue->begin(); iter != queue->end(); iter++) { + for (RenderQueueArray::iterator iter = queue->begin(); iter != queue->end(); ++iter) { RenderQueueItem *prevItem = &(*iter); if (prevItem->type == item.type) { switch (item.type) { @@ -263,7 +262,7 @@ bool RenderQueue::hasItemChanged(const RenderQueueItem &item1, const RenderQueue } void RenderQueue::invalidateItemsByRect(const Common::Rect &rect, const RenderQueueItem *item) { - for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); iter++) { + for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); ++iter) { RenderQueueItem *subItem = &(*iter); if (item != subItem && subItem->flags == kUnchanged && |