From c12d94dec2044f5ae1f3f1d8c954b31938c4e713 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Wed, 24 Jul 2013 00:29:09 -0400 Subject: [PATCH] Updated protos. --- .../protobuf/dota_clientmessage_helpers.cpp | 1 + .../dota/protobuf/dota_clientmessages.pb.cc | 300 +++++++++++++++++- .../dota/protobuf/dota_clientmessages.pb.h | 146 ++++++++- .../dota/protobuf/dota_clientmessages.proto | 7 + .../dota/protobuf/dota_commonmessages.pb.cc | 107 ++++++- .../dota/protobuf/dota_commonmessages.pb.h | 63 +++- .../dota/protobuf/dota_commonmessages.proto | 59 ++++ 7 files changed, 661 insertions(+), 22 deletions(-) diff --git a/public/game/shared/dota/protobuf/dota_clientmessage_helpers.cpp b/public/game/shared/dota/protobuf/dota_clientmessage_helpers.cpp index ad44e9fa..73ccb735 100644 --- a/public/game/shared/dota/protobuf/dota_clientmessage_helpers.cpp +++ b/public/game/shared/dota/protobuf/dota_clientmessage_helpers.cpp @@ -31,6 +31,7 @@ CDotaClientMessageHelpers::CDotaClientMessageHelpers() SETUP_DOTA_MESSAGE( ItemAlert ); SETUP_DOTA_MESSAGE( ChatWheel ); SETUP_DOTA_MESSAGE( SendStatPopup ); + SETUP_DOTA_MESSAGE( BeginLastHitChallenge ); } const google::protobuf::Message *CDotaClientMessageHelpers::GetPrototype( int index ) const diff --git a/public/game/shared/dota/protobuf/dota_clientmessages.pb.cc b/public/game/shared/dota/protobuf/dota_clientmessages.pb.cc index 22b99000..f9e0e92b 100644 --- a/public/game/shared/dota/protobuf/dota_clientmessages.pb.cc +++ b/public/game/shared/dota/protobuf/dota_clientmessages.pb.cc @@ -66,6 +66,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection* const ::google::protobuf::Descriptor* CDOTAClientMsg_SendStatPopup_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* CDOTAClientMsg_SendStatPopup_reflection_ = NULL; +const ::google::protobuf::Descriptor* CDOTAClientMsg_BeginLastHitChallenge_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + CDOTAClientMsg_BeginLastHitChallenge_reflection_ = NULL; const ::google::protobuf::EnumDescriptor* EDotaClientMessages_descriptor_ = NULL; } // namespace @@ -332,6 +335,22 @@ void protobuf_AssignDesc_dota_5fclientmessages_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(CDOTAClientMsg_SendStatPopup)); + CDOTAClientMsg_BeginLastHitChallenge_descriptor_ = file->message_type(17); + static const int CDOTAClientMsg_BeginLastHitChallenge_offsets_[2] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CDOTAClientMsg_BeginLastHitChallenge, chosen_lane_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CDOTAClientMsg_BeginLastHitChallenge, helper_enabled_), + }; + CDOTAClientMsg_BeginLastHitChallenge_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + CDOTAClientMsg_BeginLastHitChallenge_descriptor_, + CDOTAClientMsg_BeginLastHitChallenge::default_instance_, + CDOTAClientMsg_BeginLastHitChallenge_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CDOTAClientMsg_BeginLastHitChallenge, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CDOTAClientMsg_BeginLastHitChallenge, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(CDOTAClientMsg_BeginLastHitChallenge)); EDotaClientMessages_descriptor_ = file->enum_type(0); } @@ -379,6 +398,8 @@ void protobuf_RegisterTypes(const ::std::string&) { CDOTAClientMsg_ChatWheel_descriptor_, &CDOTAClientMsg_ChatWheel::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( CDOTAClientMsg_SendStatPopup_descriptor_, &CDOTAClientMsg_SendStatPopup::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + CDOTAClientMsg_BeginLastHitChallenge_descriptor_, &CDOTAClientMsg_BeginLastHitChallenge::default_instance()); } } // namespace @@ -418,6 +439,8 @@ void protobuf_ShutdownFile_dota_5fclientmessages_2eproto() { delete CDOTAClientMsg_ChatWheel_reflection_; delete CDOTAClientMsg_SendStatPopup::default_instance_; delete CDOTAClientMsg_SendStatPopup_reflection_; + delete CDOTAClientMsg_BeginLastHitChallenge::default_instance_; + delete CDOTAClientMsg_BeginLastHitChallenge_reflection_; } void protobuf_AddDesc_dota_5fclientmessages_2eproto() { @@ -456,19 +479,22 @@ void protobuf_AddDesc_dota_5fclientmessages_2eproto() { "TAClientMsg_ChatWheel\022;\n\014chat_message\030\001 " "\001(\0162\026.EDOTAChatWheelMessage:\rk_EDOTA_CW_" "Ok\"J\n\034CDOTAClientMsg_SendStatPopup\022*\n\tst" - "atpopup\030\001 \001(\0132\027.CDOTAMsg_SendStatPopup*\301" - "\003\n\023EDotaClientMessages\022\023\n\017DOTA_CM_MapLin" - "e\020\001\022\027\n\023DOTA_CM_AspectRatio\020\002\022\023\n\017DOTA_CM_" - "MapPing\020\003\022\033\n\027DOTA_CM_UnitsAutoAttack\020\004\022\035" - "\n\031DOTA_CM_AutoPurchaseItems\020\005\022\025\n\021DOTA_CM" - "_TestItems\020\006\022\030\n\024DOTA_CM_SearchString\020\007\022\021" - "\n\rDOTA_CM_Pause\020\010\022\030\n\024DOTA_CM_ShopViewMod" - "e\020\t\022\034\n\030DOTA_CM_SetUnitShareFlag\020\n\022\027\n\023DOT" - "A_CM_SwapRequest\020\013\022\026\n\022DOTA_CM_SwapAccept" - "\020\014\022\025\n\021DOTA_CM_WorldLine\020\r\022\036\n\032DOTA_CM_Req" - "uestGraphUpdate\020\016\022\025\n\021DOTA_CM_ItemAlert\020\017" - "\022\025\n\021DOTA_CM_ChatWheel\020\020\022\031\n\025DOTA_CM_SendS" - "tatPopup\020\021B\005H\001\200\001\000", 1537); + "atpopup\030\001 \001(\0132\027.CDOTAMsg_SendStatPopup\"S" + "\n$CDOTAClientMsg_BeginLastHitChallenge\022\023" + "\n\013chosen_lane\030\001 \001(\r\022\026\n\016helper_enabled\030\002 " + "\001(\010*\344\003\n\023EDotaClientMessages\022\023\n\017DOTA_CM_M" + "apLine\020\001\022\027\n\023DOTA_CM_AspectRatio\020\002\022\023\n\017DOT" + "A_CM_MapPing\020\003\022\033\n\027DOTA_CM_UnitsAutoAttac" + "k\020\004\022\035\n\031DOTA_CM_AutoPurchaseItems\020\005\022\025\n\021DO" + "TA_CM_TestItems\020\006\022\030\n\024DOTA_CM_SearchStrin" + "g\020\007\022\021\n\rDOTA_CM_Pause\020\010\022\030\n\024DOTA_CM_ShopVi" + "ewMode\020\t\022\034\n\030DOTA_CM_SetUnitShareFlag\020\n\022\027" + "\n\023DOTA_CM_SwapRequest\020\013\022\026\n\022DOTA_CM_SwapA" + "ccept\020\014\022\025\n\021DOTA_CM_WorldLine\020\r\022\036\n\032DOTA_C" + "M_RequestGraphUpdate\020\016\022\025\n\021DOTA_CM_ItemAl" + "ert\020\017\022\025\n\021DOTA_CM_ChatWheel\020\020\022\031\n\025DOTA_CM_" + "SendStatPopup\020\021\022!\n\035DOTA_CM_BeginLastHitC" + "hallenge\020\022B\005H\001\200\001\000", 1657); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "dota_clientmessages.proto", &protobuf_RegisterTypes); CDOTAClientMsg_MapPing::default_instance_ = new CDOTAClientMsg_MapPing(); @@ -488,6 +514,7 @@ void protobuf_AddDesc_dota_5fclientmessages_2eproto() { CDOTAClientMsg_RequestGraphUpdate::default_instance_ = new CDOTAClientMsg_RequestGraphUpdate(); CDOTAClientMsg_ChatWheel::default_instance_ = new CDOTAClientMsg_ChatWheel(); CDOTAClientMsg_SendStatPopup::default_instance_ = new CDOTAClientMsg_SendStatPopup(); + CDOTAClientMsg_BeginLastHitChallenge::default_instance_ = new CDOTAClientMsg_BeginLastHitChallenge(); CDOTAClientMsg_MapPing::default_instance_->InitAsDefaultInstance(); CDOTAClientMsg_ItemAlert::default_instance_->InitAsDefaultInstance(); CDOTAClientMsg_MapLine::default_instance_->InitAsDefaultInstance(); @@ -505,6 +532,7 @@ void protobuf_AddDesc_dota_5fclientmessages_2eproto() { CDOTAClientMsg_RequestGraphUpdate::default_instance_->InitAsDefaultInstance(); CDOTAClientMsg_ChatWheel::default_instance_->InitAsDefaultInstance(); CDOTAClientMsg_SendStatPopup::default_instance_->InitAsDefaultInstance(); + CDOTAClientMsg_BeginLastHitChallenge::default_instance_->InitAsDefaultInstance(); ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_dota_5fclientmessages_2eproto); } @@ -538,6 +566,7 @@ bool EDotaClientMessages_IsValid(int value) { case 15: case 16: case 17: + case 18: return true; default: return false; @@ -4097,6 +4126,251 @@ void CDOTAClientMsg_SendStatPopup::Swap(CDOTAClientMsg_SendStatPopup* other) { } +// =================================================================== + +#ifndef _MSC_VER +const int CDOTAClientMsg_BeginLastHitChallenge::kChosenLaneFieldNumber; +const int CDOTAClientMsg_BeginLastHitChallenge::kHelperEnabledFieldNumber; +#endif // !_MSC_VER + +CDOTAClientMsg_BeginLastHitChallenge::CDOTAClientMsg_BeginLastHitChallenge() + : ::google::protobuf::Message() { + SharedCtor(); +} + +void CDOTAClientMsg_BeginLastHitChallenge::InitAsDefaultInstance() { +} + +CDOTAClientMsg_BeginLastHitChallenge::CDOTAClientMsg_BeginLastHitChallenge(const CDOTAClientMsg_BeginLastHitChallenge& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); +} + +void CDOTAClientMsg_BeginLastHitChallenge::SharedCtor() { + _cached_size_ = 0; + chosen_lane_ = 0u; + helper_enabled_ = false; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +CDOTAClientMsg_BeginLastHitChallenge::~CDOTAClientMsg_BeginLastHitChallenge() { + SharedDtor(); +} + +void CDOTAClientMsg_BeginLastHitChallenge::SharedDtor() { + if (this != default_instance_) { + } +} + +void CDOTAClientMsg_BeginLastHitChallenge::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* CDOTAClientMsg_BeginLastHitChallenge::descriptor() { + protobuf_AssignDescriptorsOnce(); + return CDOTAClientMsg_BeginLastHitChallenge_descriptor_; +} + +const CDOTAClientMsg_BeginLastHitChallenge& CDOTAClientMsg_BeginLastHitChallenge::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_dota_5fclientmessages_2eproto(); return *default_instance_; +} + +CDOTAClientMsg_BeginLastHitChallenge* CDOTAClientMsg_BeginLastHitChallenge::default_instance_ = NULL; + +CDOTAClientMsg_BeginLastHitChallenge* CDOTAClientMsg_BeginLastHitChallenge::New() const { + return new CDOTAClientMsg_BeginLastHitChallenge; +} + +void CDOTAClientMsg_BeginLastHitChallenge::Clear() { + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + chosen_lane_ = 0u; + helper_enabled_ = false; + } + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool CDOTAClientMsg_BeginLastHitChallenge::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false + ::google::protobuf::uint32 tag; + while ((tag = input->ReadTag()) != 0) { + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // optional uint32 chosen_lane = 1; + case 1: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( + input, &chosen_lane_))); + set_has_chosen_lane(); + } else { + goto handle_uninterpreted; + } + if (input->ExpectTag(16)) goto parse_helper_enabled; + break; + } + + // optional bool helper_enabled = 2; + case 2: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { + parse_helper_enabled: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &helper_enabled_))); + set_has_helper_enabled(); + } else { + goto handle_uninterpreted; + } + if (input->ExpectAtEnd()) return true; + break; + } + + default: { + handle_uninterpreted: + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + return true; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } + return true; +#undef DO_ +} + +void CDOTAClientMsg_BeginLastHitChallenge::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // optional uint32 chosen_lane = 1; + if (has_chosen_lane()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->chosen_lane(), output); + } + + // optional bool helper_enabled = 2; + if (has_helper_enabled()) { + ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->helper_enabled(), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } +} + +::google::protobuf::uint8* CDOTAClientMsg_BeginLastHitChallenge::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // optional uint32 chosen_lane = 1; + if (has_chosen_lane()) { + target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->chosen_lane(), target); + } + + // optional bool helper_enabled = 2; + if (has_helper_enabled()) { + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->helper_enabled(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + return target; +} + +int CDOTAClientMsg_BeginLastHitChallenge::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // optional uint32 chosen_lane = 1; + if (has_chosen_lane()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt32Size( + this->chosen_lane()); + } + + // optional bool helper_enabled = 2; + if (has_helper_enabled()) { + total_size += 1 + 1; + } + + } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void CDOTAClientMsg_BeginLastHitChallenge::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const CDOTAClientMsg_BeginLastHitChallenge* source = + ::google::protobuf::internal::dynamic_cast_if_available( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void CDOTAClientMsg_BeginLastHitChallenge::MergeFrom(const CDOTAClientMsg_BeginLastHitChallenge& from) { + GOOGLE_CHECK_NE(&from, this); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_chosen_lane()) { + set_chosen_lane(from.chosen_lane()); + } + if (from.has_helper_enabled()) { + set_helper_enabled(from.helper_enabled()); + } + } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void CDOTAClientMsg_BeginLastHitChallenge::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void CDOTAClientMsg_BeginLastHitChallenge::CopyFrom(const CDOTAClientMsg_BeginLastHitChallenge& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool CDOTAClientMsg_BeginLastHitChallenge::IsInitialized() const { + + return true; +} + +void CDOTAClientMsg_BeginLastHitChallenge::Swap(CDOTAClientMsg_BeginLastHitChallenge* other) { + if (other != this) { + std::swap(chosen_lane_, other->chosen_lane_); + std::swap(helper_enabled_, other->helper_enabled_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata CDOTAClientMsg_BeginLastHitChallenge::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = CDOTAClientMsg_BeginLastHitChallenge_descriptor_; + metadata.reflection = CDOTAClientMsg_BeginLastHitChallenge_reflection_; + return metadata; +} + + // @@protoc_insertion_point(namespace_scope) // @@protoc_insertion_point(global_scope) diff --git a/public/game/shared/dota/protobuf/dota_clientmessages.pb.h b/public/game/shared/dota/protobuf/dota_clientmessages.pb.h index 697a6f7a..5dfe1930 100644 --- a/public/game/shared/dota/protobuf/dota_clientmessages.pb.h +++ b/public/game/shared/dota/protobuf/dota_clientmessages.pb.h @@ -50,6 +50,7 @@ class CDOTAClientMsg_WorldLine; class CDOTAClientMsg_RequestGraphUpdate; class CDOTAClientMsg_ChatWheel; class CDOTAClientMsg_SendStatPopup; +class CDOTAClientMsg_BeginLastHitChallenge; enum EDotaClientMessages { DOTA_CM_MapLine = 1, @@ -68,11 +69,12 @@ enum EDotaClientMessages { DOTA_CM_RequestGraphUpdate = 14, DOTA_CM_ItemAlert = 15, DOTA_CM_ChatWheel = 16, - DOTA_CM_SendStatPopup = 17 + DOTA_CM_SendStatPopup = 17, + DOTA_CM_BeginLastHitChallenge = 18 }; bool EDotaClientMessages_IsValid(int value); const EDotaClientMessages EDotaClientMessages_MIN = DOTA_CM_MapLine; -const EDotaClientMessages EDotaClientMessages_MAX = DOTA_CM_SendStatPopup; +const EDotaClientMessages EDotaClientMessages_MAX = DOTA_CM_BeginLastHitChallenge; const int EDotaClientMessages_ARRAYSIZE = EDotaClientMessages_MAX + 1; const ::google::protobuf::EnumDescriptor* EDotaClientMessages_descriptor(); @@ -1492,6 +1494,98 @@ class CDOTAClientMsg_SendStatPopup : public ::google::protobuf::Message { void InitAsDefaultInstance(); static CDOTAClientMsg_SendStatPopup* default_instance_; }; +// ------------------------------------------------------------------- + +class CDOTAClientMsg_BeginLastHitChallenge : public ::google::protobuf::Message { + public: + CDOTAClientMsg_BeginLastHitChallenge(); + virtual ~CDOTAClientMsg_BeginLastHitChallenge(); + + CDOTAClientMsg_BeginLastHitChallenge(const CDOTAClientMsg_BeginLastHitChallenge& from); + + inline CDOTAClientMsg_BeginLastHitChallenge& operator=(const CDOTAClientMsg_BeginLastHitChallenge& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const CDOTAClientMsg_BeginLastHitChallenge& default_instance(); + + void Swap(CDOTAClientMsg_BeginLastHitChallenge* other); + + // implements Message ---------------------------------------------- + + CDOTAClientMsg_BeginLastHitChallenge* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const CDOTAClientMsg_BeginLastHitChallenge& from); + void MergeFrom(const CDOTAClientMsg_BeginLastHitChallenge& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // optional uint32 chosen_lane = 1; + inline bool has_chosen_lane() const; + inline void clear_chosen_lane(); + static const int kChosenLaneFieldNumber = 1; + inline ::google::protobuf::uint32 chosen_lane() const; + inline void set_chosen_lane(::google::protobuf::uint32 value); + + // optional bool helper_enabled = 2; + inline bool has_helper_enabled() const; + inline void clear_helper_enabled(); + static const int kHelperEnabledFieldNumber = 2; + inline bool helper_enabled() const; + inline void set_helper_enabled(bool value); + + // @@protoc_insertion_point(class_scope:CDOTAClientMsg_BeginLastHitChallenge) + private: + inline void set_has_chosen_lane(); + inline void clear_has_chosen_lane(); + inline void set_has_helper_enabled(); + inline void clear_has_helper_enabled(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 chosen_lane_; + bool helper_enabled_; + + mutable int _cached_size_; + ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32]; + + friend void protobuf_AddDesc_dota_5fclientmessages_2eproto(); + friend void protobuf_AssignDesc_dota_5fclientmessages_2eproto(); + friend void protobuf_ShutdownFile_dota_5fclientmessages_2eproto(); + + void InitAsDefaultInstance(); + static CDOTAClientMsg_BeginLastHitChallenge* default_instance_; +}; // =================================================================== @@ -2045,6 +2139,54 @@ inline ::CDOTAMsg_SendStatPopup* CDOTAClientMsg_SendStatPopup::release_statpopup return temp; } +// ------------------------------------------------------------------- + +// CDOTAClientMsg_BeginLastHitChallenge + +// optional uint32 chosen_lane = 1; +inline bool CDOTAClientMsg_BeginLastHitChallenge::has_chosen_lane() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +inline void CDOTAClientMsg_BeginLastHitChallenge::set_has_chosen_lane() { + _has_bits_[0] |= 0x00000001u; +} +inline void CDOTAClientMsg_BeginLastHitChallenge::clear_has_chosen_lane() { + _has_bits_[0] &= ~0x00000001u; +} +inline void CDOTAClientMsg_BeginLastHitChallenge::clear_chosen_lane() { + chosen_lane_ = 0u; + clear_has_chosen_lane(); +} +inline ::google::protobuf::uint32 CDOTAClientMsg_BeginLastHitChallenge::chosen_lane() const { + return chosen_lane_; +} +inline void CDOTAClientMsg_BeginLastHitChallenge::set_chosen_lane(::google::protobuf::uint32 value) { + set_has_chosen_lane(); + chosen_lane_ = value; +} + +// optional bool helper_enabled = 2; +inline bool CDOTAClientMsg_BeginLastHitChallenge::has_helper_enabled() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void CDOTAClientMsg_BeginLastHitChallenge::set_has_helper_enabled() { + _has_bits_[0] |= 0x00000002u; +} +inline void CDOTAClientMsg_BeginLastHitChallenge::clear_has_helper_enabled() { + _has_bits_[0] &= ~0x00000002u; +} +inline void CDOTAClientMsg_BeginLastHitChallenge::clear_helper_enabled() { + helper_enabled_ = false; + clear_has_helper_enabled(); +} +inline bool CDOTAClientMsg_BeginLastHitChallenge::helper_enabled() const { + return helper_enabled_; +} +inline void CDOTAClientMsg_BeginLastHitChallenge::set_helper_enabled(bool value) { + set_has_helper_enabled(); + helper_enabled_ = value; +} + // @@protoc_insertion_point(namespace_scope) diff --git a/public/game/shared/dota/protobuf/dota_clientmessages.proto b/public/game/shared/dota/protobuf/dota_clientmessages.proto index 5afe902d..6c0c6995 100644 --- a/public/game/shared/dota/protobuf/dota_clientmessages.proto +++ b/public/game/shared/dota/protobuf/dota_clientmessages.proto @@ -87,6 +87,7 @@ enum EDotaClientMessages DOTA_CM_ItemAlert = 15; DOTA_CM_ChatWheel = 16; DOTA_CM_SendStatPopup = 17; + DOTA_CM_BeginLastHitChallenge = 18; } //============================================================================= @@ -176,3 +177,9 @@ message CDOTAClientMsg_SendStatPopup optional CDOTAMsg_SendStatPopup statpopup = 1; } +message CDOTAClientMsg_BeginLastHitChallenge +{ + optional uint32 chosen_lane = 1; + optional bool helper_enabled = 2; +} + diff --git a/public/game/shared/dota/protobuf/dota_commonmessages.pb.cc b/public/game/shared/dota/protobuf/dota_commonmessages.pb.cc index 65299f0c..656ef755 100644 --- a/public/game/shared/dota/protobuf/dota_commonmessages.pb.cc +++ b/public/game/shared/dota/protobuf/dota_commonmessages.pb.cc @@ -193,7 +193,7 @@ void protobuf_AddDesc_dota_5fcommonmessages_2eproto() { "\007initial\030\004 \001(\010\022\013\n\003end\030\005 \001(\010\"~\n\026CDOTAMsg_" "SendStatPopup\0229\n\005style\030\001 \001(\0162\024.EDOTAStat" "PopupTypes:\024k_EDOTA_SPT_Textline\022\024\n\014stat" - "_strings\030\002 \003(\t\022\023\n\013stat_images\030\003 \003(\005*\267\002\n\025" + "_strings\030\002 \003(\t\022\023\n\013stat_images\030\003 \003(\005*\252\016\n\025" "EDOTAChatWheelMessage\022\021\n\rk_EDOTA_CW_Ok\020\000" "\022\023\n\017k_EDOTA_CW_Care\020\001\022\026\n\022k_EDOTA_CW_GetB" "ack\020\002\022\030\n\024k_EDOTA_CW_NeedWards\020\003\022\023\n\017k_EDO" @@ -201,10 +201,48 @@ void protobuf_AddDesc_dota_5fcommonmessages_2eproto() { "DOTA_CW_Push\020\006\022\026\n\022k_EDOTA_CW_GoodJob\020\007\022\026" "\n\022k_EDOTA_CW_Missing\020\010\022\032\n\026k_EDOTA_CW_Mis" "sing_Top\020\t\022\032\n\026k_EDOTA_CW_Missing_Mid\020\n\022\035" - "\n\031k_EDOTA_CW_Missing_Bottom\020\013*\\\n\023EDOTASt" - "atPopupTypes\022\030\n\024k_EDOTA_SPT_Textline\020\000\022\025" - "\n\021k_EDOTA_SPT_Basic\020\001\022\024\n\020k_EDOTA_SPT_Pol" - "l\020\002B\005H\001\200\001\000", 930); + "\n\031k_EDOTA_CW_Missing_Bottom\020\013\022\021\n\rk_EDOTA" + "_CW_Go\020\014\022\027\n\023k_EDOTA_CW_Initiate\020\r\022\025\n\021k_E" + "DOTA_CW_Follow\020\016\022\027\n\023k_EDOTA_CW_Group_Up\020" + "\017\022\031\n\025k_EDOTA_CW_Spread_Out\020\020\022\031\n\025k_EDOTA_" + "CW_Split_Farm\020\021\022\025\n\021k_EDOTA_CW_Attack\020\022\022\022" + "\n\016k_EDOTA_CW_BRB\020\023\022\023\n\017k_EDOTA_CW_Dive\020\024\022" + "\022\n\016k_EDOTA_CW_OMW\020\025\022\030\n\024k_EDOTA_CW_Get_Re" + "ady\020\026\022\023\n\017k_EDOTA_CW_Bait\020\027\022\023\n\017k_EDOTA_CW" + "_Heal\020\030\022\023\n\017k_EDOTA_CW_Mana\020\031\022\022\n\016k_EDOTA_" + "CW_OOM\020\032\022\035\n\031k_EDOTA_CW_Skill_Cooldown\020\033\022" + "\031\n\025k_EDOTA_CW_Ulti_Ready\020\034\022\035\n\031k_EDOTA_CW" + "_Enemy_Returned\020\035\022\032\n\026k_EDOTA_CW_All_Miss" + "ing\020\036\022\035\n\031k_EDOTA_CW_Enemy_Incoming\020\037\022\032\n\026" + "k_EDOTA_CW_Invis_Enemy\020 \022\035\n\031k_EDOTA_CW_E" + "nemy_Had_Rune\020!\022\031\n\025k_EDOTA_CW_Split_Push" + "\020\"\022\035\n\031k_EDOTA_CW_Coming_To_Gank\020#\022\033\n\027k_E" + "DOTA_CW_Request_Gank\020$\022 \n\034k_EDOTA_CW_Fig" + "ht_Under_Tower\020%\022\031\n\025k_EDOTA_CW_Deny_Towe" + "r\020&\022\032\n\026k_EDOTA_CW_Buy_Courier\020\'\022\036\n\032k_EDO" + "TA_CW_Upgrade_Courier\020(\022\035\n\031k_EDOTA_CW_Ne" + "ed_Detection\020)\022\"\n\036k_EDOTA_CW_They_Have_D" + "etection\020*\022\025\n\021k_EDOTA_CW_Buy_TP\020+\022\034\n\030k_E" + "DOTA_CW_Reuse_Courier\020,\022\025\n\021k_EDOTA_CW_De" + "ward\020-\022\033\n\027k_EDOTA_CW_Building_Mek\020.\022\034\n\030k" + "_EDOTA_CW_Building_Pipe\020/\022\035\n\031k_EDOTA_CW_" + "Stack_And_Pull\0200\022\023\n\017k_EDOTA_CW_Pull\0201\022\026\n" + "\022k_EDOTA_CW_Pulling\0202\022\024\n\020k_EDOTA_CW_Stac" + "k\0203\022\027\n\023k_EDOTA_CW_Jungling\0204\022\025\n\021k_EDOTA_" + "CW_Roshan\0205\022\032\n\026k_EDOTA_CW_Affirmative\0206\022" + "\023\n\017k_EDOTA_CW_Wait\0207\022\024\n\020k_EDOTA_CW_Pause" + "\0208\022\033\n\027k_EDOTA_CW_Current_Time\0209\022\032\n\026k_EDO" + "TA_CW_Check_Runes\020:\022\031\n\025k_EDOTA_CW_Smoke_" + "Gank\020;\022\023\n\017k_EDOTA_CW_GLHF\020<\022\023\n\017k_EDOTA_C" + "W_Nice\020=\022\025\n\021k_EDOTA_CW_Thanks\020>\022\024\n\020k_EDO" + "TA_CW_Sorry\020\?\022\031\n\025k_EDOTA_CW_No_Give_Up\020@" + "\022\034\n\030k_EDOTA_CW_Just_Happened\020A\022\033\n\027k_EDOT" + "A_CW_Game_Is_Hard\020B\022\027\n\023k_EDOTA_CW_New_Me" + "ta\020C\022\025\n\021k_EDOTA_CW_My_Bad\020D\022\025\n\021k_EDOTA_C" + "W_Regret\020E\022\024\n\020k_EDOTA_CW_Relax\020F*\\\n\023EDOT" + "AStatPopupTypes\022\030\n\024k_EDOTA_SPT_Textline\020" + "\000\022\025\n\021k_EDOTA_SPT_Basic\020\001\022\024\n\020k_EDOTA_SPT_" + "Poll\020\002B\005H\001\200\001\000", 2453); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "dota_commonmessages.proto", &protobuf_RegisterTypes); CDOTAMsg_LocationPing::default_instance_ = new CDOTAMsg_LocationPing(); @@ -245,6 +283,65 @@ bool EDOTAChatWheelMessage_IsValid(int value) { case 9: case 10: case 11: + case 12: + case 13: + case 14: + case 15: + case 16: + case 17: + case 18: + case 19: + case 20: + case 21: + case 22: + case 23: + case 24: + case 25: + case 26: + case 27: + case 28: + case 29: + case 30: + case 31: + case 32: + case 33: + case 34: + case 35: + case 36: + case 37: + case 38: + case 39: + case 40: + case 41: + case 42: + case 43: + case 44: + case 45: + case 46: + case 47: + case 48: + case 49: + case 50: + case 51: + case 52: + case 53: + case 54: + case 55: + case 56: + case 57: + case 58: + case 59: + case 60: + case 61: + case 62: + case 63: + case 64: + case 65: + case 66: + case 67: + case 68: + case 69: + case 70: return true; default: return false; diff --git a/public/game/shared/dota/protobuf/dota_commonmessages.pb.h b/public/game/shared/dota/protobuf/dota_commonmessages.pb.h index 0a3f8fb1..d4764ff0 100644 --- a/public/game/shared/dota/protobuf/dota_commonmessages.pb.h +++ b/public/game/shared/dota/protobuf/dota_commonmessages.pb.h @@ -50,11 +50,70 @@ enum EDOTAChatWheelMessage { k_EDOTA_CW_Missing = 8, k_EDOTA_CW_Missing_Top = 9, k_EDOTA_CW_Missing_Mid = 10, - k_EDOTA_CW_Missing_Bottom = 11 + k_EDOTA_CW_Missing_Bottom = 11, + k_EDOTA_CW_Go = 12, + k_EDOTA_CW_Initiate = 13, + k_EDOTA_CW_Follow = 14, + k_EDOTA_CW_Group_Up = 15, + k_EDOTA_CW_Spread_Out = 16, + k_EDOTA_CW_Split_Farm = 17, + k_EDOTA_CW_Attack = 18, + k_EDOTA_CW_BRB = 19, + k_EDOTA_CW_Dive = 20, + k_EDOTA_CW_OMW = 21, + k_EDOTA_CW_Get_Ready = 22, + k_EDOTA_CW_Bait = 23, + k_EDOTA_CW_Heal = 24, + k_EDOTA_CW_Mana = 25, + k_EDOTA_CW_OOM = 26, + k_EDOTA_CW_Skill_Cooldown = 27, + k_EDOTA_CW_Ulti_Ready = 28, + k_EDOTA_CW_Enemy_Returned = 29, + k_EDOTA_CW_All_Missing = 30, + k_EDOTA_CW_Enemy_Incoming = 31, + k_EDOTA_CW_Invis_Enemy = 32, + k_EDOTA_CW_Enemy_Had_Rune = 33, + k_EDOTA_CW_Split_Push = 34, + k_EDOTA_CW_Coming_To_Gank = 35, + k_EDOTA_CW_Request_Gank = 36, + k_EDOTA_CW_Fight_Under_Tower = 37, + k_EDOTA_CW_Deny_Tower = 38, + k_EDOTA_CW_Buy_Courier = 39, + k_EDOTA_CW_Upgrade_Courier = 40, + k_EDOTA_CW_Need_Detection = 41, + k_EDOTA_CW_They_Have_Detection = 42, + k_EDOTA_CW_Buy_TP = 43, + k_EDOTA_CW_Reuse_Courier = 44, + k_EDOTA_CW_Deward = 45, + k_EDOTA_CW_Building_Mek = 46, + k_EDOTA_CW_Building_Pipe = 47, + k_EDOTA_CW_Stack_And_Pull = 48, + k_EDOTA_CW_Pull = 49, + k_EDOTA_CW_Pulling = 50, + k_EDOTA_CW_Stack = 51, + k_EDOTA_CW_Jungling = 52, + k_EDOTA_CW_Roshan = 53, + k_EDOTA_CW_Affirmative = 54, + k_EDOTA_CW_Wait = 55, + k_EDOTA_CW_Pause = 56, + k_EDOTA_CW_Current_Time = 57, + k_EDOTA_CW_Check_Runes = 58, + k_EDOTA_CW_Smoke_Gank = 59, + k_EDOTA_CW_GLHF = 60, + k_EDOTA_CW_Nice = 61, + k_EDOTA_CW_Thanks = 62, + k_EDOTA_CW_Sorry = 63, + k_EDOTA_CW_No_Give_Up = 64, + k_EDOTA_CW_Just_Happened = 65, + k_EDOTA_CW_Game_Is_Hard = 66, + k_EDOTA_CW_New_Meta = 67, + k_EDOTA_CW_My_Bad = 68, + k_EDOTA_CW_Regret = 69, + k_EDOTA_CW_Relax = 70 }; bool EDOTAChatWheelMessage_IsValid(int value); const EDOTAChatWheelMessage EDOTAChatWheelMessage_MIN = k_EDOTA_CW_Ok; -const EDOTAChatWheelMessage EDOTAChatWheelMessage_MAX = k_EDOTA_CW_Missing_Bottom; +const EDOTAChatWheelMessage EDOTAChatWheelMessage_MAX = k_EDOTA_CW_Relax; const int EDOTAChatWheelMessage_ARRAYSIZE = EDOTAChatWheelMessage_MAX + 1; const ::google::protobuf::EnumDescriptor* EDOTAChatWheelMessage_descriptor(); diff --git a/public/game/shared/dota/protobuf/dota_commonmessages.proto b/public/game/shared/dota/protobuf/dota_commonmessages.proto index 3f72266d..eee6afe8 100644 --- a/public/game/shared/dota/protobuf/dota_commonmessages.proto +++ b/public/game/shared/dota/protobuf/dota_commonmessages.proto @@ -78,6 +78,65 @@ enum EDOTAChatWheelMessage k_EDOTA_CW_Missing_Top = 9; k_EDOTA_CW_Missing_Mid = 10; k_EDOTA_CW_Missing_Bottom = 11; + k_EDOTA_CW_Go = 12; + k_EDOTA_CW_Initiate = 13; + k_EDOTA_CW_Follow = 14; + k_EDOTA_CW_Group_Up = 15; + k_EDOTA_CW_Spread_Out = 16; + k_EDOTA_CW_Split_Farm = 17; + k_EDOTA_CW_Attack = 18; + k_EDOTA_CW_BRB = 19; + k_EDOTA_CW_Dive = 20; + k_EDOTA_CW_OMW = 21; + k_EDOTA_CW_Get_Ready = 22; + k_EDOTA_CW_Bait = 23; + k_EDOTA_CW_Heal = 24; + k_EDOTA_CW_Mana = 25; + k_EDOTA_CW_OOM = 26; + k_EDOTA_CW_Skill_Cooldown = 27; + k_EDOTA_CW_Ulti_Ready = 28; + k_EDOTA_CW_Enemy_Returned = 29; + k_EDOTA_CW_All_Missing = 30; + k_EDOTA_CW_Enemy_Incoming = 31; + k_EDOTA_CW_Invis_Enemy = 32; + k_EDOTA_CW_Enemy_Had_Rune = 33; + k_EDOTA_CW_Split_Push = 34; + k_EDOTA_CW_Coming_To_Gank = 35; + k_EDOTA_CW_Request_Gank = 36; + k_EDOTA_CW_Fight_Under_Tower = 37; + k_EDOTA_CW_Deny_Tower = 38; + k_EDOTA_CW_Buy_Courier = 39; + k_EDOTA_CW_Upgrade_Courier = 40; + k_EDOTA_CW_Need_Detection = 41; + k_EDOTA_CW_They_Have_Detection = 42; + k_EDOTA_CW_Buy_TP = 43; + k_EDOTA_CW_Reuse_Courier = 44; + k_EDOTA_CW_Deward = 45; + k_EDOTA_CW_Building_Mek = 46; + k_EDOTA_CW_Building_Pipe = 47; + k_EDOTA_CW_Stack_And_Pull = 48; + k_EDOTA_CW_Pull = 49; + k_EDOTA_CW_Pulling = 50; + k_EDOTA_CW_Stack = 51; + k_EDOTA_CW_Jungling = 52; + k_EDOTA_CW_Roshan = 53; + k_EDOTA_CW_Affirmative = 54; + k_EDOTA_CW_Wait = 55; + k_EDOTA_CW_Pause = 56; + k_EDOTA_CW_Current_Time = 57; + k_EDOTA_CW_Check_Runes = 58; + k_EDOTA_CW_Smoke_Gank = 59; + k_EDOTA_CW_GLHF = 60; + k_EDOTA_CW_Nice = 61; + k_EDOTA_CW_Thanks = 62; + k_EDOTA_CW_Sorry = 63; + k_EDOTA_CW_No_Give_Up = 64; + k_EDOTA_CW_Just_Happened = 65; + k_EDOTA_CW_Game_Is_Hard = 66; + k_EDOTA_CW_New_Meta = 67; + k_EDOTA_CW_My_Bad = 68; + k_EDOTA_CW_Regret = 69; + k_EDOTA_CW_Relax = 70; } enum EDOTAStatPopupTypes