Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Splitting CheckInvPaste() into smaller functions #6984

Merged
merged 13 commits into from
Apr 20, 2024
Merged

Splitting CheckInvPaste() into smaller functions #6984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
107ec7d
Splitting CheckInvPaste() into smaller functions
matheusgomes28 Feb 3, 2024
dbefe87
Splitting CheckInvPaste() into smaller functions
matheusgomes28 Feb 3, 2024
0ef728b
Merge branch 'refactor-check-inventory-paste-func' of github.com:math…
matheusgomes28 Mar 6, 2024
83b548e
removing unecessary comments
matheusgomes28 Mar 6, 2024
7c8a05f
Changing item_id variable name
matheusgomes28 Mar 12, 2024
7ce6256
Apply suggestions from code review
AJenbo Apr 20, 2024
591595e
Update inv.cpp
AJenbo Apr 20, 2024
abf8b84
Update inv.cpp
AJenbo Apr 20, 2024
2a04009
Update Source/inv.cpp
AJenbo Apr 20, 2024
94492ef
Clean up GetPrevItemId()
AJenbo Apr 20, 2024
f2313c9
Fix belt and clean up some names and types
AJenbo Apr 20, 2024
9766770
Init local variable instead of passing it
AJenbo Apr 20, 2024
592c36e
Merge branch 'master' of github.com:diasurgical/devilutionX into refa…
AJenbo Apr 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/control.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
6 changes: 3 additions & 3 deletions Source/controls/plrctrls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ void FindItemOrObject()

continue;
}
auto &item = Items[itemId];
Item &item = Items[itemId];
if (item.isEmpty() || item._iSelFlag == 0) {
continue;
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Source/controls/touch/renderers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions Source/diablo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
Expand Down
Loading
Loading