Splitting CheckInvPaste() into smaller functions (#6984)

diasurgical · Apr 20, 2024 · 7848ab7 · 7848ab7
1 parent a4d8aea
commit 7848ab7
Show file tree

Hide file tree

Showing 12 changed files with 294 additions and 253 deletions.
diff --git a/Source/control.cpp b/Source/control.cpp
@@ -1213,7 +1213,7 @@ void DrawInfoBox(const Surface &out)
 			GetObjectStr(*ObjectUnderCursor);
 		if (pcursmonst != -1) {
 			if (leveltype != DTYPE_TOWN) {
-				const auto &monster = Monsters[pcursmonst];
+				const Monster &monster = Monsters[pcursmonst];
 				InfoColor = UiFlags::ColorWhite;
 				InfoString = monster.name();
 				if (monster.isUnique()) {

diff --git a/Source/controls/plrctrls.cpp b/Source/controls/plrctrls.cpp
@@ -165,7 +165,7 @@ void FindItemOrObject()
 
 			continue;
 		}
-		auto &item = Items[itemId];
+		Item &item = Items[itemId];
 		if (item.isEmpty() || item._iSelFlag == 0) {
 			continue;
 		}
@@ -266,7 +266,7 @@ void FindRangedTarget()
 
 	for (size_t i = 0; i < ActiveMonsterCount; i++) {
 		int mi = ActiveMonsters[i];
-		const auto &monster = Monsters[mi];
+		const Monster &monster = Monsters[mi];
 
 		if (!CanTargetMonster(monster))
 			continue;
@@ -332,7 +332,7 @@ void FindMeleeTarget()
 
 				if (dMonster[dx][dy] != 0) {
 					const int mi = std::abs(dMonster[dx][dy]) - 1;
-					const auto &monster = Monsters[mi];
+					const Monster &monster = Monsters[mi];
 					if (CanTargetMonster(monster)) {
 						const bool newCanTalk = CanTalkToMonst(monster);
 						if (pcursmonst != -1 && !canTalk && newCanTalk)

diff --git a/Source/controls/touch/renderers.cpp b/Source/controls/touch/renderers.cpp
@@ -438,7 +438,7 @@ VirtualGamepadButtonType PrimaryActionButtonRenderer::GetTownButtonType()
 VirtualGamepadButtonType PrimaryActionButtonRenderer::GetDungeonButtonType()
 {
 	if (pcursmonst != -1) {
-		const auto &monster = Monsters[pcursmonst];
+		const Monster &monster = Monsters[pcursmonst];
 		if (M_Talker(monster) || monster.talkMsg != TEXT_NONE)
 			return GetTalkButtonType(virtualPadButton->isHeld);
 	}

diff --git a/Source/diablo.cpp b/Source/diablo.cpp
@@ -1391,7 +1391,7 @@ void UnstuckChargers()
 		}
 	}
 	for (size_t i = 0; i < ActiveMonsterCount; i++) {
-		auto &monster = Monsters[ActiveMonsters[i]];
+		Monster &monster = Monsters[ActiveMonsters[i]];
 		if (monster.mode == MonsterMode::Charge)
 			monster.mode = MonsterMode::Stand;
 	}
@@ -1400,7 +1400,7 @@ void UnstuckChargers()
 void UpdateMonsterLights()
 {
 	for (size_t i = 0; i < ActiveMonsterCount; i++) {
-		auto &monster = Monsters[ActiveMonsters[i]];
+		Monster &monster = Monsters[ActiveMonsters[i]];
 
 		if ((monster.flags & MFLAG_BERSERK) != 0) {
 			int lightRadius = leveltype == DTYPE_NEST ? 9 : 3;