amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-25 08:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: make ViewportScrollTarget scoped

Browse Source
This commit is contained in:
Rubidium
2026-06-21 18:10:27 +02:00
committed by rubidium42
parent 32f9e4df6c
commit ec727fe440
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/api/script_viewport.cpp
+3 -3
View File
@@ -31,7 +31,7 @@
EnforceDeityMode(false);
EnforcePrecondition(false, ScriptMap::IsValidTile(tile));
return ScriptObject::Command<Commands::ScrollViewport>::Do(tile, VST_EVERYONE, 0);
return ScriptObject::Command<Commands::ScrollViewport>::Do(tile, ViewportScrollTarget::Everyone, 0);
}
/* static */ bool ScriptViewport::ScrollCompanyClientsTo(ScriptCompany::CompanyID company, TileIndex tile)
@@ -42,7 +42,7 @@
company = ScriptCompany::ResolveCompanyID(company);
EnforcePrecondition(false, company != ScriptCompany::COMPANY_INVALID);
return ScriptObject::Command<Commands::ScrollViewport>::Do(tile, VST_COMPANY, ScriptCompany::FromScriptCompanyID(company).base());
return ScriptObject::Command<Commands::ScrollViewport>::Do(tile, ViewportScrollTarget::Company, ScriptCompany::FromScriptCompanyID(company).base());
}
/* static */ bool ScriptViewport::ScrollClientTo(ScriptClient::ClientID client, TileIndex tile)
@@ -54,5 +54,5 @@
client = ScriptClient::ResolveClientID(client);
EnforcePrecondition(false, client != ScriptClient::CLIENT_INVALID);
return ScriptObject::Command<Commands::ScrollViewport>::Do(tile, VST_CLIENT, client);
return ScriptObject::Command<Commands::ScrollViewport>::Do(tile, ViewportScrollTarget::Client, client);
}
src/viewport.cpp
+3 -3
View File
@@ -3645,12 +3645,12 @@ CommandCost CmdScrollViewport(DoCommandFlags flags, TileIndex tile, ViewportScro
{
if (_current_company != OWNER_DEITY) return CMD_ERROR;
switch (target) {
case VST_EVERYONE:
case ViewportScrollTarget::Everyone:
break;
case VST_COMPANY:
case ViewportScrollTarget::Company:
if (_local_company != (CompanyID)ref) return CommandCost();
break;
case VST_CLIENT:
case ViewportScrollTarget::Client:
if (_network_own_client_id != (ClientID)ref) return CommandCost();
break;
default:
src/viewport_type.h
+4 -4
View File
@@ -156,10 +156,10 @@ enum ViewportDragDropSelectionProcess : uint8_t {
/**
* Target of the viewport scrolling GS method
*/
enum ViewportScrollTarget : uint8_t {
VST_EVERYONE, ///< All players
VST_COMPANY, ///< All players in specific company
VST_CLIENT, ///< Single player
enum class ViewportScrollTarget : uint8_t {
Everyone, ///< All players
Company, ///< All players in specific company
Client, ///< Single player
};
#endif /* VIEWPORT_TYPE_H */