From ef74b6f92d0488273c287eb29fd55a85099df95f Mon Sep 17 00:00:00 2001 From: Juliano Leal Goncalves Date: Wed, 1 Sep 2021 22:46:07 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20'ObjectStruct'=20to=20'?= =?UTF-8?q?Object'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/loadsave.cpp | 4 ++-- Source/objects.cpp | 32 ++++++++++++++++---------------- Source/objects.h | 6 +++--- Source/player.cpp | 2 +- Source/setmaps.cpp | 2 +- Source/setmaps.h | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp index 7d8ad160b..84a6f407e 100644 --- a/Source/loadsave.cpp +++ b/Source/loadsave.cpp @@ -684,7 +684,7 @@ void LoadMissile(LoadHelper *file, MissileStruct &missile) void LoadObject(LoadHelper *file, int i) { - ObjectStruct *pObject = &Objects[i]; + Object *pObject = &Objects[i]; pObject->_otype = static_cast<_object_id>(file->NextLE()); pObject->position.x = file->NextLE(); @@ -1330,7 +1330,7 @@ void SaveMissile(SaveHelper *file, MissileStruct &missile) void SaveObject(SaveHelper *file, int i) { - ObjectStruct *pObject = &Objects[i]; + Object *pObject = &Objects[i]; file->WriteLE(pObject->_otype); file->WriteLE(pObject->position.x); diff --git a/Source/objects.cpp b/Source/objects.cpp index dfca8001c..819b5d0fa 100644 --- a/Source/objects.cpp +++ b/Source/objects.cpp @@ -33,7 +33,7 @@ namespace devilution { -ObjectStruct Objects[MAXOBJECTS]; +Object Objects[MAXOBJECTS]; int AvailableObjects[MAXOBJECTS]; int ActiveObjects[MAXOBJECTS]; int ActiveObjectCount; @@ -1811,7 +1811,7 @@ inline bool IsDoorClear(const Point &doorPosition) void OperateL1RDoor(int pnum, int oi, bool sendflag) { - ObjectStruct &door = Objects[oi]; + Object &door = Objects[oi]; if (door._oVar4 == 2) { if (!deltaload) @@ -1889,7 +1889,7 @@ void OperateL1RDoor(int pnum, int oi, bool sendflag) void OperateL1LDoor(int pnum, int oi, bool sendflag) { - ObjectStruct &door = Objects[oi]; + Object &door = Objects[oi]; if (door._oVar4 == 2) { if (!deltaload) @@ -1970,7 +1970,7 @@ void OperateL1LDoor(int pnum, int oi, bool sendflag) void OperateL2RDoor(int pnum, int oi, bool sendflag) { - ObjectStruct &door = Objects[oi]; + Object &door = Objects[oi]; if (door._oVar4 == 2) { if (!deltaload) @@ -2013,7 +2013,7 @@ void OperateL2RDoor(int pnum, int oi, bool sendflag) void OperateL2LDoor(int pnum, int oi, bool sendflag) { - ObjectStruct &door = Objects[oi]; + Object &door = Objects[oi]; if (door._oVar4 == 2) { if (!deltaload) @@ -2056,7 +2056,7 @@ void OperateL2LDoor(int pnum, int oi, bool sendflag) void OperateL3RDoor(int pnum, int oi, bool sendflag) { - ObjectStruct &door = Objects[oi]; + Object &door = Objects[oi]; if (door._oVar4 == 2) { if (!deltaload) @@ -2097,7 +2097,7 @@ void OperateL3RDoor(int pnum, int oi, bool sendflag) void OperateL3LDoor(int pnum, int oi, bool sendflag) { - ObjectStruct &door = Objects[oi]; + Object &door = Objects[oi]; if (door._oVar4 == 2) { if (!deltaload) @@ -4147,7 +4147,7 @@ bool AreAllCruxesOfTypeBroken(int cruxType) return true; } -void BreakCrux(ObjectStruct &crux) +void BreakCrux(Object &crux) { crux._oAnimFlag = 1; crux._oAnimFrame = 1; @@ -4242,13 +4242,13 @@ void BreakBarrel(int pnum, int i, int dam, bool forcebreak, bool sendmsg) NetSendCmdParam2(false, CMD_BREAKOBJ, pnum, i); } -void SyncCrux(const ObjectStruct &crux) +void SyncCrux(const Object &crux) { if (AreAllCruxesOfTypeBroken(crux._oVar8)) ObjChangeMap(crux._oVar1, crux._oVar2, crux._oVar3, crux._oVar4); } -void SyncLever(const ObjectStruct &lever) +void SyncLever(const Object &lever) { if (lever._oSelFlag != 0) return; @@ -4256,7 +4256,7 @@ void SyncLever(const ObjectStruct &lever) ObjChangeMap(lever._oVar1, lever._oVar2, lever._oVar3, lever._oVar4); } -void SyncQSTLever(const ObjectStruct &qstLever) +void SyncQSTLever(const Object &qstLever) { if (qstLever._oAnimFrame == qstLever._oVar6) { ObjChangeMapResync(qstLever._oVar1, qstLever._oVar2, qstLever._oVar3, qstLever._oVar4); @@ -4269,7 +4269,7 @@ void SyncQSTLever(const ObjectStruct &qstLever) } } -void SyncPedestal(const ObjectStruct &pedestal, Point origin, int width) +void SyncPedestal(const Object &pedestal, Point origin, int width) { if (pedestal._oVar6 == 1) ObjChangeMapResync(origin.x, origin.y + 3, origin.x + 2, origin.y + 7); @@ -4283,7 +4283,7 @@ void SyncPedestal(const ObjectStruct &pedestal, Point origin, int width) } } -void SyncL1Doors(ObjectStruct &door) +void SyncL1Doors(Object &door) { if (door._oVar4 == 0) { door._oMissFlag = false; @@ -4322,7 +4322,7 @@ void SyncL1Doors(ObjectStruct &door) } } -void SyncL2Doors(ObjectStruct &door) +void SyncL2Doors(Object &door) { door._oMissFlag = door._oVar4 != 0; door._oSelFlag = 2; @@ -4342,7 +4342,7 @@ void SyncL2Doors(ObjectStruct &door) } } -void SyncL3Doors(ObjectStruct &door) +void SyncL3Doors(Object &door) { door._oMissFlag = true; door._oSelFlag = 2; @@ -5321,7 +5321,7 @@ void SyncBreakObj(int pnum, int oi) BreakBarrel(pnum, oi, 0, true, false); } -void SyncObjectAnim(ObjectStruct &object) +void SyncObjectAnim(Object &object) { object_graphic_id index = AllObjects[object._otype].ofindex; diff --git a/Source/objects.h b/Source/objects.h index ff53b4380..9a193fc35 100644 --- a/Source/objects.h +++ b/Source/objects.h @@ -18,7 +18,7 @@ namespace devilution { #define MAXOBJECTS 127 -struct ObjectStruct { +struct Object { _object_id _otype; Point position; bool _oLight; @@ -132,7 +132,7 @@ struct ObjectStruct { } }; -extern ObjectStruct Objects[MAXOBJECTS]; +extern Object Objects[MAXOBJECTS]; extern int AvailableObjects[MAXOBJECTS]; extern int ActiveObjects[MAXOBJECTS]; extern int ActiveObjectCount; @@ -163,7 +163,7 @@ void OperateObject(int pnum, int i, bool TeleFlag); void SyncOpObject(int pnum, int cmd, int i); void BreakObject(int pnum, int oi); void SyncBreakObj(int pnum, int oi); -void SyncObjectAnim(ObjectStruct &object); +void SyncObjectAnim(Object &object); void GetObjectStr(int i); void OperateNakrulLever(); void SyncNakrulRoom(); diff --git a/Source/player.cpp b/Source/player.cpp index 048106e1f..b56a23b32 100644 --- a/Source/player.cpp +++ b/Source/player.cpp @@ -1540,7 +1540,7 @@ void CheckNewPath(int pnum, bool pmWillBeCalled) Monster *monster; Player *target; - ObjectStruct *object; + Object *object; Item *item; int targetId = player.destParam1; diff --git a/Source/setmaps.cpp b/Source/setmaps.cpp index 3f04aa015..658dc4988 100644 --- a/Source/setmaps.cpp +++ b/Source/setmaps.cpp @@ -137,7 +137,7 @@ void SetmapTransparancy(const char *path) } // namespace -ObjectStruct &ObjectAtPosition(Point position) +Object &ObjectAtPosition(Point position) { for (int i = 0; i < ActiveObjectCount; i++) { int oi = ActiveObjects[i]; diff --git a/Source/setmaps.h b/Source/setmaps.h index f9aeefac0..13f43ad80 100644 --- a/Source/setmaps.h +++ b/Source/setmaps.h @@ -17,7 +17,7 @@ namespace devilution { * @param position The map coordinate to test * @return A reference to the object */ -ObjectStruct &ObjectAtPosition(Point position); +Object &ObjectAtPosition(Point position); void LoadSetMap(); /* rdata */