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

Jump to bottom

Change: Allow AI companies to start immediately. #7151

Merged

PeterN merged 1 commit into OpenTTD:master from SamuXarick:start_date-=-0

Feb 2, 2019

Contributor

SamuXarick commented Jan 31, 2019 •

edited

Allow multiple AIs to possibly start in the same tick.
start_date = 0 becomes a special case, where random deviation does not occur.
If start_date was not already 0, then a minimum value of 1 must apply.

PeterN reviewed

View reviewed changes

src/company_cmd.cpp Show resolved Hide resolved

PeterN reviewed

View reviewed changes

src/script/script_config.cpp Outdated Show resolved Hide resolved

PeterN reviewed

View reviewed changes

src/company_cmd.cpp Show resolved Hide resolved

SamuXarick force-pushed the start_date-=-0 branch from e373e78 to e773c3b Compare

January 31, 2019 16:09

glx22 reviewed

View reviewed changes

Contributor

glx22 left a comment

ScriptConfig::AddRandomDeviation() could be simpler, just assume "start_date" exists only for AIs, and if it's 0 then don't add random to it

src/ai/ai_gui.cpp Outdated Show resolved Hide resolved

SamuXarick force-pushed the start_date-=-0 branch from e773c3b to 941f932 Compare

January 31, 2019 18:40

PeterN reviewed

View reviewed changes

src/ai/ai_config.cpp Outdated Show resolved Hide resolved

SamuXarick force-pushed the start_date-=-0 branch from 941f932 to ba617cf Compare

January 31, 2019 19:07

PeterN reviewed

View reviewed changes

src/ai/ai_config.cpp Outdated Show resolved Hide resolved

SamuXarick changed the title ~~Codechange: Allow AI companies start_date to be 0~~ Change: Allow AI companies to start immediately.

SamuXarick force-pushed the start_date-=-0 branch 2 times, most recently from 1539a46 to 7069060 Compare

February 1, 2019 14:39

PeterN reviewed

View reviewed changes

src/company_cmd.cpp Outdated Show resolved Hide resolved


          Change: Allow AI companies to start immediately.

e4fa330

Allow multiple AIs to possibly start in the same tick.
start_date = 0 becomes a special case, where random deviation does not occur.
If start_date was not already 0, then a minimum value of 1 must apply.

SamuXarick force-pushed the start_date-=-0 branch from 7069060 to e4fa330 Compare

February 1, 2019 17:04

PeterN approved these changes

View reviewed changes

PeterN merged commit 011257d into OpenTTD:master

SamuXarick deleted the start_date-=-0 branch

February 3, 2019 23:41

PeterN added a commit to PeterN/OpenTTD that referenced this pull request


          Fix OpenTTD#7151: Hang when starting AIs in multiplayer with shift pr…

b2e3e71

…essed.

PeterN added a commit to PeterN/OpenTTD that referenced this pull request


          Fix OpenTTD#7151: Hang when starting AIs in multiplayer with shift pr…

7a80b0c

…essed.

PeterN added a commit to PeterN/OpenTTD that referenced this pull request


          Fix OpenTTD#7151: Hang when concurrently starting AIs in multiplayer,…

728f4ea

… or with shift pressed.

PeterN added a commit to PeterN/OpenTTD that referenced this pull request


          Fix OpenTTD#7151: Hang when concurrently starting AIs in multiplayer,…

01d1d6d

… or with shift pressed.

nielsmh pushed a commit that referenced this pull request


          Fix #7151: Hang when concurrently starting AIs in multiplayer, or wit…

b1e40b6

…h shift pressed.

PeterN added a commit that referenced this pull request


          Fix #7151: AI start date deviation was still applied when not set to …

aa73771

…a random AI. (#7223)

nielsmh pushed a commit to nielsmh/OpenTTD that referenced this pull request


          Fix OpenTTD#7151: Hang when concurrently starting AIs in multiplayer,…

0740c3c

… or with shift pressed.

nielsmh pushed a commit to nielsmh/OpenTTD that referenced this pull request


          Fix OpenTTD#7151: AI start date deviation was still applied when not …

cb5187b

…set to a random AI. (OpenTTD#7223)

TrueBrain added a commit to TrueBrain/OpenTTD that referenced this pull request


          Revert: "Fix OpenTTD#7151: Hang when concurrently starting AIs in mul…

33bec1f

…tiplayer, or with shift pressed."

This reverts commit b1e40b6.

This is a fix for a patch that will be reverted in the next commit.

TrueBrain added a commit that referenced this pull request


          Revert: "Fix #7151: Hang when concurrently starting AIs in multiplaye…

7a9782e

…r, or with shift pressed."

This reverts commit b1e40b6.

This is a fix for a patch that will be reverted in the next commit.

douiwby pushed a commit to douiwby/OpenTTD that referenced this pull request


          Fix OpenTTD#7151: Hang when concurrently starting AIs in multiplayer,…

1a10cdb

… or with shift pressed.

douiwby pushed a commit to douiwby/OpenTTD that referenced this pull request


          Fix OpenTTD#7151: AI start date deviation was still applied when not …

39f9c36

…set to a random AI. (OpenTTD#7223)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment