aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute')
-rw-r--r--engines/wintermute/base/base_file_manager.cpp6
-rw-r--r--engines/wintermute/base/base_persistence_manager.cpp2
-rw-r--r--engines/wintermute/base/file/base_disk_file.cpp4
-rw-r--r--engines/wintermute/base/file/base_package.cpp2
-rw-r--r--engines/wintermute/base/font/base_font_truetype.cpp4
-rw-r--r--engines/wintermute/base/gfx/osystem/base_render_osystem.cpp16
-rw-r--r--engines/wintermute/base/scriptables/script_engine.cpp4
-rw-r--r--engines/wintermute/coll_templ.h2
8 files changed, 20 insertions, 20 deletions
diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index 01b11352b5..f139d99146 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -165,7 +165,7 @@ bool BaseFileManager::initPaths() {
}
bool BaseFileManager::registerPackages(const Common::FSList &fslist) {
- for (Common::FSList::const_iterator it = fslist.begin(); it != fslist.end(); it++) {
+ for (Common::FSList::const_iterator it = fslist.begin(); it != fslist.end(); ++it) {
debugC(kWintermuteDebugFileAccess, "Adding %s", (*it).getName().c_str());
if ((*it).getName().contains(".dcp")) {
if (registerPackage((*it))) {
@@ -183,10 +183,10 @@ bool BaseFileManager::registerPackages() {
// Register without using SearchMan, as otherwise the FSNode-based lookup in openPackage will fail
// and that has to be like that to support the detection-scheme.
Common::FSList files;
- for (Common::FSList::iterator it = _packagePaths.begin(); it != _packagePaths.end(); it++) {
+ for (Common::FSList::iterator it = _packagePaths.begin(); it != _packagePaths.end(); ++it) {
debugC(kWintermuteDebugFileAccess, "Should register folder: %s %s", (*it).getPath().c_str(), (*it).getName().c_str());
(*it).getChildren(files, Common::FSNode::kListFilesOnly);
- for (Common::FSList::iterator fileIt = files.begin(); fileIt != files.end(); fileIt++) {
+ for (Common::FSList::iterator fileIt = files.begin(); fileIt != files.end(); ++fileIt) {
if (!fileIt->getName().hasSuffix(".dcp")) {
continue;
}
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index 1beaeecdd7..94588eff32 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -169,7 +169,7 @@ uint32 BasePersistenceManager::getMaxUsedSlot() {
Common::StringArray saves = g_system->getSavefileManager()->listSavefiles(saveMask);
Common::StringArray::iterator it = saves.begin();
int ret = -1;
- for (; it != saves.end(); it++) {
+ for (; it != saves.end(); ++it) {
int num = -1;
sscanf(it->c_str(), "save%d", &num);
ret = MAX(ret, num);
diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index 44a8049121..8fff78a32a 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -94,7 +94,7 @@ bool diskFileExists(const Common::String &filename) {
Common::ArchiveMemberList files;
SearchMan.listMatchingMembers(files, filename);
- for (Common::ArchiveMemberList::iterator it = files.begin(); it != files.end(); it++) {
+ for (Common::ArchiveMemberList::iterator it = files.begin(); it != files.end(); ++it) {
if ((*it)->getName() == filename) {
return true;
}
@@ -124,7 +124,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
Common::ArchiveMemberList files;
SearchMan.listMatchingMembers(files, fixedFilename);
- for (Common::ArchiveMemberList::iterator it = files.begin(); it != files.end(); it++) {
+ for (Common::ArchiveMemberList::iterator it = files.begin(); it != files.end(); ++it) {
if ((*it)->getName() == filename) {
file = (*it)->createReadStream();
break;
diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp
index a9fb7f9a68..c5a62299e2 100644
--- a/engines/wintermute/base/file/base_package.cpp
+++ b/engines/wintermute/base/file/base_package.cpp
@@ -228,7 +228,7 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool
}
PackageSet::~PackageSet() {
- for (Common::Array<BasePackage *>::iterator it = _packages.begin(); it != _packages.end(); it++) {
+ for (Common::Array<BasePackage *>::iterator it = _packages.begin(); it != _packages.end(); ++it) {
delete *it;
}
_packages.clear();
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index 19c5cef7ee..36703ed44f 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -275,7 +275,7 @@ BaseSurface *BaseFontTT::renderTextToTexture(const WideString &text, int width,
uint32 useColor = 0xffffffff;
Common::Array<Common::String>::iterator it;
int heightOffset = 0;
- for (it = lines.begin(); it != lines.end(); it++) {
+ for (it = lines.begin(); it != lines.end(); ++it) {
_font->drawString(surface, *it, 0, heightOffset, width, useColor, alignment);
heightOffset += (int)_lineHeight;
}
@@ -581,7 +581,7 @@ void BaseFontTT::measureText(const WideString &text, int maxWidth, int maxHeight
_font->wordWrapText(text, maxWidth, lines);
Common::Array<Common::String>::iterator it;
textWidth = 0;
- for (it = lines.begin(); it != lines.end(); it++) {
+ for (it = lines.begin(); it != lines.end(); ++it) {
textWidth = MAX(textWidth, _font->getStringWidth(*it));
}
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index 05520ee7a9..7a862e4441 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -210,7 +210,7 @@ bool BaseRenderOSystem::flip() {
delete ticket;
} else {
(*it)->_wantsDraw = false;
- it++;
+ ++it;
}
}
}
@@ -316,7 +316,7 @@ void BaseRenderOSystem::drawSurface(BaseSurfaceOSystem *owner, const Graphics::S
RenderTicket compare(owner, NULL, srcRect, dstRect, mirrorX, mirrorY, disableAlpha);
compare._colorMod = _colorMod;
RenderQueueIterator it;
- for (it = _renderQueue.begin(); it != _renderQueue.end(); it++) {
+ for (it = _renderQueue.begin(); it != _renderQueue.end(); ++it) {
if ((*it)->_owner == owner && *(*it) == compare && (*it)->_isValid) {
(*it)->_colorMod = _colorMod;
if (_disableDirtyRects) {
@@ -347,7 +347,7 @@ void BaseRenderOSystem::invalidateTicket(RenderTicket *renderTicket) {
void BaseRenderOSystem::invalidateTicketsFromSurface(BaseSurfaceOSystem *surf) {
RenderQueueIterator it;
- for (it = _renderQueue.begin(); it != _renderQueue.end(); it++) {
+ for (it = _renderQueue.begin(); it != _renderQueue.end(); ++it) {
if ((*it)->_owner == surf) {
invalidateTicket(*it);
}
@@ -375,7 +375,7 @@ void BaseRenderOSystem::drawFromTicket(RenderTicket *renderTicket) {
Common::List<RenderTicket *>::iterator it;
renderTicket->_drawNum = _drawNum++;
// Increment the following tickets, so they still are in line
- for (it = pos; it != _renderQueue.end(); it++) {
+ for (it = pos; it != _renderQueue.end(); ++it) {
(*it)->_drawNum++;
(*it)->_wantsDraw = false;
}
@@ -393,12 +393,12 @@ void BaseRenderOSystem::drawFromTicket(RenderTicket *renderTicket) {
it = _renderQueue.erase(it);
break;
} else {
- it++;
+ ++it;
}
}
if (it != _renderQueue.end()) {
// Decreement the following tickets.
- for (; it != _renderQueue.end(); it++) {
+ for (; it != _renderQueue.end(); ++it) {
(*it)->_drawNum--;
}
}
@@ -431,7 +431,7 @@ void BaseRenderOSystem::drawTickets() {
decrement++;
} else {
(*it)->_drawNum -= decrement;
- it++;
+ ++it;
}
}
if (!_dirtyRect || _dirtyRect->width() == 0 || _dirtyRect->height() == 0) {
@@ -444,7 +444,7 @@ void BaseRenderOSystem::drawTickets() {
// Apply the clear-color to the dirty rect.
_renderSurface->fillRect(*_dirtyRect, _clearColor);
_drawNum = 1;
- for (it = _renderQueue.begin(); it != _renderQueue.end(); it++) {
+ for (it = _renderQueue.begin(); it != _renderQueue.end(); ++it) {
RenderTicket *ticket = *it;
assert(ticket->_drawNum == _drawNum++);
if (ticket->_isValid && ticket->_dstRect.intersects(*_dirtyRect)) {
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp
index d518be579f..02f6080958 100644
--- a/engines/wintermute/base/scriptables/script_engine.cpp
+++ b/engines/wintermute/base/scriptables/script_engine.cpp
@@ -591,7 +591,7 @@ void ScEngine::dumpStats() {
TimeVector times;
ScriptTimes::iterator it;
- for (it = _scriptTimes.begin(); it != _scriptTimes.end(); it++) {
+ for (it = _scriptTimes.begin(); it != _scriptTimes.end(); ++it) {
times.push_back(std::pair<uint32, std::string> (it->_value, it->_key));
}
std::sort(times.begin(), times.end());
@@ -602,7 +602,7 @@ void ScEngine::dumpStats() {
_gameRef->LOG(0, "***** Script profiling information: *****");
_gameRef->LOG(0, " %-40s %fs", "Total execution time", (float)totalTime / 1000);
- for (tit = times.rbegin(); tit != times.rend(); tit++) {
+ for (tit = times.rbegin(); tit != times.rend(); ++tit) {
_gameRef->LOG(0, " %-40s %fs (%f%%)", tit->second.c_str(), (float)tit->first / 1000, (float)tit->first / (float)totalTime * 100);
}*/
}
diff --git a/engines/wintermute/coll_templ.h b/engines/wintermute/coll_templ.h
index f1bf594769..389636cfe6 100644
--- a/engines/wintermute/coll_templ.h
+++ b/engines/wintermute/coll_templ.h
@@ -45,7 +45,7 @@ public:
j = Common::Array<TYPE>::size();
persistMgr->transfer("ArraySize", &j);
typename Common::Array<TYPE>::const_iterator it = Common::Array<TYPE>::begin();
- for (; it != Common::Array<TYPE>::end(); it++) {
+ for (; it != Common::Array<TYPE>::end(); ++it) {
TYPE obj = *it;
persistMgr->transfer("", &obj);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 15:47:56 +0000