diff --git a/Source/dead.cpp b/Source/dead.cpp index 1f296a522..047b56afb 100644 --- a/Source/dead.cpp +++ b/Source/dead.cpp @@ -12,7 +12,7 @@ namespace devilution { -DeadStruct dead[MAXDEAD]; +DeadStruct dead[MaxDead]; int8_t stonendx; void InitDead() @@ -65,12 +65,12 @@ void InitDead() } } - assert(nd <= MAXDEAD); + assert(nd <= MaxDead); } -void AddDead(Point loc, int8_t dv, direction ddir) +void AddDead(Point tilePosition, int8_t dv, direction ddir) { - dDead[loc.x][loc.y] = (dv & 0x1F) + (ddir << 5); + dDead[tilePosition.x][tilePosition.y] = (dv & 0x1F) + (ddir << 5); } void SetDead() diff --git a/Source/dead.h b/Source/dead.h index e3808eda9..a6e14b854 100644 --- a/Source/dead.h +++ b/Source/dead.h @@ -12,7 +12,7 @@ namespace devilution { -static constexpr unsigned MAXDEAD = 31; +static constexpr unsigned MaxDead = 31; struct DeadStruct { std::array _deadData; @@ -21,11 +21,11 @@ struct DeadStruct { uint8_t _deadtrans; }; -extern DeadStruct dead[MAXDEAD]; +extern DeadStruct dead[MaxDead]; extern int8_t stonendx; void InitDead(); -void AddDead(Point loc, int8_t dv, direction ddir); +void AddDead(Point tilePosition, int8_t dv, direction ddir); void SetDead(); } // namespace devilution