-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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.
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
Fix usage items under player #4758
Open
ArturKnopik
wants to merge
2
commits into
otland:master
Choose a base branch
from
ArturKnopik:fixUsageItemsUnderPlayer
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
EPuncker
requested review from
DSpeichert,
ranisalt,
EvilHero90,
nekiro and
MillhioreBT
June 21, 2024 16:28
correct, original diff (private repo): diff --git a/src/tile.cpp b/src/tile.cpp
index b748de0c2..5b42a8b8e 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -1606,12 +1606,31 @@ bool Tile::isMoveableBlocking() const
Item* Tile::getUseItem(int32_t index) const
{
const TileItemVector* items = getItemList();
+
+ // no items, get ground
if (!items || items->size() == 0) {
return ground;
}
+ // try getting thing by index
if (Thing* thing = getThing(index)) {
- return thing->getItem();
+ Item* thingItem = thing->getItem();
+ if (thingItem) {
+ return thingItem;
+ }
+ }
+
+ // try getting top usable item
+ Item* topDownItem = getTopDownItem();
+ if (topDownItem) {
+ return topDownItem;
+ }
+
+ // try getting door
+ for (auto it = items->rbegin(), end = items->rend(); it != end; ++it) {
+ if ((*it)->getDoor()) {
+ return (*it)->getDoor();
+ }
}
return nullptr; |
ranisalt
approved these changes
Jun 23, 2024
EPuncker
approved these changes
Jun 23, 2024
Zbizu
suggested changes
Jun 25, 2024
if (Thing* thing = getThing(index)) { | ||
Item* thingItem = thing->getItem(); | ||
if (thingItem) { | ||
return thingItem; | ||
} | ||
} | ||
|
||
// try getting top usable item |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
top movable*
} | ||
} | ||
|
||
return *items->begin(); | ||
return nullptr; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs to stay. It returns top immovable item (eg. field or splash)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Prelude
Changes Proposed
Fix usage items under player
closes #4001
How to test
Code author: @Zbizu