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

Change: Use SlErrorCorrupt() on pool index error when loading a savegame, instead of terminating. #7219

Merged
merged 1 commit into from Feb 13, 2019

Conversation

Projects
None yet
2 participants
@PeterN
Copy link
Member

commented Feb 11, 2019

No description provided.

@PeterN

This comment has been minimized.

Copy link
Member Author

commented Feb 11, 2019

Hmm, I may rework this to be just one function that takes varargs.

@PeterN PeterN force-pushed the PeterN:pool-saveload-error branch from c61d7bc to 611426d Feb 11, 2019

Show resolved Hide resolved src/core/pool_func.cpp Outdated
Show resolved Hide resolved src/core/pool_func.cpp Outdated

@PeterN PeterN force-pushed the PeterN:pool-saveload-error branch from 611426d to dce6388 Feb 13, 2019

@PeterN PeterN force-pushed the PeterN:pool-saveload-error branch from dce6388 to fc506c0 Feb 13, 2019

@PeterN

This comment has been minimized.

Copy link
Member Author

commented Feb 13, 2019

Iteration 4... No special PoolBase::Error() function now, just a new SlErrorCorruptFmt() that takes a format string.

@PeterN PeterN merged commit c0c8fb2 into OpenTTD:master Feb 13, 2019

8 checks passed

OpenTTD CI Build #20190213.2 succeeded
Details
OpenTTD CI (Linux commit-checker) Linux commit-checker succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.8) Linux linux-amd64-clang-3.8 succeeded
Details
OpenTTD CI (Linux linux-amd64-gcc-6) Linux linux-amd64-gcc-6 succeeded
Details
OpenTTD CI (Linux linux-i386-gcc-6) Linux linux-i386-gcc-6 succeeded
Details
OpenTTD CI (MacOS) MacOS succeeded
Details
OpenTTD CI (Windows Win32) Windows Win32 succeeded
Details
OpenTTD CI (Windows Win64) Windows Win64 succeeded
Details

@PeterN PeterN deleted the PeterN:pool-saveload-error branch Feb 13, 2019

nielsmh added a commit to nielsmh/OpenTTD that referenced this pull request Mar 11, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.