diff options
| author | rubidium <rubidium@openttd.org> | 2012-01-21 12:03:55 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2012-01-21 12:03:55 +0000 |
| commit | 9f162e7115031cb42f80db399d63774f479c4125 (patch) | |
| tree | 42ece87142f91c22e55202c1bb4dcdd986554e56 /src/script/api/script_goal.cpp | |
| parent | 70c7fbd90eb0ace75d759725ba4d0085283f152c (diff) | |
| download | openttd-9f162e7115031cb42f80db399d63774f479c4125.tar.xz | |
(svn r23827) -Feature [FS#4992]: [NoGo] Allow to chose the goal question window's title from a (small) set of options
Diffstat (limited to 'src/script/api/script_goal.cpp')
| -rw-r--r-- | src/script/api/script_goal.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/script/api/script_goal.cpp b/src/script/api/script_goal.cpp index 88369cf04..8e9dcbff8 100644 --- a/src/script/api/script_goal.cpp +++ b/src/script/api/script_goal.cpp @@ -51,7 +51,7 @@ return ScriptObject::DoCommand(0, goal_id, 0, CMD_REMOVE_GOAL); } -/* static */ bool ScriptGoal::Question(uint16 uniqueid, ScriptCompany::CompanyID company, Text *question, int buttons) +/* static */ bool ScriptGoal::Question(uint16 uniqueid, ScriptCompany::CompanyID company, Text *question, QuestionType type, int buttons) { CCountedPtr<Text> counter(question); @@ -60,11 +60,13 @@ EnforcePrecondition(false, !StrEmpty(question->GetEncodedText())); 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); uint8 c = company; if (company == ScriptCompany::COMPANY_INVALID) c = INVALID_COMPANY; - return ScriptObject::DoCommand(0, uniqueid | (c << 16), buttons, CMD_GOAL_QUESTION, question->GetEncodedText()); + return ScriptObject::DoCommand(0, uniqueid | (c << 16) | (type << 24), buttons, CMD_GOAL_QUESTION, question->GetEncodedText()); } /* static */ bool ScriptGoal::CloseQuestion(uint16 uniqueid) |