Skip to content

[Engine] Cleanup Store code#7424

Draft
kphoenix137 wants to merge 20 commits intodiasurgical:masterfrom
kphoenix137:stores-cleanup
Draft

[Engine] Cleanup Store code#7424
kphoenix137 wants to merge 20 commits intodiasurgical:masterfrom
kphoenix137:stores-cleanup

Conversation

@kphoenix137
Copy link
Copy Markdown
Collaborator

No description provided.

@kphoenix137
Copy link
Copy Markdown
Collaborator Author

I think I'll submit a PR separately that changes the variable names found in stores.cpp so this PR is much easier to review.

@AJenbo
Copy link
Copy Markdown
Member

AJenbo commented Sep 19, 2024

I think you should, this one already has conflicts despite being the latest

@AJenbo
Copy link
Copy Markdown
Member

AJenbo commented Sep 20, 2024

Do your self a favor and merge master rather then rebase on it with the commits you have.

@kphoenix137 kphoenix137 force-pushed the stores-cleanup branch 3 times, most recently from 95cd85b to 3e5daee Compare September 26, 2024 21:15
@kphoenix137 kphoenix137 marked this pull request as ready for review October 10, 2024 02:33
Comment thread Source/loadsave.cpp Outdated
Comment thread test/stores_test.cpp Outdated
Comment thread test/stores_test.cpp Outdated
Comment thread Source/stores.h Outdated
Comment thread Source/stores.h Outdated
Comment thread Source/stores.h Outdated
Comment thread Source/items.cpp Outdated
Comment thread Source/items.cpp Outdated
Comment thread Source/stores.cpp Outdated
Comment thread Source/stores.cpp Outdated
Comment thread Source/stores.cpp Outdated
Comment thread Source/stores.cpp

void SetActiveStore(TalkID talkId)
{
OldActiveStore = ActiveStore;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old as in Previous?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sort of. Next and Previous are inverse of each other, while Old is like "Last", but not in the context of being inverse of first. I kept it as Old to prevent confusion with terminology.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Example:

int OldScrollPos;           // Remember last scroll position
int ScrollPos;              // Scroll position
int NextScrollPos;          // Next scroll position
int PreviousScrollPos;      // Previous scroll position```

Comment thread Source/stores.cpp Outdated
Comment thread Source/stores.cpp Outdated
@kphoenix137
Copy link
Copy Markdown
Collaborator Author

kphoenix137 commented Mar 15, 2025

There appears to be a critical issue with selling items. I noticed that sometimes the correct amount of gold is received, and other times the complete wrong amount is received.

EDIT: Fixed!

@AJenbo
Copy link
Copy Markdown
Member

AJenbo commented Mar 15, 2025

4 files have conflicts

@kphoenix137 kphoenix137 changed the title Cleanup Store code [Engine] Cleanup Store code Jan 8, 2026
@kphoenix137 kphoenix137 marked this pull request as draft January 8, 2026 04:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants