(svn r25959) -Fix: clang warnings; either because type safety was assumed, or because technically the wrong value was tested

This commit is contained in:
rubidium
2013-11-09 06:52:08 +00:00
parent 99910d0d4f
commit 83b8388765
2 changed files with 3 additions and 2 deletions

View File

@@ -21,9 +21,10 @@ uint32 VehicleListIdentifier::Pack()
{
byte c = this->company == OWNER_NONE ? 0xF : (byte)this->company;
assert(c < (1 << 4));
assert(this->type < (1 << 3));
assert(this->vtype < (1 << 2));
assert(this->index < (1 << 20));
assert(this->type < VLT_END);
assert_compile(VLT_END <= (1 << 3));
return c << 28 | this->type << 23 | this->vtype << 26 | this->index;
}