mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: Make GSGoal.QuestionClient work correctly at least for clients with ID < 2**16

pull/7657/head
dP 2019-05-03 02:50:24 +03:00 committed by Charles Pigott
parent a52bbb72a8
commit 36e4bd4023
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/goal.cpp
View File

@ -236,10 +236,11 @@ CommandCost CmdSetGoalCompleted(TileIndex tile, DoCommandFlag flags, uint32 p1,
* @param flags type of operation * @param flags type of operation
* @param p1 various bitstuffed elements * @param p1 various bitstuffed elements
* - p1 = (bit 0 - 15) - Unique ID to use for this question. * - p1 = (bit 0 - 15) - Unique ID to use for this question.
* - p1 = (bit 16 - 23) - Company or client for which this question is. * - p1 = (bit 16 - 31) - Company or client for which this question is.
* - p1 = (bit 24 - 25) - Question type. * @param p2 various bitstuffed elements
* - p1 = (bit 31) - Question target: 0 - company, 1 - client. * - p2 = (bit 0 - 17) - Buttons of the question.
* @param p2 Buttons of the question. * - p2 = (bit 29 - 30) - Question type.
* - p2 = (bit 31) - Question target: 0 - company, 1 - client.
* @param text Text of the question. * @param text Text of the question.
* @return the cost of this operation or an error * @return the cost of this operation or an error
*/ */
@ -247,29 +248,31 @@ CommandCost CmdGoalQuestion(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
{ {
uint16 uniqueid = (GoalType)GB(p1, 0, 16); uint16 uniqueid = (GoalType)GB(p1, 0, 16);
CompanyID company = (CompanyID)GB(p1, 16, 8); CompanyID company = (CompanyID)GB(p1, 16, 8);
ClientIndex client = (ClientIndex)GB(p1, 16, 8); ClientID client = (ClientID)GB(p1, 16, 16);
byte type = GB(p1, 24, 2);
bool is_client = HasBit(p1, 31); assert_compile(GOAL_QUESTION_BUTTON_COUNT < 29);
uint32 button_mask = GB(p2, 0, GOAL_QUESTION_BUTTON_COUNT);
byte type = GB(p2, 29, 2);
bool is_client = HasBit(p2, 31);
if (_current_company != OWNER_DEITY) return CMD_ERROR; if (_current_company != OWNER_DEITY) return CMD_ERROR;
if (StrEmpty(text)) return CMD_ERROR; if (StrEmpty(text)) return CMD_ERROR;
if (is_client) { if (is_client) {
if (!NetworkClientInfo::IsValidID(client)) return CMD_ERROR; if (NetworkClientInfo::GetByClientID(client) == nullptr) return CMD_ERROR;
} else { } else {
if (company != INVALID_COMPANY && !Company::IsValidID(company)) return CMD_ERROR; if (company != INVALID_COMPANY && !Company::IsValidID(company)) return CMD_ERROR;
} }
if (CountBits(p2) < 1 || CountBits(p2) > 3) return CMD_ERROR; if (CountBits(button_mask) < 1 || CountBits(button_mask) > 3) return CMD_ERROR;
if (p2 >= (1 << GOAL_QUESTION_BUTTON_COUNT)) return CMD_ERROR;
if (type >= GOAL_QUESTION_TYPE_COUNT) return CMD_ERROR; if (type >= GOAL_QUESTION_TYPE_COUNT) return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
if (is_client) { if (is_client) {
if (NetworkClientInfo::Get(client)->client_id != _network_own_client_id) return CommandCost(); if (client != _network_own_client_id) return CommandCost();
} else { } else {
if (company == INVALID_COMPANY && !Company::IsValidID(_local_company)) return CommandCost(); if (company == INVALID_COMPANY && !Company::IsValidID(_local_company)) return CommandCost();
if (company != INVALID_COMPANY && company != _local_company) return CommandCost(); if (company != INVALID_COMPANY && company != _local_company) return CommandCost();
} }
ShowGoalQuestion(uniqueid, type, p2, text); ShowGoalQuestion(uniqueid, type, button_mask, text);
} }
return CommandCost(); return CommandCost();

9
src/script/api/script_goal.cpp
View File

@ -109,7 +109,7 @@
return g != nullptr && g->completed; return g != nullptr && g->completed;
} }
/* static */ bool ScriptGoal::DoQuestion(uint16 uniqueid, uint8 target, bool is_client, Text *question, QuestionType type, int buttons) /* static */ bool ScriptGoal::DoQuestion(uint16 uniqueid, uint32 target, bool is_client, Text *question, QuestionType type, uint32 buttons)
{ {
CCountedPtr<Text> counter(question); CCountedPtr<Text> counter(question);
@ -121,7 +121,7 @@
EnforcePrecondition(false, buttons < (1 << ::GOAL_QUESTION_BUTTON_COUNT)); EnforcePrecondition(false, buttons < (1 << ::GOAL_QUESTION_BUTTON_COUNT));
EnforcePrecondition(false, (int)type < ::GOAL_QUESTION_TYPE_COUNT); EnforcePrecondition(false, (int)type < ::GOAL_QUESTION_TYPE_COUNT);
return ScriptObject::DoCommand(0, uniqueid | (target << 16) | (type << 24) | (is_client ? (1 << 31) : 0), buttons, CMD_GOAL_QUESTION, text); return ScriptObject::DoCommand(0, uniqueid | (target << 16), buttons | (type << 29) | (is_client ? (1 << 31) : 0), CMD_GOAL_QUESTION, text);
} }
/* static */ bool ScriptGoal::Question(uint16 uniqueid, ScriptCompany::CompanyID company, Text *question, QuestionType type, int buttons) /* static */ bool ScriptGoal::Question(uint16 uniqueid, ScriptCompany::CompanyID company, Text *question, QuestionType type, int buttons)
@ -137,8 +137,9 @@
{ {
EnforcePrecondition(false, ScriptGame::IsMultiplayer()); EnforcePrecondition(false, ScriptGame::IsMultiplayer());
EnforcePrecondition(false, ScriptClient::ResolveClientID(client) != ScriptClient::CLIENT_INVALID); EnforcePrecondition(false, ScriptClient::ResolveClientID(client) != ScriptClient::CLIENT_INVALID);
ClientIndex c = NetworkClientInfo::GetByClientID((::ClientID)client)->index; /* Can only send 16 bits of client_id before proper fix is implemented */
return DoQuestion(uniqueid, c, true, question, type, buttons); EnforcePrecondition(false, client < (1 << 16));
return DoQuestion(uniqueid, client, true, question, type, buttons);
} }
/* static */ bool ScriptGoal::CloseQuestion(uint16 uniqueid) /* static */ bool ScriptGoal::CloseQuestion(uint16 uniqueid)

2
src/script/api/script_goal.hpp
View File

@ -211,7 +211,7 @@ protected:
/** /**
* Does common checks and asks the question. * Does common checks and asks the question.
*/ */
static bool DoQuestion(uint16 uniqueid, uint8 target, bool is_client, Text *question, QuestionType type, int buttons); static bool DoQuestion(uint16 uniqueid, uint32 target, bool is_client, Text *question, QuestionType type, uint32 buttons);
}; };
#endif /* SCRIPT_GOAL_HPP */ #endif /* SCRIPT_GOAL_HPP */