summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2013-11-09 06:52:08 +0000
committerrubidium <rubidium@openttd.org>2013-11-09 06:52:08 +0000
commit85d4f8d65c891b162405b66b0949cf9c5998078f (patch)
tree1326872285097e1e213712efdde64c7bf061c7ef
parent14b8f6e594c8a80c220b58fa8ce7d33d8c509b3f (diff)
downloadopenttd-85d4f8d65c891b162405b66b0949cf9c5998078f.tar.xz
(svn r25959) -Fix: clang warnings; either because type safety was assumed, or because technically the wrong value was tested
-rw-r--r--src/script/api/script_goal.cpp2
-rw-r--r--src/vehiclelist.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/script/api/script_goal.cpp b/src/script/api/script_goal.cpp
index b5d6112fc..56f3628d0 100644
--- a/src/script/api/script_goal.cpp
+++ b/src/script/api/script_goal.cpp
@@ -107,7 +107,7 @@
EnforcePrecondition(false, company == ScriptCompany::COMPANY_INVALID || ScriptCompany::ResolveCompanyID(company) != ScriptCompany::COMPANY_INVALID);
EnforcePrecondition(false, CountBits(buttons) >= 1 && CountBits(buttons) <= 3);
EnforcePrecondition(false, buttons < (1 << ::GOAL_QUESTION_BUTTON_COUNT));
- EnforcePrecondition(false, type < ::GOAL_QUESTION_TYPE_COUNT);
+ EnforcePrecondition(false, (int)type < ::GOAL_QUESTION_TYPE_COUNT);
uint8 c = company;
if (company == ScriptCompany::COMPANY_INVALID) c = INVALID_COMPANY;
diff --git a/src/vehiclelist.cpp b/src/vehiclelist.cpp
index b15f05571..e74f28f0f 100644
--- a/src/vehiclelist.cpp
+++ b/src/vehiclelist.cpp
@@ -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;
}