dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Replace FOR_ALL_OBJECTS with range-based for loops

Browse Source
This commit is contained in:
glx
2019-12-17 19:05:46 +01:00
committed by Niels Martin Hansen
parent 11f178a312
commit 514565fad6
6 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/saveload/object_sl.cpp
View File

@@ -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. */