From 514565fad6d3a7e93a24b53b29eb901ef4f6a166 Mon Sep 17 00:00:00 2001 From: glx Date: Tue, 17 Dec 2019 19:05:46 +0100 Subject: Codechange: Replace FOR_ALL_OBJECTS with range-based for loops --- src/saveload/object_sl.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/saveload/object_sl.cpp') diff --git a/src/saveload/object_sl.cpp b/src/saveload/object_sl.cpp index b0c4e7513..2c385b655 100644 --- a/src/saveload/object_sl.cpp +++ b/src/saveload/object_sl.cpp @@ -31,10 +31,8 @@ static const SaveLoad _object_desc[] = { static void Save_OBJS() { - Object *o; - /* Write the objects */ - FOR_ALL_OBJECTS(o) { + for (Object *o : Object::Iterate()) { SlSetArrayIndex(o->index); SlObject(o, _object_desc); } @@ -51,8 +49,7 @@ static void Load_OBJS() static void Ptrs_OBJS() { - Object *o; - FOR_ALL_OBJECTS(o) { + for (Object *o : Object::Iterate()) { SlObject(o, _object_desc); if (IsSavegameVersionBefore(SLV_148) && !IsTileType(o->location.tile, MP_OBJECT)) { /* Due to a small bug stale objects could remain. */ -- cgit v1.2.3-54-g00ecf