cpp/openttd-patchpack/source Changeset - r20912:595943d1a598

Changeset - r20912:595943d1a598

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 11 years ago 2013-11-09 06:52:08
rubidium@openttd.org

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

2 files changed with 3 insertions and 2 deletions:

src/script/api/script_goal.cpp

src/vehiclelist.cpp

0 comments (0 inline, 0 general)

src/script/api/script_goal.cpp

➞

Show inline comments

@@ @@ -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;

src/vehiclelist.cpp

➞

Show inline comments

@@ @@ -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;
+}

0 comments (0 inline, 0 general)