Implement ChangeCompanyColour game command#1029
Merged
AaronVanGeffen merged 5 commits intoOpenLoco:masterfrom Jul 3, 2021
Merged
Implement ChangeCompanyColour game command#1029AaronVanGeffen merged 5 commits intoOpenLoco:masterfrom
AaronVanGeffen merged 5 commits intoOpenLoco:masterfrom
Conversation
AaronVanGeffen
commented
Jul 3, 2021
| return type() == TClass ? (TType*)this : nullptr; | ||
| } | ||
|
|
||
| uint8_t baseZ() const { return _base_z; } |
Member
Author
There was a problem hiding this comment.
This private TileElement member function was shadowing a public TileElementBase member function.
| // 0x0042F0C1 | ||
| static void updateHeadquartersColourAtTile(const Map::TilePos2& pos, uint8_t zPos, Colour_t newColour) | ||
| { | ||
| auto tile = Map::TileManager::get(pos); |
Contributor
There was a problem hiding this comment.
Really we should be invalidating the screen at each of these tiles. ATM it doesn't matter as we invalidate the whole screen in the vehicle update colour function that is always called before this but it was just a thought i had.
Member
Author
There was a problem hiding this comment.
That's a good point. Currently, this function is only called by the ChangeCompanyColour game command, so it won't be a problem, as you said. Any preference either way?
Contributor
There was a problem hiding this comment.
not really just an observation.
duncanspumpkin
approved these changes
Jul 3, 2021
Co-authored-by: Duncan <duncans_pumpkin@hotmail.co.uk>
a521ad3 to
ea8ca6f
Compare
tomasharkema
added a commit
to tomasharkema/OpenLoco
that referenced
this pull request
Jul 13, 2021
…ature/mac-docker * 'master' of https://github.com/OpenLoco/OpenLoco: (536 commits) Mention code style in readme (OpenLoco#1047) Remove redundant rotate function (OpenLoco#1046) Link up implemented function (OpenLoco#1043) Fix use of constants for coord limits (OpenLoco#1037) validCoords: remove template parameter and name type (OpenLoco#1033) Add coordinate validation to tile loops with offsets (OpenLoco#1031) Implement ChangeCompanyColour game command (OpenLoco#1029) Implement colour picker dropdowns (OpenLoco#1028) Implement StationManager::generateNewStationName (OpenLoco#1020) Station rename command (OpenLoco#984) Fix access to embedded object name (OpenLoco#1022) Reduce inclusion of StringIds.h in header files (OpenLoco#985) Implement the station name background paint (OpenLoco#1023) Force alignment on TileManager::createAnimation hook Merge duplicated flags and use accessors (OpenLoco#1025) Remove use of global stringformatbuffer where not required (OpenLoco#1024) Refactor calls to tryCreateInitialMovementSound (OpenLoco#1018) Turn widget draw functions into Widget struct member functions (OpenLoco#1012) Allow filtering the vehicle list by station or cargo (OpenLoco#997) Restore game command table alignment ...
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Split off from #1028