From db1026fa39ca79dcc737941da0e000fe9fcafa70 Mon Sep 17 00:00:00 2001
From: Juliano Leal Goncalves <julealgon@gmail.com>
Date: Wed, 1 Sep 2021 23:11:48 -0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20'MonsterDataStruct'=20t?=
 =?UTF-8?q?o=20'MonsterData'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Source/monstdat.cpp | 2 +-
 Source/monstdat.h   | 4 ++--
 Source/monster.cpp  | 2 +-
 Source/monster.h    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/monstdat.cpp b/Source/monstdat.cpp
index ec89f4b54..87cab2f37 100644
--- a/Source/monstdat.cpp
+++ b/Source/monstdat.cpp
@@ -13,7 +13,7 @@
 namespace devilution {
 
 /** Contains the data related to each monster ID. */
-const MonsterDataStruct MonstersData[] = {
+const MonsterData MonstersData[] = {
 	// clang-format off
 	//               mName,                        GraphicType,                        sndfile,                            TransFile,                         width, mImage, has_special, snd_special, has_trans, Frames[6],                  Rate[6],               mMinDLvl, mMaxDLvl, mLevel, mMinHP, mMaxHP, mAi,          mFlags                                                             , mInt, mHit, mAFNum, mMinDamage, mMaxDamage, mHit2, mAFNum2, mMinDamage2, mMaxDamage2, mArmorClass, mMonstClass, mMagicRes                                                       , mMagicRes2                                                        , mSelFlag,     mTreasure,          mExp
 	// TRANSLATORS: Monster Block start
diff --git a/Source/monstdat.h b/Source/monstdat.h
index d53ed22e4..42fb76ec8 100644
--- a/Source/monstdat.h
+++ b/Source/monstdat.h
@@ -82,7 +82,7 @@ enum monster_treasure : uint16_t {
 	// clang-format on
 };
 
-struct MonsterDataStruct {
+struct MonsterData {
 	const char *mName;
 	const char *GraphicType;
 	const char *sndfile;
@@ -312,7 +312,7 @@ struct UniqMonstStruct {
 	_speech_id mtalkmsg;
 };
 
-extern const MonsterDataStruct MonstersData[];
+extern const MonsterData MonstersData[];
 extern const _monster_id MonstConvTbl[];
 extern const char MonstAvailTbl[];
 extern const UniqMonstStruct UniqMonst[];
diff --git a/Source/monster.cpp b/Source/monster.cpp
index 3c1548885..9fd7b9fca 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -3478,7 +3478,7 @@ void BoneDemonAi(int i)
 	AiRangedAvoidance(i, MIS_BONEDEMON, true, 4, 0);
 }
 
-const char *GetMonsterTypeText(const MonsterDataStruct &monsterData)
+const char *GetMonsterTypeText(const MonsterData &monsterData)
 {
 	switch (monsterData.mMonstClass) {
 	case MC_ANIMAL:
diff --git a/Source/monster.h b/Source/monster.h
index 1c63c4472..059fbfb3b 100644
--- a/Source/monster.h
+++ b/Source/monster.h
@@ -154,7 +154,7 @@ struct CMonster {
 	uint16_t mMaxHP;
 	uint8_t mAFNum;
 	int8_t mdeadval;
-	const MonsterDataStruct *MData;
+	const MonsterData *MData;
 };
 
 struct Monster { // note: missing field _mAFNum
@@ -211,7 +211,7 @@ struct Monster { // note: missing field _mAFNum
 	int8_t mlid; // BUGFIX -1 is used when not emitting light this should be signed (fixed)
 	const char *mName;
 	CMonster *MType;
-	const MonsterDataStruct *MData;
+	const MonsterData *MData;
 
 	/**
 	 * @brief Check thats the correct stand Animation is loaded. This is needed if direction is changed (monster stands and looks to player).