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

Add: Houses can accept up to 16 different cargo types via NewGRF #6872

Merged
merged 1 commit into from Jan 21, 2019

Conversation

@nielsmh
Copy link
Contributor

nielsmh commented Jul 30, 2018

New Action0 property 23 for feature 07, variable length, format B n*(B B). Initial byte is number of structures following. First byte in structure is cargo id, second is acceptance level in 1/8 units.

This doesn't affect savegame data, and shouldn't affect backwards compatibility with NewGRFs. Any NewGRF using the new property would not load on older versions without the property, but chance is they also depend on more than 32 cargo types then.

src/house.h Show resolved Hide resolved
src/newgrf.cpp Show resolved Hide resolved
src/table/town_land.h Show resolved Hide resolved
@nielsmh nielsmh force-pushed the nielsmh:housemoreaccepts branch from c6715ee to b06076f Oct 27, 2018
@nielsmh nielsmh force-pushed the nielsmh:housemoreaccepts branch from b06076f to 0f90884 Nov 3, 2018
src/house.h Outdated Show resolved Hide resolved
src/newgrf.cpp Outdated Show resolved Hide resolved
src/newgrf.cpp Show resolved Hide resolved
@TrueBrain

This comment has been minimized.

Copy link
Member

TrueBrain commented Jan 5, 2019

We recently switched from Jenkins as CI to Azure Pipelines as CI. This means you need to rebase before this Pull Request will pass its checks. Sorry for the troubles!

@nielsmh nielsmh force-pushed the nielsmh:housemoreaccepts branch from 0f90884 to 281e88b Jan 5, 2019
Copy link
Member

LordAro left a comment

Code reads fine for me. I agree with @nielsmh wrt uint/CargoID - the numbers are used as array sizes/indices, CargoID doesn't seem appropriate

src/house.h Show resolved Hide resolved
src/house.h Show resolved Hide resolved
src/table/town_land.h Show resolved Hide resolved
src/house.h Outdated Show resolved Hide resolved
@LordAro LordAro removed the needs review label Jan 20, 2019
New Action0 property 23 for feature 07, variable length, format B n*(B B). Initial byte is number of structures following. First byte in structure is cargo id, second is acceptance level in 1/8 units.
@nielsmh nielsmh force-pushed the nielsmh:housemoreaccepts branch from 281e88b to 0911516 Jan 20, 2019
@LordAro LordAro dismissed their stale review Jan 20, 2019

fixed

@nielsmh nielsmh merged commit 48b334c into OpenTTD:master Jan 21, 2019
1 check passed
1 check passed
OpenTTD CI Build #20190120.5 succeeded
Details
@nielsmh nielsmh deleted the nielsmh:housemoreaccepts branch Mar 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.