Skip to content

[Engine] Cleanup Store code #7424

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

Draft
kphoenix137 wants to merge 20 commits into
base: master
Choose a base branch
from
Draft

[Engine] Cleanup Store code #7424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
75b74d4
Cleanup stores
kphoenix137 Sep 17, 2024
94bbde0
Add missing include
kphoenix137 Oct 10, 2024
9fa94c8
Write item count to save file
kphoenix137 Oct 10, 2024
ad698ae
Safeguard LoadPremiumItems
kphoenix137 Mar 15, 2025
a43be15
Fix function comment
kphoenix137 Mar 15, 2025
4ed7925
Fix test
kphoenix137 Mar 15, 2025
8c35e87
Fix function declaration comments
kphoenix137 Mar 15, 2025
7dab7d9
Fix comments
kphoenix137 Mar 15, 2025
681bade
convert local variable to auto
kphoenix137 Mar 15, 2025
c10171b
Address some FIXMEs
kphoenix137 Mar 15, 2025
ca79106
Fix Sell Item bug
kphoenix137 Mar 15, 2025
1f3573f
Remove FIXME
kphoenix137 Mar 15, 2025
3126a88
Fix string handling for translations
kphoenix137 Mar 15, 2025
5a61bef
Apply suggestion
kphoenix137 Mar 15, 2025
4529071
Apply suggestion (const)
kphoenix137 Mar 15, 2025
a772976
Fix rebase issues
kphoenix137 Mar 15, 2025
ba31e14
Fix missing towner name in Gossip
kphoenix137 Mar 15, 2025
4142caf
Clang
kphoenix137 Mar 15, 2025
d656725
Fix test
kphoenix137 Mar 15, 2025
58f0b48
TalkID::Exit to None
kphoenix137 Mar 15, 2025
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/controls/touch/event_handlers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ bool HandleStoreInteraction(const SDL_Event &event)
if (!IsPlayerInStore())
return false;
if (event.type == SDL_FINGERDOWN)
CheckStoreBtn();
CheckStoreButton();
return true;
}

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 @@ -348,7 +348,7 @@ void LeftMouseDown(uint16_t modState)
}

if (IsPlayerInStore()) {
CheckStoreBtn();
CheckStoreButton();
return;
}

Expand Down Expand Up @@ -412,7 +412,7 @@ void LeftMouseUp(uint16_t modState)
if (LevelButtonDown)
CheckLevelButtonUp();
if (IsPlayerInStore())
ReleaseStoreBtn();
ReleaseStoreButton();
}

void RightMouseDown(bool isShiftHeld)
Expand Down
2 changes: 1 addition & 1 deletion Source/engine/render/scrollrt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@ void DrawView(const Surface &out, Point startPosition)
DrawFloatingNumbers(out, startPosition, offset);

if (IsPlayerInStore() && !qtextflag)
DrawSText(out);
DrawStore(out);
if (invflag) {
DrawInv(out);
} else if (SpellbookFlag) {
Expand Down
Loading