[Scummvm-cvs-logs] SF.net SVN: scummvm:[38876] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Wed Feb 25 09:53:58 CET 2009
Revision: 38876
http://scummvm.svn.sourceforge.net/scummvm/?rev=38876&view=rev
Author: peres001
Date: 2009-02-25 08:53:58 +0000 (Wed, 25 Feb 2009)
Log Message:
-----------
Updated all for(;;) loops to use prefix increment on iterators.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/exec_ns.cpp
scummvm/trunk/engines/parallaction/graphics.cpp
scummvm/trunk/engines/parallaction/parallaction.cpp
scummvm/trunk/engines/parallaction/parallaction_br.cpp
scummvm/trunk/engines/parallaction/parallaction_ns.cpp
scummvm/trunk/engines/parallaction/parser_br.cpp
scummvm/trunk/engines/parallaction/walk.cpp
Modified: scummvm/trunk/engines/parallaction/exec_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_ns.cpp 2009-02-25 03:52:16 UTC (rev 38875)
+++ scummvm/trunk/engines/parallaction/exec_ns.cpp 2009-02-25 08:53:58 UTC (rev 38876)
@@ -309,7 +309,7 @@
inst = _ctxt.ip;
_ctxt.inst = inst;
- _ctxt.ip++;
+ ++_ctxt.ip;
debugC(9, kDebugExec, "inst [%02i] %s\n", (*inst)->_index, _instructionNames[(*inst)->_index - 1]);
@@ -330,7 +330,7 @@
return;
}
- for (ProgramList::iterator it = first; it != last; it++) {
+ for (ProgramList::iterator it = first; it != last; ++it) {
AnimationPtr a = (*it)->_anim;
@@ -359,7 +359,7 @@
_suspend = false;
_running = true;
- for ( ; first != last; first++) {
+ for ( ; first != last; ++first) {
if (_vm->shouldQuit())
break;
Modified: scummvm/trunk/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.cpp 2009-02-25 03:52:16 UTC (rev 38875)
+++ scummvm/trunk/engines/parallaction/graphics.cpp 2009-02-25 08:53:58 UTC (rev 38876)
@@ -844,7 +844,7 @@
void BackgroundInfo::clearMaskData() {
// free mask data
MaskPatches::iterator it = _maskPatches.begin();
- for ( ; it != _maskPatches.end(); it++) {
+ for ( ; it != _maskPatches.end(); ++it) {
delete *it;
}
_maskPatches.clear();
@@ -905,7 +905,7 @@
void BackgroundInfo::clearPathData() {
// free mask data
PathPatches::iterator it = _pathPatches.begin();
- for ( ; it != _pathPatches.end(); it++) {
+ for ( ; it != _pathPatches.end(); ++it) {
delete *it;
}
_pathPatches.clear();
Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp 2009-02-25 03:52:16 UTC (rev 38875)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp 2009-02-25 08:53:58 UTC (rev 38876)
@@ -205,14 +205,14 @@
AnimationPtr Location::findAnimation(const char *name) {
- for (AnimationList::iterator it = _animations.begin(); it != _animations.end(); it++)
+ for (AnimationList::iterator it = _animations.begin(); it != _animations.end(); ++it)
if (!scumm_stricmp((*it)->_name, name)) return *it;
return nullAnimationPtr;
}
void Location::freeAnimations() {
- for (AnimationList::iterator it = _animations.begin(); it != _animations.end(); it++) {
+ for (AnimationList::iterator it = _animations.begin(); it != _animations.end(); ++it) {
(*it)->_commands.clear(); // See comment for freeZones(), about circular references.
}
_animations.clear();
@@ -492,7 +492,7 @@
debugC(9, kDebugExec, "Parallaction::updateZones()\n");
// go through all animations and mark/unmark each of them for display
- for (AnimationList::iterator ait = _location._animations.begin(); ait != _location._animations.end(); ait++) {
+ for (AnimationList::iterator ait = _location._animations.begin(); ait != _location._animations.end(); ++ait) {
AnimationPtr anim = *ait;
if ((anim->_flags & kFlagsRemove) != 0) {
// marks the animation as invisible for this frame
@@ -505,7 +505,7 @@
}
// examine the list of get zones to update
- for (ZoneList::iterator zit = _zonesToUpdate.begin(); zit != _zonesToUpdate.end(); zit++) {
+ for (ZoneList::iterator zit = _zonesToUpdate.begin(); zit != _zonesToUpdate.end(); ++zit) {
ZonePtr z = *zit;
if (ACTIONTYPE(z) == kZoneGet) {
GfxObj *obj = z->u.get->gfxobj;
@@ -762,7 +762,7 @@
uint16 _di = y;
uint16 _si = x;
- for (ZoneList::iterator it = _location._zones.begin(); it != _location._zones.end(); it++) {
+ for (ZoneList::iterator it = _location._zones.begin(); it != _location._zones.end(); ++it) {
if (checkLinkedAnimBox(*it, type, x, y)) {
return *it;
}
@@ -774,7 +774,7 @@
int16 _a, _b, _c, _d;
bool _ef;
- for (AnimationList::iterator ait = _location._animations.begin(); ait != _location._animations.end(); ait++) {
+ for (AnimationList::iterator ait = _location._animations.begin(); ait != _location._animations.end(); ++ait) {
AnimationPtr a = *ait;
@@ -795,7 +795,7 @@
ZonePtr Location::findZone(const char *name) {
- for (ZoneList::iterator it = _zones.begin(); it != _zones.end(); it++) {
+ for (ZoneList::iterator it = _zones.begin(); it != _zones.end(); ++it) {
if (!scumm_stricmp((*it)->_name, name)) return *it;
}
return findAnimation(name);
Modified: scummvm/trunk/engines/parallaction/parallaction_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_br.cpp 2009-02-25 03:52:16 UTC (rev 38875)
+++ scummvm/trunk/engines/parallaction/parallaction_br.cpp 2009-02-25 08:53:58 UTC (rev 38876)
@@ -308,7 +308,7 @@
// this loads animation scripts
AnimationList::iterator it = _location._animations.begin();
- for ( ; it != _location._animations.end(); it++) {
+ for ( ; it != _location._animations.end(); ++it) {
if ((*it)->_scriptName) {
loadProgram(*it, (*it)->_scriptName);
}
Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2009-02-25 03:52:16 UTC (rev 38875)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2009-02-25 08:53:58 UTC (rev 38876)
@@ -390,7 +390,7 @@
// this loads animation scripts
AnimationList::iterator it = _location._animations.begin();
- for ( ; it != _location._animations.end(); it++) {
+ for ( ; it != _location._animations.end(); ++it) {
if ((*it)->_scriptName) {
loadProgram(*it, (*it)->_scriptName);
}
Modified: scummvm/trunk/engines/parallaction/parser_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser_br.cpp 2009-02-25 03:52:16 UTC (rev 38875)
+++ scummvm/trunk/engines/parallaction/parser_br.cpp 2009-02-25 08:53:58 UTC (rev 38876)
@@ -1258,7 +1258,7 @@
_vm->_gfx->setBackground(kBackgroundLocation, ctxt.info);
ZoneList::iterator it = _vm->_location._zones.begin();
- for ( ; it != _vm->_location._zones.end(); it++) {
+ for ( ; it != _vm->_location._zones.end(); ++it) {
bool visible = ((*it)->_flags & kFlagsRemove) == 0;
if (visible)
_vm->showZone((*it), visible);
Modified: scummvm/trunk/engines/parallaction/walk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/walk.cpp 2009-02-25 03:52:16 UTC (rev 38875)
+++ scummvm/trunk/engines/parallaction/walk.cpp 2009-02-25 08:53:58 UTC (rev 38876)
@@ -429,7 +429,7 @@
PointList::iterator b = z1->u.path->_lists[id].begin();
PointList::iterator e = z1->u.path->_lists[id].end();
- for ( ; b != e; b++) {
+ for ( ; b != e; ++b) {
s._walkPath.push_front(*b);
}
s._walkPath.push_back(dest);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list