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.

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

inventory: fix Lara not saying "no" when using Scion #1286

Merged
merged 2 commits into from
Apr 9, 2024

Conversation

walkawayy
Copy link
Collaborator

Resolves #1278.

Checklist

  • I have read the coding conventions
  • I have added a changelog entry about what my pull request accomplishes, or it is an internal change

Description

Fixed Lara not saying "no" when using the Scion incorrectly. She will now say "no" when using the Scion on nothing, keyholes, puzzle holes, and Midas hands.

@walkawayy walkawayy added OG bug A bug in original game Enhancement Improvement of an existing feature labels Apr 9, 2024
@walkawayy walkawayy requested review from rr- and lahm86 April 9, 2024 01:52
@walkawayy walkawayy self-assigned this Apr 9, 2024
Copy link
Collaborator

@lahm86 lahm86 left a comment

Choose a reason for hiding this comment

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

LGTM.

One thing I spotted, which I missed in #1267, is that there is a redundant assignment in the receptacle checks in lara.c. Line 428 isn't needed.

ITEM_INFO *item = &g_Items[receptacle_item_number];

May be worth removing as part of this as it's still a related issue.

@walkawayy walkawayy requested a review from lahm86 April 9, 2024 13:09
@walkawayy walkawayy merged commit 58c4cf4 into LostArtefacts:develop Apr 9, 2024
1 check passed
@walkawayy walkawayy added this to the 4.0 milestone Apr 9, 2024
@walkawayy walkawayy deleted the scion-says-no branch July 25, 2024 20:26
@rr- rr- added the TR1 label Oct 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement Improvement of an existing feature OG bug A bug in original game TR1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Lara doesn't say "no" when using the Scion incorrectly
3 participants