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 game crashes when full butchery #31767

Merged
merged 1 commit into from
Jun 23, 2019
Merged

Fix game crashes when full butchery #31767

merged 1 commit into from
Jun 23, 2019

Conversation

kwl01skz
Copy link
Contributor

@kwl01skz kwl01skz commented Jun 23, 2019

Summary

SUMMARY: Bugfixes "Fix game crashes when full butchery"

Purpose of changeo

Restore a false deletion. It will cause the game to crash when this condition is met.

Closes #31702

Describe the solution

One modification that caused the crash:

Deleted

                                      _( "To perform a full butchery on a corpse this big, you need either a butchering rack or both a long rope in your inventory and a nearby tree to hang the corpse from." ) );
                act.targets.pop_back();

Increased

                                     _( "To perform a full butchery on a corpse this big, you need either a butchering rack, a nearby hanging meathook, or both a long rope in your inventory and a nearby tree to hang the corpse from." ) );

It will cause the game to crash when this condition is met
@kwl01skz kwl01skz changed the title Restore a false deletion, from 4ca7104 Fix game crashes when full butchery Jun 23, 2019
Copy link
Contributor

@ifreund ifreund left a comment

Choose a reason for hiding this comment

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

My bad, thanks for fixing this.

Should close #31702

Edit: Actually looks like a merge error. I blame @ZhilkinSerg :P

@ifreund ifreund added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Mechanics: Character / Player Character / Player mechanics labels Jun 23, 2019
@ZhilkinSerg
Copy link
Contributor

Yes, that was merge error.

@ZhilkinSerg ZhilkinSerg merged commit 0e1e7e8 into CleverRaven:master Jun 23, 2019
@kwl01skz kwl01skz deleted the patch-20 branch July 27, 2019 05:03
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` Mechanics: Character / Player Character / Player mechanics
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Butchering sometimes causes the game to hang
3 participants