diff --git a/Source/engine/render/scrollrt.cpp b/Source/engine/render/scrollrt.cpp index 8fe3212a9..1d65a478d 100644 --- a/Source/engine/render/scrollrt.cpp +++ b/Source/engine/render/scrollrt.cpp @@ -483,7 +483,7 @@ void DrawObject(const Surface &out, Point tilePosition, Point targetBufferPositi if (&objectToDraw == ObjectUnderCursor) { ClxDrawOutlineSkipColorZero(out, 194, screenPosition, sprite); } - if (objectToDraw._oLight) { + if (objectToDraw.applyLighting) { ClxDrawLight(out, screenPosition, sprite); } else { ClxDraw(out, screenPosition, sprite); diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp index 7bdb1f456..629a258a7 100644 --- a/Source/loadsave.cpp +++ b/Source/loadsave.cpp @@ -791,7 +791,7 @@ void LoadObject(LoadHelper &file, Object &object) object._otype = ConvertFromHellfireObject(static_cast<_object_id>(file.NextLE())); object.position.x = file.NextLE(); object.position.y = file.NextLE(); - object._oLight = file.NextBool32(); + object.applyLighting = file.NextBool32(); object._oAnimFlag = file.NextBool32(); file.Skip(4); // Skip pointer _oAnimData object._oAnimDelay = file.NextLE(); @@ -1523,7 +1523,7 @@ void SaveObject(SaveHelper &file, const Object &object) file.WriteLE(ConvertToHellfireObject(object._otype)); file.WriteLE(object.position.x); file.WriteLE(object.position.y); - file.WriteLE(object._oLight ? 1 : 0); + file.WriteLE(object.applyLighting ? 1 : 0); file.WriteLE(object._oAnimFlag ? 1 : 0); file.Skip(4); // Skip pointer _oAnimData file.WriteLE(object._oAnimDelay); diff --git a/Source/objdat.h b/Source/objdat.h index d04d133e3..8e697ae48 100644 --- a/Source/objdat.h +++ b/Source/objdat.h @@ -281,7 +281,7 @@ struct ObjectData { return HasAnyOf(flags, ObjectDataFlags::MissilesPassThrough); } - [[nodiscard]] bool isLight() const + [[nodiscard]] bool applyLighting() const { return HasAnyOf(flags, ObjectDataFlags::Light); } diff --git a/Source/objects.cpp b/Source/objects.cpp index 43c1c05c3..6a65480d3 100644 --- a/Source/objects.cpp +++ b/Source/objects.cpp @@ -804,7 +804,7 @@ void SetupObject(Object &object, Point position, _object_id ot) object._oAnimWidth = objectData.animWidth; object._oSolidFlag = objectData.isSolid() ? 1 : 0; object._oMissFlag = objectData.missilesPassThrough() ? 1 : 0; - object._oLight = objectData.isLight() ? 1 : 0; + object.applyLighting = objectData.applyLighting(); object._oDelFlag = false; object._oBreak = objectData.isBreakable() ? 1 : 0; object._oSelFlag = objectData.selFlag; diff --git a/Source/objects.h b/Source/objects.h index ac03c3f9d..ee5be1aeb 100644 --- a/Source/objects.h +++ b/Source/objects.h @@ -24,7 +24,7 @@ namespace devilution { struct Object { _object_id _otype = OBJ_NULL; - bool _oLight = false; + bool applyLighting = false; bool _oTrapFlag = false; bool _oDoorFlag = false; diff --git a/test/fixtures/memory_map/object.txt b/test/fixtures/memory_map/object.txt index 979955371..74ba2a023 100644 --- a/test/fixtures/memory_map/object.txt +++ b/test/fixtures/memory_map/object.txt @@ -1,7 +1,7 @@ R 32 _otype R 32 positionX R 32 positionY -R 32 _oLight +R 32 applyLighting R 32 _oAnimFlag R 32 _oAnimData R 32 _oAnimDelay