Skip to content

[Engine] Stores - Update function names #7847

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 2 commits into
base: master
Choose a base branch
from
+152 −152
Draft

[Engine] Stores - Update function names #7847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af7d8b7
Stores - Update function names
kphoenix137 Mar 15, 2025
280c1a4
Update scrollrt.cpp
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
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
4 changes: 2 additions & 2 deletions Source/loadsave.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ void LoadItem(LoadHelper &file, Item &item)
GetItemFrm(item);
}

void LoadPremium(LoadHelper &file, int i)
void LoadPremiumItems(LoadHelper &file, int i)
{
LoadAndValidateItemData(file, PremiumItems[i]);
}
Expand Down Expand Up @@ -2536,7 +2536,7 @@ tl::expected<void, std::string> LoadGame(bool firstflag)
PremiumItemLevel = file.NextBE<int32_t>();

for (int i = 0; i < giNumberOfSmithPremiumItems; i++)
LoadPremium(file, i);
LoadPremiumItems(file, i);
if (gbIsHellfire && !gbIsHellfireSaveGame)
SpawnPremium(myPlayer);

Expand Down
Loading
Loading