[Scummvm-git-logs] scummvm master -> 53f056a52275fe2f75301ef70bf89af8f743ce92
OMGPizzaGuy
noreply at scummvm.org
Sun Feb 8 13:51:41 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
53f056a522 ULTIMA8: Replace iterator declarations with auto
Commit: 53f056a52275fe2f75301ef70bf89af8f743ce92
https://github.com/scummvm/scummvm/commit/53f056a52275fe2f75301ef70bf89af8f743ce92
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2026-02-08T07:48:37-06:00
Commit Message:
ULTIMA8: Replace iterator declarations with auto
Changed paths:
engines/ultima/ultima8/audio/audio_process.cpp
engines/ultima/ultima8/conf/config_file_manager.cpp
engines/ultima/ultima8/games/treasure_loader.cpp
engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
engines/ultima/ultima8/gfx/fonts/shape_rendered_text.cpp
engines/ultima/ultima8/gumps/container_gump.cpp
engines/ultima/ultima8/gumps/game_map_gump.cpp
engines/ultima/ultima8/gumps/gump.cpp
engines/ultima/ultima8/kernel/kernel.cpp
engines/ultima/ultima8/kernel/kernel.h
engines/ultima/ultima8/kernel/mouse.cpp
engines/ultima/ultima8/kernel/object_manager.cpp
engines/ultima/ultima8/kernel/process.cpp
engines/ultima/ultima8/misc/debugger.cpp
engines/ultima/ultima8/misc/util.cpp
engines/ultima/ultima8/ultima8.cpp
engines/ultima/ultima8/usecode/uc_machine.cpp
engines/ultima/ultima8/world/actors/actor.cpp
engines/ultima/ultima8/world/container.cpp
engines/ultima/ultima8/world/current_map.cpp
engines/ultima/ultima8/world/item.cpp
engines/ultima/ultima8/world/snap_process.cpp
engines/ultima/ultima8/world/world.cpp
diff --git a/engines/ultima/ultima8/audio/audio_process.cpp b/engines/ultima/ultima8/audio/audio_process.cpp
index 2388d6ddf4f..64065763eb3 100644
--- a/engines/ultima/ultima8/audio/audio_process.cpp
+++ b/engines/ultima/ultima8/audio/audio_process.cpp
@@ -87,8 +87,7 @@ void AudioProcess::run() {
AudioMixer *mixer = AudioMixer::get_instance();
// Update the channels
- Common::List<SampleInfo>::iterator it;
- for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
+ for (auto it = _sampleInfo.begin(); it != _sampleInfo.end();) {
bool finished = false;
if (!mixer->isPlaying(it->_channel)) {
if (it->_sfxNum == -1)
@@ -213,8 +212,7 @@ int AudioProcess::playSample(AudioSample *sample, int priority, int loops, bool
if (channel == -1) return channel;
// Erase old sample using channel (if any)
- Common::List<SampleInfo>::iterator it;
- for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
+ for (auto it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if (it->_channel == channel) {
it = _sampleInfo.erase(it);
} else {
@@ -234,8 +232,7 @@ void AudioProcess::playSFX(int sfxNum, int priority, ObjId objId, int loops,
AudioMixer *mixer = AudioMixer::get_instance();
if (no_duplicates) {
- Common::List<SampleInfo>::iterator it;
- for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
+ for (auto it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if (it->_sfxNum == sfxNum && it->_objId == objId &&
it->_loops == loops) {
@@ -271,8 +268,7 @@ void AudioProcess::playSFX(int sfxNum, int priority, ObjId objId, int loops,
void AudioProcess::stopSFX(int sfxNum, ObjId objId) {
AudioMixer *mixer = AudioMixer::get_instance();
- Common::List<SampleInfo>::iterator it;
- for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
+ for (auto it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if ((sfxNum == -1 || it->_sfxNum == sfxNum)
&& it->_objId == objId) {
if (mixer->isPlaying(it->_channel)) mixer->stopSample(it->_channel);
@@ -339,8 +335,7 @@ bool AudioProcess::playSpeech(const Common::String &barked, int shapeNum, ObjId
AudioMixer *mixer = AudioMixer::get_instance();
- Common::List<SampleInfo>::iterator it;
- for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
+ for (auto it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if (it->_sfxNum == -1 && it->_barked == barked &&
it->_priority == shapeNum && it->_objId == objId) {
@@ -387,8 +382,7 @@ uint32 AudioProcess::getSpeechLength(const Common::String &barked, int shapenum)
void AudioProcess::stopSpeech(const Common::String &barked, int shapenum, ObjId objId) {
AudioMixer *mixer = AudioMixer::get_instance();
- Common::List<SampleInfo>::iterator it;
- for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
+ for (auto it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if (it->_sfxNum == -1 && it->_priority == shapenum &&
it->_objId == objId && it->_barked == barked) {
if (mixer->isPlaying(it->_channel)) mixer->stopSample(it->_channel);
@@ -400,7 +394,6 @@ void AudioProcess::stopSpeech(const Common::String &barked, int shapenum, ObjId
}
bool AudioProcess::isSpeechPlaying(const Common::String &barked, int shapeNum) {
- Common::List<SampleInfo>::iterator it;
for (auto &si : _sampleInfo) {
if (si._sfxNum == -1 && si._priority == shapeNum &&
si._barked == barked) {
@@ -417,8 +410,7 @@ void AudioProcess::pauseAllSamples() {
AudioMixer *mixer = AudioMixer::get_instance();
- Common::List<SampleInfo>::iterator it;
- for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
+ for (auto it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if (mixer->isPlaying(it->_channel)) {
mixer->setPaused(it->_channel, true);
++it;
@@ -436,8 +428,7 @@ void AudioProcess::unpauseAllSamples() {
AudioMixer *mixer = AudioMixer::get_instance();
- Common::List<SampleInfo>::iterator it;
- for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
+ for (auto it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if (mixer->isPlaying(it->_channel)) {
mixer->setPaused(it->_channel, false);
++it;
@@ -452,8 +443,7 @@ void AudioProcess::unpauseAllSamples() {
void AudioProcess::stopAllExceptSpeech() {
AudioMixer *mixer = AudioMixer::get_instance();
- Common::List<SampleInfo>::iterator it;
- for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
+ for (auto it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if (it->_barked.empty()) {
if (mixer->isPlaying(it->_channel)) mixer->stopSample(it->_channel);
it = _sampleInfo.erase(it);
diff --git a/engines/ultima/ultima8/conf/config_file_manager.cpp b/engines/ultima/ultima8/conf/config_file_manager.cpp
index c56216fa7eb..cb259e6e677 100644
--- a/engines/ultima/ultima8/conf/config_file_manager.cpp
+++ b/engines/ultima/ultima8/conf/config_file_manager.cpp
@@ -70,7 +70,7 @@ void ConfigFileManager::clear() {
}
void ConfigFileManager::clearRoot(const Common::String &category) {
- Common::Array<ConfigFile *>::iterator i = _configFiles.begin();
+ auto i = _configFiles.begin();
while (i != _configFiles.end()) {
if (category.equalsIgnoreCase((*i)->_category)) {
diff --git a/engines/ultima/ultima8/games/treasure_loader.cpp b/engines/ultima/ultima8/games/treasure_loader.cpp
index d9cd7c338b4..6d35b1f6467 100644
--- a/engines/ultima/ultima8/games/treasure_loader.cpp
+++ b/engines/ultima/ultima8/games/treasure_loader.cpp
@@ -130,8 +130,7 @@ bool TreasureLoader::internalParse(const Common::String &desc, TreasureInfo &ti,
} else if (key == "type" && !loadingDefault) {
if (loadedDefault)
return false;
- TreasureMap::const_iterator iter;
- iter = _defaultTreasure.find(val);
+ auto iter = _defaultTreasure.find(val);
if (iter != _defaultTreasure.end())
ti = iter->_value;
else
diff --git a/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp b/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
index 635cb1e22ec..f181bda9b8c 100644
--- a/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
@@ -97,8 +97,6 @@ void JPRenderedText::drawBlended(RenderSurface *surface, int x, int y,
const Palette *savepal = _font->getPalette();
_font->setPalette(pal);
- Common::List<PositionedText>::const_iterator iter;
-
for (const auto &line : _lines) {
int line_x = x + line._dims.left;
int line_y = y + line._dims.top;
diff --git a/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.cpp b/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.cpp
index 140afc193ed..b8b3381391d 100644
--- a/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.cpp
@@ -45,8 +45,6 @@ void ShapeRenderedText::draw(RenderSurface *surface, int x, int y, bool /*destma
// TODO support masking here???
uint32 color = TEX32_PACK_RGB(0, 0, 0);
- Common::List<PositionedText>::const_iterator iter;
-
surface->BeginPainting();
for (const auto &line : _lines) {
@@ -79,9 +77,6 @@ void ShapeRenderedText::draw(RenderSurface *surface, int x, int y, bool /*destma
void ShapeRenderedText::drawBlended(RenderSurface *surface, int x, int y,
uint32 col, bool /*destmasked*/) {
// TODO Support masking here ????
-
- Common::List<PositionedText>::const_iterator iter;
-
for (const auto &line : _lines) {
int line_x = x + line._dims.left;
int line_y = y + line._dims.top;
diff --git a/engines/ultima/ultima8/gumps/container_gump.cpp b/engines/ultima/ultima8/gumps/container_gump.cpp
index fbda1e67c7e..c16a8bc9c16 100644
--- a/engines/ultima/ultima8/gumps/container_gump.cpp
+++ b/engines/ultima/ultima8/gumps/container_gump.cpp
@@ -207,10 +207,9 @@ uint16 ContainerGump::TraceObjId(int32 mx, int32 my) {
bool showEditorItems = Ultima8Engine::get_instance()->isShowEditorItems();
Common::List<Item *> &contents = c->_contents;
- Common::List<Item *>::iterator iter;
// iterate backwards, since we're painting from begin() to end()
- for (iter = contents.reverse_begin(); iter != contents.end(); --iter) {
+ for (auto iter = contents.reverse_begin(); iter != contents.end(); --iter) {
Item *item = *iter;
if (!showEditorItems && item->getShapeInfo()->is_editor())
continue;
@@ -291,7 +290,7 @@ void ContainerGump::Close(bool no_del) {
if (!c) return; // Container gone!?
Common::List<Item *> &contents = c->_contents;
- Common::List<Item *>::iterator iter = contents.begin();
+ auto iter = contents.begin();
while (iter != contents.end()) {
Item *item = *iter;
++iter;
diff --git a/engines/ultima/ultima8/gumps/game_map_gump.cpp b/engines/ultima/ultima8/gumps/game_map_gump.cpp
index 02dd824aed4..0e98f37e396 100644
--- a/engines/ultima/ultima8/gumps/game_map_gump.cpp
+++ b/engines/ultima/ultima8/gumps/game_map_gump.cpp
@@ -122,10 +122,7 @@ void GameMapGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled)
if (!items) continue;
- Common::List<Item *>::const_iterator it = items->begin();
- Common::List<Item *>::const_iterator end = items->end();
- for (; it != end; ++it) {
- Item *item = *it;
+ for (auto item : *items) {
if (!item) continue;
item->setupLerp(gametick);
diff --git a/engines/ultima/ultima8/gumps/gump.cpp b/engines/ultima/ultima8/gumps/gump.cpp
index d8cbab789ce..7cdbbb2d059 100644
--- a/engines/ultima/ultima8/gumps/gump.cpp
+++ b/engines/ultima/ultima8/gumps/gump.cpp
@@ -128,20 +128,15 @@ void Gump::Close(bool no_del) {
}
void Gump::RenderSurfaceChanged() {
- // Iterate all children
- Common::List<Gump *>::iterator it = _children.reverse_begin();
- Common::List<Gump *>::iterator end = _children.end();
-
- while (it != end) {
- (*it)->RenderSurfaceChanged();
- --it;
+ for (auto *g : _children) {
+ g->RenderSurfaceChanged();
}
}
void Gump::run() {
// Iterate all children
- Common::List<Gump *>::iterator it = _children.begin();
- Common::List<Gump *>::iterator end = _children.end();
+ auto it = _children.begin();
+ const auto end = _children.end();
while (it != end) {
Gump *g = *it;
@@ -169,8 +164,8 @@ void Gump::CloseItemDependents() {
}
// Pass the MapChanged message to all the children
- Common::List<Gump *>::iterator it = _children.begin();
- Common::List<Gump *>::iterator end = _children.end();
+ auto it = _children.begin();
+ const auto end = _children.end();
while (it != end) {
Gump *g = *it;
@@ -195,8 +190,7 @@ bool Gump::GetMouseCursor(int32 mx, int32 my, Shape &shape, int32 &frame) {
bool ret = false;
// This reverse iterates the children
- Common::List<Gump *>::iterator it;
- for (it = _children.reverse_begin(); it != _children.end(); --it)
+ for (auto it = _children.reverse_begin(); it != _children.end(); --it)
{
Gump *g = *it;
@@ -285,8 +279,8 @@ void Gump::PaintCompositing(RenderSurface *surf, int32 lerp_factor,
surf->setClippingRect(new_rect);
// Iterate all children
- Common::List<Gump *>::iterator it = _children.reverse_begin();
- Common::List<Gump *>::iterator end = _children.end();
+ auto it = _children.reverse_begin();
+ const auto end = _children.end();
while (it != end) {
Gump *g = *it;
@@ -316,8 +310,8 @@ Gump *Gump::FindGump(int mx, int my) {
Gump *gump = nullptr;
// Iterate all children
- Common::List<Gump *>::iterator it = _children.reverse_begin();
- Common::List<Gump *>::iterator end = _children.end();
+ auto it = _children.reverse_begin();
+ const auto end = _children.end();
while (it != end && !gump) {
Gump *g = *it;
@@ -396,8 +390,7 @@ bool Gump::PointOnGump(int mx, int my) {
}
// reverse-iterate children
- Common::List<Gump *>::iterator it;
- for (it = _children.reverse_begin(); it != _children.end(); --it) {
+ for (auto it = _children.reverse_begin(); it != _children.end(); --it) {
Gump *g = *it;
// It's got the point
@@ -483,8 +476,7 @@ uint16 Gump::TraceObjId(int32 mx, int32 my) {
uint16 objId_ = 0;
// reverse-iterate children
- Common::List<Gump *>::iterator it;
- for (it = _children.reverse_begin(); it != _children.end(); --it) {
+ for (auto it = _children.reverse_begin(); it != _children.end(); --it) {
Gump *g = *it;
// Not if closing or hidden
@@ -559,7 +551,7 @@ void Gump::FindNewFocusChild() {
_focusChild = nullptr;
// Now add the gump to use as the new focus
- Common::List<Gump *>::iterator it = _children.reverse_begin();
+ const auto it = _children.reverse_begin();
if (it != _children.end()) {
(*it)->MakeFocus();
@@ -576,8 +568,8 @@ void Gump::AddChild(Gump *gump, bool take_focus) {
if (old_parent) old_parent->RemoveChild(gump);
// Now add the gump in the correct spot
- Common::List<Gump *>::iterator it = _children.begin();
- Common::List<Gump *>::iterator end = _children.end();
+ auto it = _children.begin();
+ const auto end = _children.end();
for (; it != end; ++it) {
Gump *other = *it;
@@ -625,8 +617,8 @@ void Gump::MoveChildToFront(Gump *gump) {
_children.remove(gump);
- Common::List<Gump *>::iterator it = _children.begin();
- Common::List<Gump *>::iterator end = _children.end();
+ auto it = _children.begin();
+ const auto end = _children.end();
for (; it != end; ++it) {
Gump *other = *it;
@@ -674,8 +666,7 @@ Gump *Gump::onMouseDown(int button, int32 mx, int32 my) {
Gump *handled = nullptr;
// Iterate children backwards
- Common::List<Gump *>::iterator it;
- for (it = _children.reverse_begin(); it != _children.end(); --it) {
+ for (auto it = _children.reverse_begin(); it != _children.end(); --it) {
Gump *g = *it;
// Not if closing or hidden
@@ -698,8 +689,7 @@ Gump *Gump::onMouseMotion(int32 mx, int32 my) {
Gump *handled = nullptr;
// Iterate children backwards
- Common::List<Gump *>::iterator it;
- for (it = _children.reverse_begin(); it != _children.end(); --it) {
+ for (auto it = _children.reverse_begin(); it != _children.end(); --it) {
Gump *g = *it;
// Not if closing or hidden
diff --git a/engines/ultima/ultima8/kernel/kernel.cpp b/engines/ultima/ultima8/kernel/kernel.cpp
index 24e5df1fb38..8907bf55b74 100644
--- a/engines/ultima/ultima8/kernel/kernel.cpp
+++ b/engines/ultima/ultima8/kernel/kernel.cpp
@@ -390,8 +390,7 @@ void Kernel::save(Common::WriteStream *ws) {
const Common::String & classname = p->GetClassType()._className; // virtual
assert(classname.size());
- Common::HashMap<Common::String, ProcessLoadFunc>::iterator iter;
- iter = _processLoaders.find(classname);
+ auto iter = _processLoaders.find(classname);
if (iter == _processLoaders.end()) {
error("Process class cannot save without registered loader: %s", classname.c_str());
@@ -454,8 +453,7 @@ Process *Kernel::loadProcess(Common::ReadStream *rs, uint32 version) {
Common::String classname = buf;
delete[] buf;
- Common::HashMap<Common::String, ProcessLoadFunc>::iterator iter;
- iter = _processLoaders.find(classname);
+ const auto iter = _processLoaders.find(classname);
if (iter == _processLoaders.end()) {
warning("Unknown Process class: %s", classname.c_str());
diff --git a/engines/ultima/ultima8/kernel/kernel.h b/engines/ultima/ultima8/kernel/kernel.h
index 20d79b9fe71..dc6d8e42bab 100644
--- a/engines/ultima/ultima8/kernel/kernel.h
+++ b/engines/ultima/ultima8/kernel/kernel.h
@@ -91,13 +91,7 @@ public:
//! \param fail if true, fail the processes instead of terminating them
void killAllProcessesNotOfTypeExcludeCurrent(uint16 processtype, bool fail);
- //! get an iterator of the process list.
- ProcessIter getProcessBeginIterator() {
- return _processes.begin();
- }
- ProcessIter getProcessEndIterator() {
- return _processes.end();
- }
+ const Common::List<Process *> &getProcesses() const { return _processes; }
void kernelStats();
void processTypes();
diff --git a/engines/ultima/ultima8/kernel/mouse.cpp b/engines/ultima/ultima8/kernel/mouse.cpp
index 08ded050312..2c027d82fdd 100644
--- a/engines/ultima/ultima8/kernel/mouse.cpp
+++ b/engines/ultima/ultima8/kernel/mouse.cpp
@@ -323,8 +323,8 @@ void Mouse::setMouseCoords(int mx, int my) {
newGump = newGump->GetParent();
}
- Common::List<Gump *>::iterator olditer = oldgumplist.begin();
- Common::List<Gump *>::iterator newiter = newgumplist.begin();
+ auto olditer = oldgumplist.begin();
+ auto newiter = newgumplist.begin();
// strip common prefix from lists
while (olditer != oldgumplist.end() &&
diff --git a/engines/ultima/ultima8/kernel/object_manager.cpp b/engines/ultima/ultima8/kernel/object_manager.cpp
index 31043dd44f9..ecd3daab393 100644
--- a/engines/ultima/ultima8/kernel/object_manager.cpp
+++ b/engines/ultima/ultima8/kernel/object_manager.cpp
@@ -305,8 +305,7 @@ bool ObjectManager::load(Common::ReadStream *rs, uint32 version) {
void ObjectManager::saveObject(Common::WriteStream *ws, Object *obj) const {
const Common::String & classname = obj->GetClassType()._className; // note: virtual
- Common::HashMap<Common::String, ObjectLoadFunc>::iterator iter;
- iter = _objectLoaders.find(classname);
+ const auto iter = _objectLoaders.find(classname);
if (iter == _objectLoaders.end()) {
error("Object class cannot save without registered loader: %s", classname.c_str());
}
@@ -330,8 +329,7 @@ Object *ObjectManager::loadObject(Common::ReadStream *rs, uint32 version) {
Object *ObjectManager::loadObject(Common::ReadStream *rs, Common::String classname,
uint32 version) {
- Common::HashMap<Common::String, ObjectLoadFunc>::iterator iter;
- iter = _objectLoaders.find(classname);
+ const auto iter = _objectLoaders.find(classname);
if (iter == _objectLoaders.end()) {
warning("Unknown Object class: %s", classname.c_str());
diff --git a/engines/ultima/ultima8/kernel/process.cpp b/engines/ultima/ultima8/kernel/process.cpp
index accfea3c7ed..0aec773b39a 100644
--- a/engines/ultima/ultima8/kernel/process.cpp
+++ b/engines/ultima/ultima8/kernel/process.cpp
@@ -118,7 +118,7 @@ Common::String Process::dumpInfo() const {
if (!_waiting.empty()) {
info += ", notify: ";
- for (Common::Array<ProcId>::const_iterator i = _waiting.begin(); i != _waiting.end(); ++i) {
+ for (auto i = _waiting.begin(); i != _waiting.end(); ++i) {
if (i != _waiting.begin()) info += ", ";
info += Common::String::format("%d", *i);
}
diff --git a/engines/ultima/ultima8/misc/debugger.cpp b/engines/ultima/ultima8/misc/debugger.cpp
index c43da6bb27e..9faa62f2bcc 100644
--- a/engines/ultima/ultima8/misc/debugger.cpp
+++ b/engines/ultima/ultima8/misc/debugger.cpp
@@ -1074,11 +1074,10 @@ bool Debugger::cmdRecall(int argc, const char **argv) {
bool Debugger::cmdListMarks(int argc, const char **argv) {
const Common::ConfigManager::Domain *domain = ConfMan.getActiveDomain();
- Common::ConfigManager::Domain::const_iterator dit;
Common::StringArray marks;
- for (dit = domain->begin(); dit != domain->end(); ++dit) {
- if (dit->_key.hasPrefix("mark_")) {
- marks.push_back(dit->_key.substr(5));
+ for (const auto & dit : *domain) {
+ if (dit._key.hasPrefix("mark_")) {
+ marks.push_back(dit._key.substr(5));
}
}
diff --git a/engines/ultima/ultima8/misc/util.cpp b/engines/ultima/ultima8/misc/util.cpp
index 5f19aea4131..b5897f3d834 100644
--- a/engines/ultima/ultima8/misc/util.cpp
+++ b/engines/ultima/ultima8/misc/util.cpp
@@ -30,11 +30,10 @@ template<class T> void StringToArgv(const T &args, Common::Array<T> &argv) {
argv.clear();
bool quoted = false;
- typename T::const_iterator it;
int ch;
T arg;
- for (it = args.begin(); it != args.end(); ++it) {
+ for (auto it = args.begin(); it != args.end(); ++it) {
ch = *it;
// Toggle quoted string handling
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 86fed0196dc..72f24fa6fbf 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -757,8 +757,8 @@ void Ultima8Engine::changeVideoMode(int width, int height) {
// Set Screen Resolution
debug(1, "Setting Video Mode %dx%d...", width, height);
- Common::List<Graphics::PixelFormat> tryModes = g_system->getSupportedFormats();
- for (Common::List<Graphics::PixelFormat>::iterator g = tryModes.begin(); g != tryModes.end(); ++g) {
+ auto tryModes = g_system->getSupportedFormats();
+ for (auto g = tryModes.begin(); g != tryModes.end(); ++g) {
if (g->bytesPerPixel != 2 && g->bytesPerPixel != 4) {
g = tryModes.reverse_erase(g);
}
diff --git a/engines/ultima/ultima8/usecode/uc_machine.cpp b/engines/ultima/ultima8/usecode/uc_machine.cpp
index a858d433b96..a4cfa4a0e8b 100644
--- a/engines/ultima/ultima8/usecode/uc_machine.cpp
+++ b/engines/ultima/ultima8/usecode/uc_machine.cpp
@@ -2013,9 +2013,7 @@ void UCMachine::execProcess(UCProcess *p) {
const Common::String &UCMachine::getString(uint16 str) const {
static const Common::String emptystring("");
- Common::HashMap<uint16, Common::String>::const_iterator iter =
- _stringHeap.find(str);
-
+ const auto iter = _stringHeap.find(str);
if (iter != _stringHeap.end())
return iter->_value;
@@ -2023,8 +2021,7 @@ const Common::String &UCMachine::getString(uint16 str) const {
}
UCList *UCMachine::getList(uint16 l) {
- Common::HashMap<uint16, UCList *>::iterator iter = _listHeap.find(l);
-
+ const auto iter = _listHeap.find(l);
if (iter != _listHeap.end())
return iter->_value;
@@ -2062,7 +2059,7 @@ void UCMachine::freeString(uint16 s) {
//! (when something accesses _stringHeap[0])
//! This may not be desirable, but OTOH the created string will be
//! empty, so not too much of a problem.
- Common::HashMap<uint16, Common::String>::iterator iter = _stringHeap.find(s);
+ const auto iter = _stringHeap.find(s);
if (iter != _stringHeap.end()) {
_stringHeap.erase(iter);
_stringIDs->clearID(s);
@@ -2070,7 +2067,7 @@ void UCMachine::freeString(uint16 s) {
}
void UCMachine::freeList(uint16 l) {
- Common::HashMap<uint16, UCList *>::iterator iter = _listHeap.find(l);
+ const auto iter = _listHeap.find(l);
if (iter != _listHeap.end() && iter->_value) {
iter->_value->free();
delete iter->_value;
@@ -2080,7 +2077,7 @@ void UCMachine::freeList(uint16 l) {
}
void UCMachine::freeStringList(uint16 l) {
- Common::HashMap<uint16, UCList *>::iterator iter = _listHeap.find(l);
+ const auto iter = _listHeap.find(l);
if (iter != _listHeap.end() && iter->_value) {
iter->_value->freeStrings();
delete iter->_value;
diff --git a/engines/ultima/ultima8/world/actors/actor.cpp b/engines/ultima/ultima8/world/actors/actor.cpp
index ff4bf8cad31..244d210e6d1 100644
--- a/engines/ultima/ultima8/world/actors/actor.cpp
+++ b/engines/ultima/ultima8/world/actors/actor.cpp
@@ -1324,10 +1324,9 @@ ProcId Actor::dieU8(uint16 damageType) {
// Kill blue potion use process if running
if (_objId == kMainActorId) {
- ProcessIter iter = Kernel::get_instance()->getProcessBeginIterator();
- ProcessIter endproc = Kernel::get_instance()->getProcessEndIterator();
- for (; iter != endproc; ++iter) {
- UCProcess *p = dynamic_cast<UCProcess *>(*iter);
+ auto processes = Kernel::get_instance()->getProcesses();
+ for (auto process : processes) {
+ auto p = dynamic_cast<UCProcess *>(process);
if (!p)
continue;
if (p->getClassId() != 766) // Potion
@@ -1607,13 +1606,14 @@ ProcId Actor::dieCru(uint16 damageType, uint16 damagePts, Direction srcDir) {
void Actor::killAllButCombatProcesses() {
// loop over all processes, keeping only the relevant ones
- ProcessIter iter = Kernel::get_instance()->getProcessBeginIterator();
- ProcessIter endproc = Kernel::get_instance()->getProcessEndIterator();
- for (; iter != endproc; ++iter) {
- Process *p = *iter;
- if (!p) continue;
- if (p->getItemNum() != _objId) continue;
- if (p->is_terminated()) continue;
+ auto processes = Kernel::get_instance()->getProcesses();
+ for (auto p : processes) {
+ if (!p)
+ continue;
+ if (p->getItemNum() != _objId)
+ continue;
+ if (p->is_terminated())
+ continue;
uint16 type = p->getType();
@@ -1638,13 +1638,15 @@ ProcId Actor::killAllButFallAnims(bool death) {
}
// loop over all animation processes, keeping only the relevant ones
- ProcessIter iter = Kernel::get_instance()->getProcessBeginIterator();
- ProcessIter endproc = Kernel::get_instance()->getProcessEndIterator();
- for (; iter != endproc; ++iter) {
- ActorAnimProcess *p = dynamic_cast<ActorAnimProcess *>(*iter);
- if (!p) continue;
- if (p->getItemNum() != _objId) continue;
- if (p->is_terminated()) continue;
+ auto processes = Kernel::get_instance()->getProcesses();
+ for (auto process : processes) {
+ auto p = dynamic_cast<ActorAnimProcess *>(process);
+ if (!p)
+ continue;
+ if (p->getItemNum() != _objId)
+ continue;
+ if (p->is_terminated())
+ continue;
Animation::Sequence action = p->getAction();
diff --git a/engines/ultima/ultima8/world/container.cpp b/engines/ultima/ultima8/world/container.cpp
index 97d272f90ea..798c2ed39fa 100644
--- a/engines/ultima/ultima8/world/container.cpp
+++ b/engines/ultima/ultima8/world/container.cpp
@@ -144,9 +144,7 @@ bool Container::addItem(Item *item, bool checkwghtvol) {
bool Container::removeItem(Item *item) {
- Common::List<Item *>::iterator iter;
-
- for (iter = _contents.begin(); iter != _contents.end(); ++iter) {
+ for (auto iter = _contents.begin(); iter != _contents.end(); ++iter) {
if (*iter == item) {
_contents.erase(iter);
return true;
@@ -156,9 +154,7 @@ bool Container::removeItem(Item *item) {
}
bool Container::moveItemToEnd(Item *item) {
- Common::List<Item *>::iterator iter;
-
- for (iter = _contents.begin(); iter != _contents.end(); ++iter) {
+ for (auto iter = _contents.begin(); iter != _contents.end(); ++iter) {
if (*iter == item) {
// found; move to end
_contents.erase(iter);
@@ -168,7 +164,6 @@ bool Container::moveItemToEnd(Item *item) {
}
// not found
-
return false;
}
diff --git a/engines/ultima/ultima8/world/current_map.cpp b/engines/ultima/ultima8/world/current_map.cpp
index 0083b89ef86..03daedeee35 100644
--- a/engines/ultima/ultima8/world/current_map.cpp
+++ b/engines/ultima/ultima8/world/current_map.cpp
@@ -513,7 +513,7 @@ void CurrentMap::setChunkFast(int32 cx, int32 cy) {
void CurrentMap::unsetChunkFast(int32 cx, int32 cy) {
_fast[cy][cx / 32] &= ~(1 << (cx & 31));
- item_list::iterator iter = _items[cx][cy].begin();
+ auto iter = _items[cx][cy].begin();
while (iter != _items[cx][cy].end()) {
Item *item = *iter;
++iter;
@@ -1001,7 +1001,8 @@ bool CurrentMap::sweepTest(const Point3 &start, const Point3 &end,
vel[0] + ext[0], vel[1] + ext[1], vel[2] + ext[2]);
Common::List<SweepItem>::iterator sw_it;
- if (hit) sw_it = hit->end();
+ if (hit)
+ sw_it = hit->end();
for (int cx = minx; cx <= maxx; cx++) {
for (int cy = miny; cy <= maxy; cy++) {
diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index 843cb79d15d..837c433c865 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -1136,7 +1136,7 @@ int32 Item::collideMove(int32 dx, int32 dy, int32 dz, bool teleport, bool force,
// We don't care about items hitting us at the start
if (!force) {
Common::List<CurrentMap::SweepItem>::iterator it;
- for (it = collisions.begin(); it != collisions.end(); it++) {
+ for (it = collisions.begin(); it != collisions.end(); ++it) {
if (it->_blocking && !it->_touching) {
if (hititem)
*hititem = it->_item;
@@ -2482,7 +2482,6 @@ bool Item::canReach(const Item *other, int range,
start.z = end.z; // bottom of other between bottom and top of this
Common::List<CurrentMap::SweepItem> collisions;
- Common::List<CurrentMap::SweepItem>::iterator it;
World *world = World::get_instance();
CurrentMap *map = world->getCurrentMap();
map->sweepTest(start, end, dims, ShapeInfo::SI_SOLID,
diff --git a/engines/ultima/ultima8/world/snap_process.cpp b/engines/ultima/ultima8/world/snap_process.cpp
index 69c766bf43b..5ffc787c241 100644
--- a/engines/ultima/ultima8/world/snap_process.cpp
+++ b/engines/ultima/ultima8/world/snap_process.cpp
@@ -113,8 +113,7 @@ void SnapProcess::updateCurrentEgg() {
void SnapProcess::removeEgg(Item *item) {
assert(item);
ObjId id = item->getObjId();
- for (Common::List<ObjId>::iterator iter = _snapEggs.begin();
- iter != _snapEggs.end(); iter++) {
+ for (auto iter = _snapEggs.begin(); iter != _snapEggs.end(); ++iter) {
if (*iter == id) {
iter = _snapEggs.erase(iter);
}
diff --git a/engines/ultima/ultima8/world/world.cpp b/engines/ultima/ultima8/world/world.cpp
index 21510e086bd..388999d99a6 100644
--- a/engines/ultima/ultima8/world/world.cpp
+++ b/engines/ultima/ultima8/world/world.cpp
@@ -372,7 +372,7 @@ void World::save(Common::WriteStream *ws) {
// empty stack and refill it again
uint16 *e = new uint16[es];
- Common::List<ObjId>::const_iterator it = _ethereal.begin();
+ auto it = _ethereal.begin();
unsigned int i;
for (i = 0; i < es; ++i) {
e[es - i] = *it;
More information about the Scummvm-git-logs
mailing list