petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Codechange: Rename INVALID_CARGO to INVALID_CARGO_BITNUM

Browse Source 
... to avoid future ambiguity.
This commit is contained in:
Peter Nelson
2023-05-23 08:35:47 +01:00
committed by PeterN
parent 9d1b131c44
commit 14bcfff6f5
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cargotype.h
View File

@@ -50,11 +50,11 @@ enum CargoClass {
CC_SPECIAL = 1 << 15, ///< Special bit used for livery refit tricks instead of normal cargoes.
};
static const byte INVALID_CARGO = 0xFF; ///< Constant representing invalid cargo
static const byte INVALID_CARGO_BITNUM = 0xFF; ///< Constant representing invalid cargo
/** Specification of a cargo type. */
struct CargoSpec {
uint8_t bitnum; ///< Cargo bit number, is #INVALID_CARGO for a non-used spec.
uint8_t bitnum; ///< Cargo bit number, is #INVALID_CARGO_BITNUM for a non-used spec.
CargoLabel label; ///< Unique label of the cargo type.
uint8_t legend_colour;
uint8_t rating_colour;
@@ -97,7 +97,7 @@ struct CargoSpec {
*/
inline bool IsValid() const
{
return this->bitnum != INVALID_CARGO;
return this->bitnum != INVALID_CARGO_BITNUM;
}
/**