From eba2ed7130d7f7c1fec03cc9588cca03b2d2d8f7 Mon Sep 17 00:00:00 2001 From: Andrew Chin Date: Sun, 10 Dec 2017 00:19:15 -0500 Subject: [PATCH] Be more consistent with datatype for ability_id fields. Standandize on unsigned 32-bit ints --- s2clientprotocol/common.proto | 2 +- s2clientprotocol/query.proto | 2 +- s2clientprotocol/raw.proto | 4 ++-- s2clientprotocol/spatial.proto | 2 +- s2clientprotocol/ui.proto | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/s2clientprotocol/common.proto b/s2clientprotocol/common.proto index 081f306..928c5fb 100644 --- a/s2clientprotocol/common.proto +++ b/s2clientprotocol/common.proto @@ -4,7 +4,7 @@ syntax = "proto2"; package SC2APIProtocol; message AvailableAbility { - optional int32 ability_id = 1; + optional uint32 ability_id = 1; optional bool requires_point = 2; } diff --git a/s2clientprotocol/query.proto b/s2clientprotocol/query.proto index c4270f6..3be398e 100644 --- a/s2clientprotocol/query.proto +++ b/s2clientprotocol/query.proto @@ -45,7 +45,7 @@ message ResponseQueryAvailableAbilities { //-------------------------------------------------------------------------------------------------- message RequestQueryBuildingPlacement { - optional int32 ability_id = 1; + optional uint32 ability_id = 1; optional Point2D target_pos = 2; optional uint64 placing_unit_tag = 3; // Not required } diff --git a/s2clientprotocol/raw.proto b/s2clientprotocol/raw.proto index 47e2da7..3bfb099 100644 --- a/s2clientprotocol/raw.proto +++ b/s2clientprotocol/raw.proto @@ -158,7 +158,7 @@ message ActionRaw { } message ActionRawUnitCommand { - optional int32 ability_id = 1; + optional uint32 ability_id = 1; oneof target { Point2D target_world_space_pos = 2; uint64 target_unit_tag = 3; @@ -172,6 +172,6 @@ message ActionRawCameraMove { } message ActionRawToggleAutocast { - optional int32 ability_id = 1; + optional uint32 ability_id = 1; repeated uint64 unit_tags = 2; } diff --git a/s2clientprotocol/spatial.proto b/s2clientprotocol/spatial.proto index cb58450..47dffa7 100644 --- a/s2clientprotocol/spatial.proto +++ b/s2clientprotocol/spatial.proto @@ -72,7 +72,7 @@ message ActionSpatial { } message ActionSpatialUnitCommand { - optional int32 ability_id = 1; + optional uint32 ability_id = 1; oneof target { PointI target_screen_coord = 2; PointI target_minimap_coord = 3; diff --git a/s2clientprotocol/ui.proto b/s2clientprotocol/ui.proto index 28212e7..9794738 100644 --- a/s2clientprotocol/ui.proto +++ b/s2clientprotocol/ui.proto @@ -127,5 +127,5 @@ message ActionProductionPanelRemoveFromQueue { } message ActionToggleAutocast { - optional int32 ability_id = 1; + optional uint32 ability_id = 1; }