Codechange: Simplify drawing of timetables #10687
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PeterN
reviewed
Apr 21, 2023
src/strings.cpp
Outdated
| @@ -1618,6 +1618,12 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg | |||
| break; | |||
| } | |||
|
|
|||
| case SCC_COLOUR: { // {COLOUR} | |||
| StringControlCode scc = (StringControlCode)(SCC_BLUE + args->GetInt32(SCC_COLOUR)); | |||
| if (IsInsideMM(scc, SCC_BLUE, SCC_COLOUR) && (buff + Utf8CharLen(scc) < last)) buff += Utf8Encode(buff, scc); | |||
There was a problem hiding this comment.
This relies on SCC_COLOUR being placed after SCC_BLACK. May be better as SCC_BLACK + 1? Though this does all rely on the colours being in specific order in the first place, so may not matter.
|
It's ready, but I keep it as draft because it depends on OpenTTD/eints#142 |
2TallTyler
approved these changes
Jun 15, 2023
nielsmh
reviewed
Jun 20, 2023
| @@ -1627,6 +1627,12 @@ static void FormatString(StringBuilder &builder, const char *str_arg, StringPara | |||
| break; | |||
| } | |||
|
|
|||
| case SCC_COLOUR: { // {COLOUR} | |||
| StringControlCode scc = (StringControlCode)(SCC_BLUE + args.GetInt32(SCC_COLOUR)); | |||
There was a problem hiding this comment.
I'm getting a compile error on this line after the merge.
C:\Users\nielsm\Dev\OpenTTD\src\strings.cpp(1628): error C2660: 'StringParameters::GetInt32': function does not take 1 arguments
C:\Users\nielsm\Dev\OpenTTD\src\strings_internal.h(91): note: see declaration of 'StringParameters::GetInt32'
C:\Users\nielsm\Dev\OpenTTD\src\strings.cpp(1628): note: while trying to match the argument list '(StringControlCode)'
As far as I can tell, StringParameters::GetInt32() has never existed in a version that takes a parameter.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation / Problem
Each timetable departure/arrival time is drawn using 2 strings, the abbreviation and the time.
Description
Introduce
{COLOUR}control code and use it to merge abbreviation and time into a single string.Limitations
EINTS needs to be updated.
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.