dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
Remove 'byte' typedef
This commit is contained in:
Jonathan G Rennison
2024-05-07 17:21:50 +01:00
parent f1c0f864f5 6c5a8f55df
commit 18a42664fc
376 changed files with 2220 additions and 2152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/story.cpp
View File

@@ -179,7 +179,7 @@ bool StoryPageButtonData::ValidateColour() const
bool StoryPageButtonData::ValidateFlags() const
{
byte flags = GB(this->referenced_id, 24, 8);
uint8_t flags = GB(this->referenced_id, 24, 8);
/* Don't allow float left and right together */
if ((flags & SPBF_FLOAT_LEFT) && (flags & SPBF_FLOAT_RIGHT)) return false;
/* Don't allow undefined flags */
@@ -196,7 +196,7 @@ bool StoryPageButtonData::ValidateCursor() const
/** Verity that the data stored a valid VehicleType value */
bool StoryPageButtonData::ValidateVehicleType() const
{
byte vehtype = GB(this->referenced_id, 16, 8);
uint8_t vehtype = GB(this->referenced_id, 16, 8);
return vehtype == VEH_INVALID || vehtype < VEH_COMPANY_END;
}