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

Fix keg iexamine with bathtubs #31652

Merged
merged 2 commits into from
Jun 20, 2019
Merged

Conversation

ifreund
Copy link
Contributor

@ifreund ifreund commented Jun 20, 2019

Summary

SUMMARY: Bugfixes "Fix keg iexamine with bathtubs."

Purpose of change

Fixes #31541

Bathtubs don't have the NOITEM flag that iexamine::keg expects, which
causes unexepected things to happen.

Describe the solution

This commit introduces a fake f_no_item furniture to use in a hack
to handle item displacement from the keg tile correctly.

Additional context

It seems the crash on examining while empty of liquid may have been fixed by #31406 already, but there were still issues if there was liquid preset.

Bathtubs don't have the NOITEM flag that iexamine::keg expects, which
causes unexepected things to happen.

This commit introduces a fake `f_no_item` furniture to use in a hack
to handle item displacement from the keg tile correctly.
@ifreund ifreund added [C++] Changes (can be) made in C++. Previously named `Code` Items / Item Actions / Item Qualities Items and how they work and interact <Bugfix> This is a fix for a bug (or closes open issue) Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. labels Jun 20, 2019
src/iexamine.cpp Outdated Show resolved Hide resolved
Co-Authored-By: Anton Burmistrov <Night_Pryanik@mail.ru>
@ZhilkinSerg ZhilkinSerg merged commit 01a7771 into CleverRaven:master Jun 20, 2019
@ifreund ifreund deleted the bathtub-fix branch June 21, 2019 10:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items / Item Actions / Item Qualities Items and how they work and interact
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bathtub causeing game to freeze/crash
3 participants