From ab80d1de703ac9f9bb634409476d7df1b4bd7318 Mon Sep 17 00:00:00 2001 From: Marcos <66353315+marcosvf132@users.noreply.github.com> Date: Fri, 20 May 2022 13:23:01 -0300 Subject: [PATCH 1/7] Initial commit --- src/io/ioprey.cpp | 6 ++++++ src/io/ioprey.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/io/ioprey.cpp b/src/io/ioprey.cpp index b4df052dcc8..8b80310c7f8 100644 --- a/src/io/ioprey.cpp +++ b/src/io/ioprey.cpp @@ -32,6 +32,7 @@ PreySlot::PreySlot(PreySlot_t id) : eraseBonus(); reloadBonusValue(); reloadBonusType(); + freeRerollTimeStamp = OTSYS_TIME() + g_configManager().getNumber(PREY_FREE_REROLL_TIME) * 1000; } void PreySlot::reloadBonusType() @@ -143,6 +144,11 @@ void PreySlot::reloadMonsterGrid(std::vector blackList, uint32_t level } // Task hunting class +TaskHuntingSlot::TaskHuntingSlot(PreySlot_t id) : + id(id) { + freeRerollTimeStamp = OTSYS_TIME() + g_configManager().getNumber(TASK_HUNTING_FREE_REROLL_TIME) * 1000; +} + void TaskHuntingSlot::reloadMonsterGrid(std::vector blackList, uint32_t level) { raceIdList.clear(); diff --git a/src/io/ioprey.h b/src/io/ioprey.h index 5d5d7f4a335..4e47d58ab0b 100644 --- a/src/io/ioprey.h +++ b/src/io/ioprey.h @@ -156,7 +156,7 @@ class TaskHuntingSlot { public: TaskHuntingSlot() = default; - explicit TaskHuntingSlot(PreySlot_t id) : id(id) { } + explicit TaskHuntingSlot(PreySlot_t id); virtual ~TaskHuntingSlot() = default; bool isOccupied() const { From 6d716a5d4946385e2f2ebbdc2d7e6af5eaf43094 Mon Sep 17 00:00:00 2001 From: Marcos <66353315+marcosvf132@users.noreply.github.com> Date: Tue, 31 May 2022 18:08:11 -0300 Subject: [PATCH 2/7] Few prey improvements --- src/io/ioprey.cpp | 22 +- src/protobuf/appearances.pb.cc | 700 ++++++++-------- src/protobuf/appearances.pb.h | 1391 +++++++++++++++----------------- 3 files changed, 975 insertions(+), 1138 deletions(-) diff --git a/src/io/ioprey.cpp b/src/io/ioprey.cpp index 8b80310c7f8..0adf8b944de 100644 --- a/src/io/ioprey.cpp +++ b/src/io/ioprey.cpp @@ -40,12 +40,12 @@ void PreySlot::reloadBonusType() if (bonusRarity == 10) { PreyBonus_t bonus_tmp = bonus; while (bonus_tmp == bonus) { - bonus = static_cast(normal_random(PreyBonus_First, PreyBonus_Last)); + bonus = static_cast(uniform_random(PreyBonus_First, PreyBonus_Last)); } return; } - bonus = static_cast(normal_random(PreyBonus_First, PreyBonus_Last)); + bonus = static_cast(uniform_random(PreyBonus_First, PreyBonus_Last)); } void PreySlot::reloadBonusValue() @@ -56,7 +56,7 @@ void PreySlot::reloadBonusValue() if (bonusRarity >= 9) { bonusRarity = 10; } else { - bonusRarity = static_cast(normal_random(bonusRarity + 1, 10)); + bonusRarity = static_cast(uniform_random(bonusRarity + 1, 10)); } bonusPercentage = stagePercent * bonusRarity; @@ -113,7 +113,7 @@ void PreySlot::reloadMonsterGrid(std::vector blackList, uint32_t level uint8_t tries = 0; auto maxIndex = static_cast(bestiary.size() - 1); while (raceIdList.size() < 9) { - uint16_t raceId = (*(std::next(bestiary.begin(), normal_random(0, maxIndex)))).first; + uint16_t raceId = (*(std::next(bestiary.begin(), uniform_random(0, maxIndex)))).first; tries++; if (std::count(blackList.begin(), blackList.end(), raceId) != 0) { @@ -195,7 +195,7 @@ void TaskHuntingSlot::reloadMonsterGrid(std::vector blackList, uint32_ uint8_t tries = 0; auto maxIndex = static_cast(bestiary.size() - 1); while (raceIdList.size() < 9) { - uint16_t raceId = (*(std::next(bestiary.begin(), normal_random(0, maxIndex)))).first; + uint16_t raceId = (*(std::next(bestiary.begin(), uniform_random(0, maxIndex)))).first; tries++; if (std::count(blackList.begin(), blackList.end(), raceId) != 0) { @@ -238,13 +238,13 @@ void TaskHuntingSlot::reloadReward() int32_t chance; if (rarity == 0) { - chance = normal_random(0, 100); + chance = uniform_random(0, 100); } else if (rarity == 1) { - chance = normal_random(0, 70); + chance = uniform_random(0, 70); } else if (rarity == 2) { - chance = normal_random(0, 45); + chance = uniform_random(0, 45); } else if (rarity == 3) { - chance = normal_random(0, 20); + chance = uniform_random(0, 20); } else { return; } @@ -330,7 +330,7 @@ void IOPrey::ParsePreyAction(Player* player, } slot->eraseBonus(true); - slot->state = PreyDataState_Selection; + slot->state = PreyDataState_SelectionChangeMonster; slot->reloadMonsterGrid(player->getPreyBlackList(), player->getLevel()); } else if (action == PreyAction_ListAll_Cards) { if (!player->usePreyCards(static_cast(g_configManager().getNumber(PREY_SELECTION_LIST_PRICE)))) { @@ -506,7 +506,7 @@ void IOPrey::ParseTaskHuntingAction(Player* player, if (const TaskHuntingOption* option = GetTaskRewardOption(slot)) { uint16_t reward; - int32_t boostChange = normal_random(0, 100); + int32_t boostChange = uniform_random(0, 100); if (slot->rarity >= 4 && boostChange <= 5) { boostChange = 20; } else if (slot->rarity >= 4 && boostChange <= 10) { diff --git a/src/protobuf/appearances.pb.cc b/src/protobuf/appearances.pb.cc index 719a7c64ac6..a17698fe73f 100644 --- a/src/protobuf/appearances.pb.cc +++ b/src/protobuf/appearances.pb.cc @@ -435,7 +435,7 @@ static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_appearances_2eproto static const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* file_level_enum_descriptors_appearances_2eproto[6]; static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_appearances_2eproto = nullptr; -const uint32_t TableStruct_appearances_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { +const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_appearances_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { PROTOBUF_FIELD_OFFSET(::Canary::protobuf::appearances::Coordinate, _has_bits_), PROTOBUF_FIELD_OFFSET(::Canary::protobuf::appearances::Coordinate, _internal_metadata_), ~0u, // no _extensions_ @@ -1209,7 +1209,7 @@ Coordinate::Coordinate(const Coordinate& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.Coordinate) } -inline void Coordinate::SharedCtor() { +void Coordinate::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&x_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&z_) - @@ -1239,7 +1239,7 @@ void Coordinate::SetCachedSize(int size) const { void Coordinate::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.Coordinate) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1257,12 +1257,12 @@ const char* Coordinate::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 x = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_x(&has_bits); x_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -1271,7 +1271,7 @@ const char* Coordinate::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional uint32 y = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { _Internal::set_has_y(&has_bits); y_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -1280,7 +1280,7 @@ const char* Coordinate::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional uint32 z = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { _Internal::set_has_z(&has_bits); z_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -1311,10 +1311,10 @@ const char* Coordinate::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #undef CHK_ } -uint8_t* Coordinate::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* Coordinate::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.Coordinate) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -1348,7 +1348,7 @@ size_t Coordinate::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.Coordinate) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1389,7 +1389,7 @@ void Coordinate::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void Coordinate::MergeFrom(const Coordinate& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.Coordinate) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; @@ -1481,7 +1481,7 @@ Appearances::Appearances(const Appearances& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.Appearances) } -inline void Appearances::SharedCtor() { +void Appearances::SharedCtor() { special_meaning_appearance_ids_ = nullptr; } @@ -1509,7 +1509,7 @@ void Appearances::SetCachedSize(int size) const { void Appearances::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.Appearances) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1530,12 +1530,12 @@ const char* Appearances::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // repeated .Canary.protobuf.appearances.Appearance object = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { ptr -= 1; do { ptr += 1; @@ -1548,7 +1548,7 @@ const char* Appearances::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID continue; // repeated .Canary.protobuf.appearances.Appearance outfit = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { ptr -= 1; do { ptr += 1; @@ -1561,7 +1561,7 @@ const char* Appearances::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID continue; // repeated .Canary.protobuf.appearances.Appearance effect = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { ptr -= 1; do { ptr += 1; @@ -1574,7 +1574,7 @@ const char* Appearances::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID continue; // repeated .Canary.protobuf.appearances.Appearance missile = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) { ptr -= 1; do { ptr += 1; @@ -1587,7 +1587,7 @@ const char* Appearances::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID continue; // optional .Canary.protobuf.appearances.SpecialMeaningAppearanceIds special_meaning_appearance_ids = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 42)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 42)) { ptr = ctx->ParseMessage(_internal_mutable_special_meaning_appearance_ids(), ptr); CHK_(ptr); } else @@ -1617,10 +1617,10 @@ const char* Appearances::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID #undef CHK_ } -uint8_t* Appearances::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* Appearances::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.Appearances) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; // repeated .Canary.protobuf.appearances.Appearance object = 1; @@ -1676,7 +1676,7 @@ size_t Appearances::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.Appearances) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1735,7 +1735,7 @@ void Appearances::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void Appearances::MergeFrom(const Appearances& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.Appearances) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; object_.MergeFrom(from.object_); @@ -1808,7 +1808,7 @@ SpritePhase::SpritePhase(const SpritePhase& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.SpritePhase) } -inline void SpritePhase::SharedCtor() { +void SpritePhase::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&duration_min_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&duration_max_) - @@ -1838,7 +1838,7 @@ void SpritePhase::SetCachedSize(int size) const { void SpritePhase::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.SpritePhase) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1856,12 +1856,12 @@ const char* SpritePhase::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 duration_min = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_duration_min(&has_bits); duration_min_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -1870,7 +1870,7 @@ const char* SpritePhase::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID continue; // optional uint32 duration_max = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { _Internal::set_has_duration_max(&has_bits); duration_max_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -1901,10 +1901,10 @@ const char* SpritePhase::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID #undef CHK_ } -uint8_t* SpritePhase::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* SpritePhase::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.SpritePhase) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -1932,7 +1932,7 @@ size_t SpritePhase::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.SpritePhase) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1968,7 +1968,7 @@ void SpritePhase::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void SpritePhase::MergeFrom(const SpritePhase& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.SpritePhase) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; @@ -2056,7 +2056,7 @@ SpriteAnimation::SpriteAnimation(const SpriteAnimation& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.SpriteAnimation) } -inline void SpriteAnimation::SharedCtor() { +void SpriteAnimation::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&default_start_phase_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&loop_count_) - @@ -2087,7 +2087,7 @@ void SpriteAnimation::SetCachedSize(int size) const { void SpriteAnimation::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.SpriteAnimation) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2107,12 +2107,12 @@ const char* SpriteAnimation::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 default_start_phase = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_default_start_phase(&has_bits); default_start_phase_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2121,7 +2121,7 @@ const char* SpriteAnimation::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool synchronized = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { _Internal::set_has_synchronized(&has_bits); synchronized_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -2130,7 +2130,7 @@ const char* SpriteAnimation::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool random_start_phase = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { _Internal::set_has_random_start_phase(&has_bits); random_start_phase_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -2139,8 +2139,8 @@ const char* SpriteAnimation::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.ANIMATION_LOOP_TYPE loop_type = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { - uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) { + ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); if (PROTOBUF_PREDICT_TRUE(::Canary::protobuf::appearances::ANIMATION_LOOP_TYPE_IsValid(val))) { _internal_set_loop_type(static_cast<::Canary::protobuf::appearances::ANIMATION_LOOP_TYPE>(val)); @@ -2152,7 +2152,7 @@ const char* SpriteAnimation::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional uint32 loop_count = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { _Internal::set_has_loop_count(&has_bits); loop_count_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2161,7 +2161,7 @@ const char* SpriteAnimation::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // repeated .Canary.protobuf.appearances.SpritePhase sprite_phase = 6; case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 50)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 50)) { ptr -= 1; do { ptr += 1; @@ -2196,10 +2196,10 @@ const char* SpriteAnimation::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC #undef CHK_ } -uint8_t* SpriteAnimation::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* SpriteAnimation::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.SpriteAnimation) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -2254,7 +2254,7 @@ size_t SpriteAnimation::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.SpriteAnimation) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2313,7 +2313,7 @@ void SpriteAnimation::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void SpriteAnimation::MergeFrom(const SpriteAnimation& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.SpriteAnimation) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; sprite_phase_.MergeFrom(from.sprite_phase_); @@ -2408,7 +2408,7 @@ Box::Box(const Box& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.Box) } -inline void Box::SharedCtor() { +void Box::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&x_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&height_) - @@ -2438,7 +2438,7 @@ void Box::SetCachedSize(int size) const { void Box::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.Box) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2456,12 +2456,12 @@ const char* Box::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::intern #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 x = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_x(&has_bits); x_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2470,7 +2470,7 @@ const char* Box::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::intern continue; // optional uint32 y = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { _Internal::set_has_y(&has_bits); y_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2479,7 +2479,7 @@ const char* Box::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::intern continue; // optional uint32 width = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { _Internal::set_has_width(&has_bits); width_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2488,7 +2488,7 @@ const char* Box::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::intern continue; // optional uint32 height = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) { _Internal::set_has_height(&has_bits); height_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2519,10 +2519,10 @@ const char* Box::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::intern #undef CHK_ } -uint8_t* Box::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* Box::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.Box) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -2562,7 +2562,7 @@ size_t Box::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.Box) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2608,7 +2608,7 @@ void Box::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void Box::MergeFrom(const Box& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.Box) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; @@ -2720,7 +2720,7 @@ SpriteInfo::SpriteInfo(const SpriteInfo& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.SpriteInfo) } -inline void SpriteInfo::SharedCtor() { +void SpriteInfo::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&animation_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&is_opaque_) - @@ -2751,7 +2751,7 @@ void SpriteInfo::SetCachedSize(int size) const { void SpriteInfo::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.SpriteInfo) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2775,12 +2775,12 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 pattern_width = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_pattern_width(&has_bits); pattern_width_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2789,7 +2789,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional uint32 pattern_height = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { _Internal::set_has_pattern_height(&has_bits); pattern_height_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2798,7 +2798,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional uint32 pattern_depth = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { _Internal::set_has_pattern_depth(&has_bits); pattern_depth_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2807,7 +2807,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional uint32 layers = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) { _Internal::set_has_layers(&has_bits); layers_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2816,7 +2816,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // repeated uint32 sprite_id = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { ptr -= 1; do { ptr += 1; @@ -2824,7 +2824,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<40>(ptr)); - } else if (static_cast(tag) == 42) { + } else if (static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 42) { ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedUInt32Parser(_internal_mutable_sprite_id(), ptr, ctx); CHK_(ptr); } else @@ -2832,7 +2832,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional .Canary.protobuf.appearances.SpriteAnimation animation = 6; case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 50)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 50)) { ptr = ctx->ParseMessage(_internal_mutable_animation(), ptr); CHK_(ptr); } else @@ -2840,7 +2840,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional uint32 bounding_square = 7; case 7: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 56)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 56)) { _Internal::set_has_bounding_square(&has_bits); bounding_square_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2849,7 +2849,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional bool is_opaque = 8; case 8: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 64)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 64)) { _Internal::set_has_is_opaque(&has_bits); is_opaque_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -2858,7 +2858,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // repeated .Canary.protobuf.appearances.Box bounding_box_per_direction = 9; case 9: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 74)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 74)) { ptr -= 1; do { ptr += 1; @@ -2893,10 +2893,10 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #undef CHK_ } -uint8_t* SpriteInfo::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* SpriteInfo::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.SpriteInfo) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -2970,7 +2970,7 @@ size_t SpriteInfo::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.SpriteInfo) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -3049,7 +3049,7 @@ void SpriteInfo::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void SpriteInfo::MergeFrom(const SpriteInfo& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.SpriteInfo) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; sprite_id_.MergeFrom(from.sprite_id_); @@ -3158,7 +3158,7 @@ FrameGroup::FrameGroup(const FrameGroup& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.FrameGroup) } -inline void FrameGroup::SharedCtor() { +void FrameGroup::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&sprite_info_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&id_) - @@ -3189,7 +3189,7 @@ void FrameGroup::SetCachedSize(int size) const { void FrameGroup::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.FrameGroup) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -3211,13 +3211,13 @@ const char* FrameGroup::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional .Canary.protobuf.appearances.FIXED_FRAME_GROUP fixed_frame_group = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); if (PROTOBUF_PREDICT_TRUE(::Canary::protobuf::appearances::FIXED_FRAME_GROUP_IsValid(val))) { _internal_set_fixed_frame_group(static_cast<::Canary::protobuf::appearances::FIXED_FRAME_GROUP>(val)); @@ -3229,7 +3229,7 @@ const char* FrameGroup::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional uint32 id = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { _Internal::set_has_id(&has_bits); id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -3238,7 +3238,7 @@ const char* FrameGroup::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional .Canary.protobuf.appearances.SpriteInfo sprite_info = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { ptr = ctx->ParseMessage(_internal_mutable_sprite_info(), ptr); CHK_(ptr); } else @@ -3268,10 +3268,10 @@ const char* FrameGroup::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #undef CHK_ } -uint8_t* FrameGroup::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* FrameGroup::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.FrameGroup) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -3308,7 +3308,7 @@ size_t FrameGroup::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.FrameGroup) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -3352,7 +3352,7 @@ void FrameGroup::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void FrameGroup::MergeFrom(const FrameGroup& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.FrameGroup) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; @@ -3440,17 +3440,11 @@ Appearance::Appearance(const Appearance& from) frame_group_(from.frame_group_) { _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING if (from._internal_has_name()) { name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_name(), GetArenaForAllocation()); } description_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - description_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING if (from._internal_has_description()) { description_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_description(), GetArenaForAllocation()); @@ -3464,15 +3458,9 @@ Appearance::Appearance(const Appearance& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.Appearance) } -inline void Appearance::SharedCtor() { +void Appearance::SharedCtor() { name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING description_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - description_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&flags_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&id_) - @@ -3505,7 +3493,7 @@ void Appearance::SetCachedSize(int size) const { void Appearance::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.Appearance) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -3532,12 +3520,12 @@ const char* Appearance::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 id = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_id(&has_bits); id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -3546,7 +3534,7 @@ const char* Appearance::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // repeated .Canary.protobuf.appearances.FrameGroup frame_group = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { ptr -= 1; do { ptr += 1; @@ -3559,7 +3547,7 @@ const char* Appearance::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional .Canary.protobuf.appearances.AppearanceFlags flags = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { ptr = ctx->ParseMessage(_internal_mutable_flags(), ptr); CHK_(ptr); } else @@ -3567,7 +3555,7 @@ const char* Appearance::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional bytes name = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) { auto str = _internal_mutable_name(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); @@ -3576,7 +3564,7 @@ const char* Appearance::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional bytes description = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 42)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 42)) { auto str = _internal_mutable_description(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); @@ -3607,10 +3595,10 @@ const char* Appearance::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #undef CHK_ } -uint8_t* Appearance::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* Appearance::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.Appearance) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -3660,7 +3648,7 @@ size_t Appearance::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.Appearance) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -3719,7 +3707,7 @@ void Appearance::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void Appearance::MergeFrom(const Appearance& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.Appearance) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; frame_group_.MergeFrom(from.frame_group_); @@ -4103,7 +4091,7 @@ AppearanceFlags::AppearanceFlags(const AppearanceFlags& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlags) } -inline void AppearanceFlags::SharedCtor() { +void AppearanceFlags::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&bank_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&reportable_) - @@ -4148,7 +4136,7 @@ void AppearanceFlags::SetCachedSize(int size) const { void AppearanceFlags::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlags) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -4247,12 +4235,12 @@ void AppearanceFlags::Clear() { const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional .Canary.protobuf.appearances.AppearanceFlagBank bank = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { ptr = ctx->ParseMessage(_internal_mutable_bank(), ptr); CHK_(ptr); } else @@ -4260,7 +4248,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool clip = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { _Internal::set_has_clip(&_has_bits_); clip_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4269,7 +4257,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool bottom = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { _Internal::set_has_bottom(&_has_bits_); bottom_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4278,7 +4266,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool top = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) { _Internal::set_has_top(&_has_bits_); top_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4287,7 +4275,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool container = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { _Internal::set_has_container(&_has_bits_); container_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4296,7 +4284,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool cumulative = 6; case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 48)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 48)) { _Internal::set_has_cumulative(&_has_bits_); cumulative_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4305,7 +4293,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool usable = 7; case 7: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 56)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 56)) { _Internal::set_has_usable(&_has_bits_); usable_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4314,7 +4302,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool forceuse = 8; case 8: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 64)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 64)) { _Internal::set_has_forceuse(&_has_bits_); forceuse_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4323,7 +4311,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool multiuse = 9; case 9: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 72)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 72)) { _Internal::set_has_multiuse(&_has_bits_); multiuse_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4332,7 +4320,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagWrite write = 10; case 10: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 82)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 82)) { ptr = ctx->ParseMessage(_internal_mutable_write(), ptr); CHK_(ptr); } else @@ -4340,7 +4328,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagWriteOnce write_once = 11; case 11: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 90)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 90)) { ptr = ctx->ParseMessage(_internal_mutable_write_once(), ptr); CHK_(ptr); } else @@ -4348,7 +4336,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool liquidpool = 12; case 12: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 96)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 96)) { _Internal::set_has_liquidpool(&_has_bits_); liquidpool_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4357,7 +4345,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool unpass = 13; case 13: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 104)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 104)) { _Internal::set_has_unpass(&_has_bits_); unpass_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4366,7 +4354,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool unmove = 14; case 14: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 112)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 112)) { _Internal::set_has_unmove(&_has_bits_); unmove_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4375,7 +4363,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool unsight = 15; case 15: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 120)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 120)) { _Internal::set_has_unsight(&_has_bits_); unsight_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4384,7 +4372,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool avoid = 16; case 16: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 128)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 128)) { _Internal::set_has_avoid(&_has_bits_); avoid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4393,7 +4381,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool no_movement_animation = 17; case 17: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 136)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 136)) { _Internal::set_has_no_movement_animation(&_has_bits_); no_movement_animation_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4402,7 +4390,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool take = 18; case 18: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 144)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 144)) { _Internal::set_has_take(&_has_bits_); take_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4411,7 +4399,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool liquidcontainer = 19; case 19: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 152)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 152)) { _Internal::set_has_liquidcontainer(&_has_bits_); liquidcontainer_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4420,7 +4408,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool hang = 20; case 20: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 160)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 160)) { _Internal::set_has_hang(&_has_bits_); hang_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4429,7 +4417,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagHook hook = 21; case 21: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 170)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 170)) { ptr = ctx->ParseMessage(_internal_mutable_hook(), ptr); CHK_(ptr); } else @@ -4437,7 +4425,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool rotate = 22; case 22: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 176)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 176)) { _Internal::set_has_rotate(&_has_bits_); rotate_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4446,7 +4434,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagLight light = 23; case 23: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 186)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 186)) { ptr = ctx->ParseMessage(_internal_mutable_light(), ptr); CHK_(ptr); } else @@ -4454,7 +4442,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool dont_hide = 24; case 24: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 192)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 192)) { _Internal::set_has_dont_hide(&_has_bits_); dont_hide_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4463,7 +4451,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool translucent = 25; case 25: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 200)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 200)) { _Internal::set_has_translucent(&_has_bits_); translucent_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4472,7 +4460,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagShift shift = 26; case 26: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 210)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 210)) { ptr = ctx->ParseMessage(_internal_mutable_shift(), ptr); CHK_(ptr); } else @@ -4480,7 +4468,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagHeight height = 27; case 27: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 218)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 218)) { ptr = ctx->ParseMessage(_internal_mutable_height(), ptr); CHK_(ptr); } else @@ -4488,7 +4476,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool lying_object = 28; case 28: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 224)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 224)) { _Internal::set_has_lying_object(&_has_bits_); lying_object_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4497,7 +4485,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool animate_always = 29; case 29: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 232)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 232)) { _Internal::set_has_animate_always(&_has_bits_); animate_always_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4506,7 +4494,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagAutomap automap = 30; case 30: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 242)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 242)) { ptr = ctx->ParseMessage(_internal_mutable_automap(), ptr); CHK_(ptr); } else @@ -4514,7 +4502,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagLenshelp lenshelp = 31; case 31: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 250)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 250)) { ptr = ctx->ParseMessage(_internal_mutable_lenshelp(), ptr); CHK_(ptr); } else @@ -4522,7 +4510,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool fullbank = 32; case 32: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 0)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 0)) { _Internal::set_has_fullbank(&_has_bits_); fullbank_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4531,7 +4519,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool ignore_look = 33; case 33: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_ignore_look(&_has_bits_); ignore_look_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4540,7 +4528,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagClothes clothes = 34; case 34: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { ptr = ctx->ParseMessage(_internal_mutable_clothes(), ptr); CHK_(ptr); } else @@ -4548,7 +4536,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagDefaultAction default_action = 35; case 35: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { ptr = ctx->ParseMessage(_internal_mutable_default_action(), ptr); CHK_(ptr); } else @@ -4556,7 +4544,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagMarket market = 36; case 36: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) { ptr = ctx->ParseMessage(_internal_mutable_market(), ptr); CHK_(ptr); } else @@ -4564,7 +4552,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool wrap = 37; case 37: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { _Internal::set_has_wrap(&_has_bits_); wrap_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4573,7 +4561,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool unwrap = 38; case 38: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 48)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 48)) { _Internal::set_has_unwrap(&_has_bits_); unwrap_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4582,7 +4570,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool topeffect = 39; case 39: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 56)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 56)) { _Internal::set_has_topeffect(&_has_bits_); topeffect_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4591,7 +4579,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // repeated .Canary.protobuf.appearances.AppearanceFlagNPC npcsaledata = 40; case 40: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 66)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 66)) { ptr -= 2; do { ptr += 2; @@ -4604,7 +4592,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagChangedToExpire changedtoexpire = 41; case 41: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 74)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 74)) { ptr = ctx->ParseMessage(_internal_mutable_changedtoexpire(), ptr); CHK_(ptr); } else @@ -4612,7 +4600,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool corpse = 42; case 42: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 80)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 80)) { _Internal::set_has_corpse(&_has_bits_); corpse_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4621,7 +4609,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool player_corpse = 43; case 43: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 88)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 88)) { _Internal::set_has_player_corpse(&_has_bits_); player_corpse_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4630,7 +4618,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagCyclopedia cyclopediaitem = 44; case 44: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 98)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 98)) { ptr = ctx->ParseMessage(_internal_mutable_cyclopediaitem(), ptr); CHK_(ptr); } else @@ -4638,7 +4626,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool ammo = 45; case 45: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 104)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 104)) { _Internal::set_has_ammo(&_has_bits_); ammo_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4647,7 +4635,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool show_off_socket = 46; case 46: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 112)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 112)) { _Internal::set_has_show_off_socket(&_has_bits_); show_off_socket_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4656,7 +4644,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool reportable = 47; case 47: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 120)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 120)) { _Internal::set_has_reportable(&_has_bits_); reportable_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4665,7 +4653,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagUpgradeClassification upgradeclassification = 48; case 48: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 130)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 130)) { ptr = ctx->ParseMessage(_internal_mutable_upgradeclassification(), ptr); CHK_(ptr); } else @@ -4694,10 +4682,10 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC #undef CHK_ } -uint8_t* AppearanceFlags::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlags::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlags) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -5047,7 +5035,7 @@ size_t AppearanceFlags::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlags) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -5356,7 +5344,7 @@ void AppearanceFlags::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlags::MergeFrom(const AppearanceFlags& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlags) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; npcsaledata_.MergeFrom(from.npcsaledata_); @@ -5581,7 +5569,7 @@ AppearanceFlagUpgradeClassification::AppearanceFlagUpgradeClassification(const A // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification) } -inline void AppearanceFlagUpgradeClassification::SharedCtor() { +void AppearanceFlagUpgradeClassification::SharedCtor() { upgrade_classification_ = 0u; } @@ -5608,7 +5596,7 @@ void AppearanceFlagUpgradeClassification::SetCachedSize(int size) const { void AppearanceFlagUpgradeClassification::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -5621,12 +5609,12 @@ const char* AppearanceFlagUpgradeClassification::_InternalParse(const char* ptr, #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 upgrade_classification = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_upgrade_classification(&has_bits); upgrade_classification_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -5657,10 +5645,10 @@ const char* AppearanceFlagUpgradeClassification::_InternalParse(const char* ptr, #undef CHK_ } -uint8_t* AppearanceFlagUpgradeClassification::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagUpgradeClassification::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -5682,7 +5670,7 @@ size_t AppearanceFlagUpgradeClassification::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -5711,7 +5699,7 @@ void AppearanceFlagUpgradeClassification::MergeImpl(::PROTOBUF_NAMESPACE_ID::Mes void AppearanceFlagUpgradeClassification::MergeFrom(const AppearanceFlagUpgradeClassification& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_upgrade_classification()) { @@ -5771,7 +5759,7 @@ AppearanceFlagBank::AppearanceFlagBank(const AppearanceFlagBank& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagBank) } -inline void AppearanceFlagBank::SharedCtor() { +void AppearanceFlagBank::SharedCtor() { waypoints_ = 0u; } @@ -5798,7 +5786,7 @@ void AppearanceFlagBank::SetCachedSize(int size) const { void AppearanceFlagBank::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagBank) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -5811,12 +5799,12 @@ const char* AppearanceFlagBank::_InternalParse(const char* ptr, ::PROTOBUF_NAMES #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 waypoints = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_waypoints(&has_bits); waypoints_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -5847,10 +5835,10 @@ const char* AppearanceFlagBank::_InternalParse(const char* ptr, ::PROTOBUF_NAMES #undef CHK_ } -uint8_t* AppearanceFlagBank::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagBank::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagBank) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -5872,7 +5860,7 @@ size_t AppearanceFlagBank::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagBank) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -5901,7 +5889,7 @@ void AppearanceFlagBank::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagBank::MergeFrom(const AppearanceFlagBank& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagBank) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_waypoints()) { @@ -5961,7 +5949,7 @@ AppearanceFlagWrite::AppearanceFlagWrite(const AppearanceFlagWrite& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagWrite) } -inline void AppearanceFlagWrite::SharedCtor() { +void AppearanceFlagWrite::SharedCtor() { max_text_length_ = 0u; } @@ -5988,7 +5976,7 @@ void AppearanceFlagWrite::SetCachedSize(int size) const { void AppearanceFlagWrite::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagWrite) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6001,12 +5989,12 @@ const char* AppearanceFlagWrite::_InternalParse(const char* ptr, ::PROTOBUF_NAME #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 max_text_length = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_max_text_length(&has_bits); max_text_length_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -6037,10 +6025,10 @@ const char* AppearanceFlagWrite::_InternalParse(const char* ptr, ::PROTOBUF_NAME #undef CHK_ } -uint8_t* AppearanceFlagWrite::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagWrite::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagWrite) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -6062,7 +6050,7 @@ size_t AppearanceFlagWrite::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagWrite) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6091,7 +6079,7 @@ void AppearanceFlagWrite::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagWrite::MergeFrom(const AppearanceFlagWrite& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagWrite) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_max_text_length()) { @@ -6151,7 +6139,7 @@ AppearanceFlagWriteOnce::AppearanceFlagWriteOnce(const AppearanceFlagWriteOnce& // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagWriteOnce) } -inline void AppearanceFlagWriteOnce::SharedCtor() { +void AppearanceFlagWriteOnce::SharedCtor() { max_text_length_once_ = 0u; } @@ -6178,7 +6166,7 @@ void AppearanceFlagWriteOnce::SetCachedSize(int size) const { void AppearanceFlagWriteOnce::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagWriteOnce) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6191,12 +6179,12 @@ const char* AppearanceFlagWriteOnce::_InternalParse(const char* ptr, ::PROTOBUF_ #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 max_text_length_once = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_max_text_length_once(&has_bits); max_text_length_once_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -6227,10 +6215,10 @@ const char* AppearanceFlagWriteOnce::_InternalParse(const char* ptr, ::PROTOBUF_ #undef CHK_ } -uint8_t* AppearanceFlagWriteOnce::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagWriteOnce::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagWriteOnce) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -6252,7 +6240,7 @@ size_t AppearanceFlagWriteOnce::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagWriteOnce) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6281,7 +6269,7 @@ void AppearanceFlagWriteOnce::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagWriteOnce::MergeFrom(const AppearanceFlagWriteOnce& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagWriteOnce) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_max_text_length_once()) { @@ -6346,7 +6334,7 @@ AppearanceFlagLight::AppearanceFlagLight(const AppearanceFlagLight& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagLight) } -inline void AppearanceFlagLight::SharedCtor() { +void AppearanceFlagLight::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&brightness_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&color_) - @@ -6376,7 +6364,7 @@ void AppearanceFlagLight::SetCachedSize(int size) const { void AppearanceFlagLight::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagLight) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6394,12 +6382,12 @@ const char* AppearanceFlagLight::_InternalParse(const char* ptr, ::PROTOBUF_NAME #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 brightness = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_brightness(&has_bits); brightness_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -6408,7 +6396,7 @@ const char* AppearanceFlagLight::_InternalParse(const char* ptr, ::PROTOBUF_NAME continue; // optional uint32 color = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { _Internal::set_has_color(&has_bits); color_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -6439,10 +6427,10 @@ const char* AppearanceFlagLight::_InternalParse(const char* ptr, ::PROTOBUF_NAME #undef CHK_ } -uint8_t* AppearanceFlagLight::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagLight::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagLight) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -6470,7 +6458,7 @@ size_t AppearanceFlagLight::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagLight) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6506,7 +6494,7 @@ void AppearanceFlagLight::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagLight::MergeFrom(const AppearanceFlagLight& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagLight) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; @@ -6578,7 +6566,7 @@ AppearanceFlagHeight::AppearanceFlagHeight(const AppearanceFlagHeight& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagHeight) } -inline void AppearanceFlagHeight::SharedCtor() { +void AppearanceFlagHeight::SharedCtor() { elevation_ = 0u; } @@ -6605,7 +6593,7 @@ void AppearanceFlagHeight::SetCachedSize(int size) const { void AppearanceFlagHeight::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagHeight) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6618,12 +6606,12 @@ const char* AppearanceFlagHeight::_InternalParse(const char* ptr, ::PROTOBUF_NAM #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 elevation = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_elevation(&has_bits); elevation_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -6654,10 +6642,10 @@ const char* AppearanceFlagHeight::_InternalParse(const char* ptr, ::PROTOBUF_NAM #undef CHK_ } -uint8_t* AppearanceFlagHeight::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagHeight::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagHeight) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -6679,7 +6667,7 @@ size_t AppearanceFlagHeight::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagHeight) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6708,7 +6696,7 @@ void AppearanceFlagHeight::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagHeight::MergeFrom(const AppearanceFlagHeight& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagHeight) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_elevation()) { @@ -6773,7 +6761,7 @@ AppearanceFlagShift::AppearanceFlagShift(const AppearanceFlagShift& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagShift) } -inline void AppearanceFlagShift::SharedCtor() { +void AppearanceFlagShift::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&x_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&y_) - @@ -6803,7 +6791,7 @@ void AppearanceFlagShift::SetCachedSize(int size) const { void AppearanceFlagShift::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagShift) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6821,12 +6809,12 @@ const char* AppearanceFlagShift::_InternalParse(const char* ptr, ::PROTOBUF_NAME #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 x = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_x(&has_bits); x_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -6835,7 +6823,7 @@ const char* AppearanceFlagShift::_InternalParse(const char* ptr, ::PROTOBUF_NAME continue; // optional uint32 y = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { _Internal::set_has_y(&has_bits); y_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -6866,10 +6854,10 @@ const char* AppearanceFlagShift::_InternalParse(const char* ptr, ::PROTOBUF_NAME #undef CHK_ } -uint8_t* AppearanceFlagShift::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagShift::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagShift) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -6897,7 +6885,7 @@ size_t AppearanceFlagShift::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagShift) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6933,7 +6921,7 @@ void AppearanceFlagShift::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagShift::MergeFrom(const AppearanceFlagShift& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagShift) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; @@ -7005,7 +6993,7 @@ AppearanceFlagClothes::AppearanceFlagClothes(const AppearanceFlagClothes& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagClothes) } -inline void AppearanceFlagClothes::SharedCtor() { +void AppearanceFlagClothes::SharedCtor() { slot_ = 0u; } @@ -7032,7 +7020,7 @@ void AppearanceFlagClothes::SetCachedSize(int size) const { void AppearanceFlagClothes::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagClothes) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -7045,12 +7033,12 @@ const char* AppearanceFlagClothes::_InternalParse(const char* ptr, ::PROTOBUF_NA #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 slot = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_slot(&has_bits); slot_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -7081,10 +7069,10 @@ const char* AppearanceFlagClothes::_InternalParse(const char* ptr, ::PROTOBUF_NA #undef CHK_ } -uint8_t* AppearanceFlagClothes::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagClothes::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagClothes) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -7106,7 +7094,7 @@ size_t AppearanceFlagClothes::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagClothes) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -7135,7 +7123,7 @@ void AppearanceFlagClothes::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagClothes::MergeFrom(const AppearanceFlagClothes& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagClothes) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_slot()) { @@ -7195,7 +7183,7 @@ AppearanceFlagDefaultAction::AppearanceFlagDefaultAction(const AppearanceFlagDef // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagDefaultAction) } -inline void AppearanceFlagDefaultAction::SharedCtor() { +void AppearanceFlagDefaultAction::SharedCtor() { action_ = 0; } @@ -7222,7 +7210,7 @@ void AppearanceFlagDefaultAction::SetCachedSize(int size) const { void AppearanceFlagDefaultAction::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagDefaultAction) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -7235,13 +7223,13 @@ const char* AppearanceFlagDefaultAction::_InternalParse(const char* ptr, ::PROTO #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional .Canary.protobuf.appearances.PLAYER_ACTION action = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); if (PROTOBUF_PREDICT_TRUE(::Canary::protobuf::appearances::PLAYER_ACTION_IsValid(val))) { _internal_set_action(static_cast<::Canary::protobuf::appearances::PLAYER_ACTION>(val)); @@ -7275,10 +7263,10 @@ const char* AppearanceFlagDefaultAction::_InternalParse(const char* ptr, ::PROTO #undef CHK_ } -uint8_t* AppearanceFlagDefaultAction::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagDefaultAction::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagDefaultAction) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -7301,7 +7289,7 @@ size_t AppearanceFlagDefaultAction::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagDefaultAction) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -7331,7 +7319,7 @@ void AppearanceFlagDefaultAction::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to void AppearanceFlagDefaultAction::MergeFrom(const AppearanceFlagDefaultAction& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagDefaultAction) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_action()) { @@ -7404,7 +7392,7 @@ AppearanceFlagMarket::AppearanceFlagMarket(const AppearanceFlagMarket& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagMarket) } -inline void AppearanceFlagMarket::SharedCtor() { +void AppearanceFlagMarket::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&trade_as_object_id_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&minimum_level_) - @@ -7435,7 +7423,7 @@ void AppearanceFlagMarket::SetCachedSize(int size) const { void AppearanceFlagMarket::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagMarket) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -7455,13 +7443,13 @@ const char* AppearanceFlagMarket::_InternalParse(const char* ptr, ::PROTOBUF_NAM #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional .Canary.protobuf.appearances.ITEM_CATEGORY category = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); if (PROTOBUF_PREDICT_TRUE(::Canary::protobuf::appearances::ITEM_CATEGORY_IsValid(val))) { _internal_set_category(static_cast<::Canary::protobuf::appearances::ITEM_CATEGORY>(val)); @@ -7473,7 +7461,7 @@ const char* AppearanceFlagMarket::_InternalParse(const char* ptr, ::PROTOBUF_NAM continue; // optional uint32 trade_as_object_id = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { _Internal::set_has_trade_as_object_id(&has_bits); trade_as_object_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -7482,7 +7470,7 @@ const char* AppearanceFlagMarket::_InternalParse(const char* ptr, ::PROTOBUF_NAM continue; // optional uint32 show_as_object_id = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { _Internal::set_has_show_as_object_id(&has_bits); show_as_object_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -7491,11 +7479,11 @@ const char* AppearanceFlagMarket::_InternalParse(const char* ptr, ::PROTOBUF_NAM continue; // repeated .Canary.protobuf.appearances.PLAYER_PROFESSION restrict_to_profession = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { ptr -= 1; do { ptr += 1; - uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); if (PROTOBUF_PREDICT_TRUE(::Canary::protobuf::appearances::PLAYER_PROFESSION_IsValid(val))) { _internal_add_restrict_to_profession(static_cast<::Canary::protobuf::appearances::PLAYER_PROFESSION>(val)); @@ -7504,7 +7492,7 @@ const char* AppearanceFlagMarket::_InternalParse(const char* ptr, ::PROTOBUF_NAM } if (!ctx->DataAvailable(ptr)) break; } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<40>(ptr)); - } else if (static_cast(tag) == 42) { + } else if (static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 42) { ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedEnumParser<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(_internal_mutable_restrict_to_profession(), ptr, ctx, ::Canary::protobuf::appearances::PLAYER_PROFESSION_IsValid, &_internal_metadata_, 5); CHK_(ptr); } else @@ -7512,7 +7500,7 @@ const char* AppearanceFlagMarket::_InternalParse(const char* ptr, ::PROTOBUF_NAM continue; // optional uint32 minimum_level = 6; case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 48)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 48)) { _Internal::set_has_minimum_level(&has_bits); minimum_level_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -7543,10 +7531,10 @@ const char* AppearanceFlagMarket::_InternalParse(const char* ptr, ::PROTOBUF_NAM #undef CHK_ } -uint8_t* AppearanceFlagMarket::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagMarket::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagMarket) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -7594,7 +7582,7 @@ size_t AppearanceFlagMarket::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagMarket) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -7651,7 +7639,7 @@ void AppearanceFlagMarket::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagMarket::MergeFrom(const AppearanceFlagMarket& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagMarket) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; restrict_to_profession_.MergeFrom(from.restrict_to_profession_); @@ -7744,25 +7732,16 @@ AppearanceFlagNPC::AppearanceFlagNPC(const AppearanceFlagNPC& from) _has_bits_(from._has_bits_) { _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING if (from._internal_has_name()) { name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_name(), GetArenaForAllocation()); } location_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - location_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING if (from._internal_has_location()) { location_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_location(), GetArenaForAllocation()); } currency_quest_flag_display_name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - currency_quest_flag_display_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING if (from._internal_has_currency_quest_flag_display_name()) { currency_quest_flag_display_name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_currency_quest_flag_display_name(), GetArenaForAllocation()); @@ -7773,19 +7752,10 @@ AppearanceFlagNPC::AppearanceFlagNPC(const AppearanceFlagNPC& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagNPC) } -inline void AppearanceFlagNPC::SharedCtor() { +void AppearanceFlagNPC::SharedCtor() { name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING location_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - location_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING currency_quest_flag_display_name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - currency_quest_flag_display_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&sale_price_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(¤cy_object_type_id_) - @@ -7818,7 +7788,7 @@ void AppearanceFlagNPC::SetCachedSize(int size) const { void AppearanceFlagNPC::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagNPC) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -7847,12 +7817,12 @@ const char* AppearanceFlagNPC::_InternalParse(const char* ptr, ::PROTOBUF_NAMESP #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional bytes name = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { auto str = _internal_mutable_name(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); @@ -7861,7 +7831,7 @@ const char* AppearanceFlagNPC::_InternalParse(const char* ptr, ::PROTOBUF_NAMESP continue; // optional bytes location = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { auto str = _internal_mutable_location(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); @@ -7870,7 +7840,7 @@ const char* AppearanceFlagNPC::_InternalParse(const char* ptr, ::PROTOBUF_NAMESP continue; // optional uint32 sale_price = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { _Internal::set_has_sale_price(&has_bits); sale_price_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -7879,7 +7849,7 @@ const char* AppearanceFlagNPC::_InternalParse(const char* ptr, ::PROTOBUF_NAMESP continue; // optional uint32 buy_price = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) { _Internal::set_has_buy_price(&has_bits); buy_price_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -7888,7 +7858,7 @@ const char* AppearanceFlagNPC::_InternalParse(const char* ptr, ::PROTOBUF_NAMESP continue; // optional uint32 currency_object_type_id = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { _Internal::set_has_currency_object_type_id(&has_bits); currency_object_type_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -7897,7 +7867,7 @@ const char* AppearanceFlagNPC::_InternalParse(const char* ptr, ::PROTOBUF_NAMESP continue; // optional bytes currency_quest_flag_display_name = 6; case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 50)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 50)) { auto str = _internal_mutable_currency_quest_flag_display_name(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); @@ -7928,10 +7898,10 @@ const char* AppearanceFlagNPC::_InternalParse(const char* ptr, ::PROTOBUF_NAMESP #undef CHK_ } -uint8_t* AppearanceFlagNPC::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagNPC::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagNPC) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -7983,7 +7953,7 @@ size_t AppearanceFlagNPC::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagNPC) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8045,7 +8015,7 @@ void AppearanceFlagNPC::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagNPC::MergeFrom(const AppearanceFlagNPC& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagNPC) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; @@ -8146,7 +8116,7 @@ AppearanceFlagAutomap::AppearanceFlagAutomap(const AppearanceFlagAutomap& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagAutomap) } -inline void AppearanceFlagAutomap::SharedCtor() { +void AppearanceFlagAutomap::SharedCtor() { color_ = 0u; } @@ -8173,7 +8143,7 @@ void AppearanceFlagAutomap::SetCachedSize(int size) const { void AppearanceFlagAutomap::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagAutomap) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8186,12 +8156,12 @@ const char* AppearanceFlagAutomap::_InternalParse(const char* ptr, ::PROTOBUF_NA #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 color = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_color(&has_bits); color_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -8222,10 +8192,10 @@ const char* AppearanceFlagAutomap::_InternalParse(const char* ptr, ::PROTOBUF_NA #undef CHK_ } -uint8_t* AppearanceFlagAutomap::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagAutomap::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagAutomap) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -8247,7 +8217,7 @@ size_t AppearanceFlagAutomap::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagAutomap) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8276,7 +8246,7 @@ void AppearanceFlagAutomap::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagAutomap::MergeFrom(const AppearanceFlagAutomap& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagAutomap) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_color()) { @@ -8336,7 +8306,7 @@ AppearanceFlagHook::AppearanceFlagHook(const AppearanceFlagHook& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagHook) } -inline void AppearanceFlagHook::SharedCtor() { +void AppearanceFlagHook::SharedCtor() { direction_ = 1; } @@ -8363,7 +8333,7 @@ void AppearanceFlagHook::SetCachedSize(int size) const { void AppearanceFlagHook::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagHook) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8376,13 +8346,13 @@ const char* AppearanceFlagHook::_InternalParse(const char* ptr, ::PROTOBUF_NAMES #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional .Canary.protobuf.appearances.HOOK_TYPE direction = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); if (PROTOBUF_PREDICT_TRUE(::Canary::protobuf::appearances::HOOK_TYPE_IsValid(val))) { _internal_set_direction(static_cast<::Canary::protobuf::appearances::HOOK_TYPE>(val)); @@ -8416,10 +8386,10 @@ const char* AppearanceFlagHook::_InternalParse(const char* ptr, ::PROTOBUF_NAMES #undef CHK_ } -uint8_t* AppearanceFlagHook::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagHook::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagHook) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -8442,7 +8412,7 @@ size_t AppearanceFlagHook::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagHook) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8472,7 +8442,7 @@ void AppearanceFlagHook::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagHook::MergeFrom(const AppearanceFlagHook& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagHook) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_direction()) { @@ -8532,7 +8502,7 @@ AppearanceFlagLenshelp::AppearanceFlagLenshelp(const AppearanceFlagLenshelp& fro // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagLenshelp) } -inline void AppearanceFlagLenshelp::SharedCtor() { +void AppearanceFlagLenshelp::SharedCtor() { id_ = 0u; } @@ -8559,7 +8529,7 @@ void AppearanceFlagLenshelp::SetCachedSize(int size) const { void AppearanceFlagLenshelp::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagLenshelp) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8572,12 +8542,12 @@ const char* AppearanceFlagLenshelp::_InternalParse(const char* ptr, ::PROTOBUF_N #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 id = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_id(&has_bits); id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -8608,10 +8578,10 @@ const char* AppearanceFlagLenshelp::_InternalParse(const char* ptr, ::PROTOBUF_N #undef CHK_ } -uint8_t* AppearanceFlagLenshelp::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagLenshelp::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagLenshelp) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -8633,7 +8603,7 @@ size_t AppearanceFlagLenshelp::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagLenshelp) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8662,7 +8632,7 @@ void AppearanceFlagLenshelp::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagLenshelp::MergeFrom(const AppearanceFlagLenshelp& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagLenshelp) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_id()) { @@ -8722,7 +8692,7 @@ AppearanceFlagChangedToExpire::AppearanceFlagChangedToExpire(const AppearanceFla // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagChangedToExpire) } -inline void AppearanceFlagChangedToExpire::SharedCtor() { +void AppearanceFlagChangedToExpire::SharedCtor() { former_object_typeid_ = 0u; } @@ -8749,7 +8719,7 @@ void AppearanceFlagChangedToExpire::SetCachedSize(int size) const { void AppearanceFlagChangedToExpire::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagChangedToExpire) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8762,12 +8732,12 @@ const char* AppearanceFlagChangedToExpire::_InternalParse(const char* ptr, ::PRO #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 former_object_typeid = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_former_object_typeid(&has_bits); former_object_typeid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -8798,10 +8768,10 @@ const char* AppearanceFlagChangedToExpire::_InternalParse(const char* ptr, ::PRO #undef CHK_ } -uint8_t* AppearanceFlagChangedToExpire::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagChangedToExpire::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagChangedToExpire) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -8823,7 +8793,7 @@ size_t AppearanceFlagChangedToExpire::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagChangedToExpire) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8852,7 +8822,7 @@ void AppearanceFlagChangedToExpire::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* void AppearanceFlagChangedToExpire::MergeFrom(const AppearanceFlagChangedToExpire& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagChangedToExpire) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_former_object_typeid()) { @@ -8912,7 +8882,7 @@ AppearanceFlagCyclopedia::AppearanceFlagCyclopedia(const AppearanceFlagCyclopedi // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagCyclopedia) } -inline void AppearanceFlagCyclopedia::SharedCtor() { +void AppearanceFlagCyclopedia::SharedCtor() { cyclopedia_type_ = 0u; } @@ -8939,7 +8909,7 @@ void AppearanceFlagCyclopedia::SetCachedSize(int size) const { void AppearanceFlagCyclopedia::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagCyclopedia) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8952,12 +8922,12 @@ const char* AppearanceFlagCyclopedia::_InternalParse(const char* ptr, ::PROTOBUF #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 cyclopedia_type = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_cyclopedia_type(&has_bits); cyclopedia_type_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -8988,10 +8958,10 @@ const char* AppearanceFlagCyclopedia::_InternalParse(const char* ptr, ::PROTOBUF #undef CHK_ } -uint8_t* AppearanceFlagCyclopedia::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagCyclopedia::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagCyclopedia) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -9013,7 +8983,7 @@ size_t AppearanceFlagCyclopedia::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagCyclopedia) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -9042,7 +9012,7 @@ void AppearanceFlagCyclopedia::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagCyclopedia::MergeFrom(const AppearanceFlagCyclopedia& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagCyclopedia) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_cyclopedia_type()) { @@ -9119,7 +9089,7 @@ SpecialMeaningAppearanceIds::SpecialMeaningAppearanceIds(const SpecialMeaningApp // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.SpecialMeaningAppearanceIds) } -inline void SpecialMeaningAppearanceIds::SharedCtor() { +void SpecialMeaningAppearanceIds::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&gold_coin_id_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&supply_stash_id_) - @@ -9149,7 +9119,7 @@ void SpecialMeaningAppearanceIds::SetCachedSize(int size) const { void SpecialMeaningAppearanceIds::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.SpecialMeaningAppearanceIds) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -9167,12 +9137,12 @@ const char* SpecialMeaningAppearanceIds::_InternalParse(const char* ptr, ::PROTO #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - uint32_t tag; + ::PROTOBUF_NAMESPACE_ID::uint32 tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 gold_coin_id = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { _Internal::set_has_gold_coin_id(&has_bits); gold_coin_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -9181,7 +9151,7 @@ const char* SpecialMeaningAppearanceIds::_InternalParse(const char* ptr, ::PROTO continue; // optional uint32 platinum_coin_id = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { _Internal::set_has_platinum_coin_id(&has_bits); platinum_coin_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -9190,7 +9160,7 @@ const char* SpecialMeaningAppearanceIds::_InternalParse(const char* ptr, ::PROTO continue; // optional uint32 crystal_coin_id = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { _Internal::set_has_crystal_coin_id(&has_bits); crystal_coin_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -9199,7 +9169,7 @@ const char* SpecialMeaningAppearanceIds::_InternalParse(const char* ptr, ::PROTO continue; // optional uint32 tibia_coin_id = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) { _Internal::set_has_tibia_coin_id(&has_bits); tibia_coin_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -9208,7 +9178,7 @@ const char* SpecialMeaningAppearanceIds::_InternalParse(const char* ptr, ::PROTO continue; // optional uint32 stamped_letter_id = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { _Internal::set_has_stamped_letter_id(&has_bits); stamped_letter_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -9217,7 +9187,7 @@ const char* SpecialMeaningAppearanceIds::_InternalParse(const char* ptr, ::PROTO continue; // optional uint32 supply_stash_id = 6; case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 48)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 48)) { _Internal::set_has_supply_stash_id(&has_bits); supply_stash_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -9248,10 +9218,10 @@ const char* SpecialMeaningAppearanceIds::_InternalParse(const char* ptr, ::PROTO #undef CHK_ } -uint8_t* SpecialMeaningAppearanceIds::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::PROTOBUF_NAMESPACE_ID::uint8* SpecialMeaningAppearanceIds::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.SpecialMeaningAppearanceIds) - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -9303,7 +9273,7 @@ size_t SpecialMeaningAppearanceIds::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.SpecialMeaningAppearanceIds) size_t total_size = 0; - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -9359,7 +9329,7 @@ void SpecialMeaningAppearanceIds::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to void SpecialMeaningAppearanceIds::MergeFrom(const SpecialMeaningAppearanceIds& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.SpecialMeaningAppearanceIds) GOOGLE_DCHECK_NE(&from, this); - uint32_t cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; diff --git a/src/protobuf/appearances.pb.h b/src/protobuf/appearances.pb.h index 870dc2f9779..8c8095587d2 100644 --- a/src/protobuf/appearances.pb.h +++ b/src/protobuf/appearances.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3019000 +#if PROTOBUF_VERSION < 3018000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019004 < PROTOBUF_MIN_PROTOC_VERSION +#if 3018000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. @@ -51,7 +51,7 @@ struct TableStruct_appearances_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[]; static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[]; - static const uint32_t offsets[]; + static const ::PROTOBUF_NAMESPACE_ID::uint32 offsets[]; }; extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_appearances_2eproto; namespace Canary { @@ -405,12 +405,7 @@ class Coordinate final : } inline void Swap(Coordinate* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -424,7 +419,11 @@ class Coordinate final : // implements Message ---------------------------------------------- - Coordinate* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline Coordinate* New() const final { + return new Coordinate(); + } + + Coordinate* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -439,8 +438,8 @@ class Coordinate final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -448,8 +447,6 @@ class Coordinate final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Coordinate* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.Coordinate"; @@ -482,11 +479,11 @@ class Coordinate final : bool _internal_has_x() const; public: void clear_x(); - uint32_t x() const; - void set_x(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 x() const; + void set_x(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_x() const; - void _internal_set_x(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_x() const; + void _internal_set_x(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 y = 2; @@ -495,11 +492,11 @@ class Coordinate final : bool _internal_has_y() const; public: void clear_y(); - uint32_t y() const; - void set_y(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 y() const; + void set_y(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_y() const; - void _internal_set_y(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_y() const; + void _internal_set_y(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 z = 3; @@ -508,11 +505,11 @@ class Coordinate final : bool _internal_has_z() const; public: void clear_z(); - uint32_t z() const; - void set_z(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 z() const; + void set_z(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_z() const; - void _internal_set_z(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_z() const; + void _internal_set_z(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.Coordinate) @@ -524,9 +521,9 @@ class Coordinate final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t x_; - uint32_t y_; - uint32_t z_; + ::PROTOBUF_NAMESPACE_ID::uint32 x_; + ::PROTOBUF_NAMESPACE_ID::uint32 y_; + ::PROTOBUF_NAMESPACE_ID::uint32 z_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -593,12 +590,7 @@ class Appearances final : } inline void Swap(Appearances* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -612,7 +604,11 @@ class Appearances final : // implements Message ---------------------------------------------- - Appearances* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline Appearances* New() const final { + return new Appearances(); + } + + Appearances* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -627,8 +623,8 @@ class Appearances final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -636,8 +632,6 @@ class Appearances final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Appearances* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.Appearances"; @@ -745,7 +739,7 @@ class Appearances final : public: void clear_special_meaning_appearance_ids(); const ::Canary::protobuf::appearances::SpecialMeaningAppearanceIds& special_meaning_appearance_ids() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::SpecialMeaningAppearanceIds* release_special_meaning_appearance_ids(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::SpecialMeaningAppearanceIds* release_special_meaning_appearance_ids(); ::Canary::protobuf::appearances::SpecialMeaningAppearanceIds* mutable_special_meaning_appearance_ids(); void set_allocated_special_meaning_appearance_ids(::Canary::protobuf::appearances::SpecialMeaningAppearanceIds* special_meaning_appearance_ids); private: @@ -836,12 +830,7 @@ class SpritePhase final : } inline void Swap(SpritePhase* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -855,7 +844,11 @@ class SpritePhase final : // implements Message ---------------------------------------------- - SpritePhase* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline SpritePhase* New() const final { + return new SpritePhase(); + } + + SpritePhase* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -870,8 +863,8 @@ class SpritePhase final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -879,8 +872,6 @@ class SpritePhase final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(SpritePhase* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.SpritePhase"; @@ -912,11 +903,11 @@ class SpritePhase final : bool _internal_has_duration_min() const; public: void clear_duration_min(); - uint32_t duration_min() const; - void set_duration_min(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 duration_min() const; + void set_duration_min(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_duration_min() const; - void _internal_set_duration_min(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_duration_min() const; + void _internal_set_duration_min(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 duration_max = 2; @@ -925,11 +916,11 @@ class SpritePhase final : bool _internal_has_duration_max() const; public: void clear_duration_max(); - uint32_t duration_max() const; - void set_duration_max(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 duration_max() const; + void set_duration_max(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_duration_max() const; - void _internal_set_duration_max(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_duration_max() const; + void _internal_set_duration_max(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.SpritePhase) @@ -941,8 +932,8 @@ class SpritePhase final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t duration_min_; - uint32_t duration_max_; + ::PROTOBUF_NAMESPACE_ID::uint32 duration_min_; + ::PROTOBUF_NAMESPACE_ID::uint32 duration_max_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -1009,12 +1000,7 @@ class SpriteAnimation final : } inline void Swap(SpriteAnimation* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -1028,7 +1014,11 @@ class SpriteAnimation final : // implements Message ---------------------------------------------- - SpriteAnimation* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline SpriteAnimation* New() const final { + return new SpriteAnimation(); + } + + SpriteAnimation* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -1043,8 +1033,8 @@ class SpriteAnimation final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -1052,8 +1042,6 @@ class SpriteAnimation final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(SpriteAnimation* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.SpriteAnimation"; @@ -1107,11 +1095,11 @@ class SpriteAnimation final : bool _internal_has_default_start_phase() const; public: void clear_default_start_phase(); - uint32_t default_start_phase() const; - void set_default_start_phase(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 default_start_phase() const; + void set_default_start_phase(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_default_start_phase() const; - void _internal_set_default_start_phase(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_default_start_phase() const; + void _internal_set_default_start_phase(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional bool synchronized = 2; @@ -1146,11 +1134,11 @@ class SpriteAnimation final : bool _internal_has_loop_count() const; public: void clear_loop_count(); - uint32_t loop_count() const; - void set_loop_count(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 loop_count() const; + void set_loop_count(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_loop_count() const; - void _internal_set_loop_count(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_loop_count() const; + void _internal_set_loop_count(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional .Canary.protobuf.appearances.ANIMATION_LOOP_TYPE loop_type = 4; @@ -1176,10 +1164,10 @@ class SpriteAnimation final : ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Canary::protobuf::appearances::SpritePhase > sprite_phase_; - uint32_t default_start_phase_; + ::PROTOBUF_NAMESPACE_ID::uint32 default_start_phase_; bool synchronized_; bool random_start_phase_; - uint32_t loop_count_; + ::PROTOBUF_NAMESPACE_ID::uint32 loop_count_; int loop_type_; friend struct ::TableStruct_appearances_2eproto; }; @@ -1247,12 +1235,7 @@ class Box final : } inline void Swap(Box* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -1266,7 +1249,11 @@ class Box final : // implements Message ---------------------------------------------- - Box* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline Box* New() const final { + return new Box(); + } + + Box* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -1281,8 +1268,8 @@ class Box final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -1290,8 +1277,6 @@ class Box final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Box* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.Box"; @@ -1325,11 +1310,11 @@ class Box final : bool _internal_has_x() const; public: void clear_x(); - uint32_t x() const; - void set_x(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 x() const; + void set_x(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_x() const; - void _internal_set_x(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_x() const; + void _internal_set_x(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 y = 2; @@ -1338,11 +1323,11 @@ class Box final : bool _internal_has_y() const; public: void clear_y(); - uint32_t y() const; - void set_y(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 y() const; + void set_y(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_y() const; - void _internal_set_y(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_y() const; + void _internal_set_y(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 width = 3; @@ -1351,11 +1336,11 @@ class Box final : bool _internal_has_width() const; public: void clear_width(); - uint32_t width() const; - void set_width(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 width() const; + void set_width(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_width() const; - void _internal_set_width(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_width() const; + void _internal_set_width(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 height = 4; @@ -1364,11 +1349,11 @@ class Box final : bool _internal_has_height() const; public: void clear_height(); - uint32_t height() const; - void set_height(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 height() const; + void set_height(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_height() const; - void _internal_set_height(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_height() const; + void _internal_set_height(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.Box) @@ -1380,10 +1365,10 @@ class Box final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t x_; - uint32_t y_; - uint32_t width_; - uint32_t height_; + ::PROTOBUF_NAMESPACE_ID::uint32 x_; + ::PROTOBUF_NAMESPACE_ID::uint32 y_; + ::PROTOBUF_NAMESPACE_ID::uint32 width_; + ::PROTOBUF_NAMESPACE_ID::uint32 height_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -1450,12 +1435,7 @@ class SpriteInfo final : } inline void Swap(SpriteInfo* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -1469,7 +1449,11 @@ class SpriteInfo final : // implements Message ---------------------------------------------- - SpriteInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline SpriteInfo* New() const final { + return new SpriteInfo(); + } + + SpriteInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -1484,8 +1468,8 @@ class SpriteInfo final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -1493,8 +1477,6 @@ class SpriteInfo final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(SpriteInfo* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.SpriteInfo"; @@ -1534,19 +1516,19 @@ class SpriteInfo final : public: void clear_sprite_id(); private: - uint32_t _internal_sprite_id(int index) const; - const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >& + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_sprite_id(int index) const; + const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >& _internal_sprite_id() const; - void _internal_add_sprite_id(uint32_t value); - ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >* + void _internal_add_sprite_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >* _internal_mutable_sprite_id(); public: - uint32_t sprite_id(int index) const; - void set_sprite_id(int index, uint32_t value); - void add_sprite_id(uint32_t value); - const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >& + ::PROTOBUF_NAMESPACE_ID::uint32 sprite_id(int index) const; + void set_sprite_id(int index, ::PROTOBUF_NAMESPACE_ID::uint32 value); + void add_sprite_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >& sprite_id() const; - ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >* + ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >* mutable_sprite_id(); // repeated .Canary.protobuf.appearances.Box bounding_box_per_direction = 9; @@ -1574,7 +1556,7 @@ class SpriteInfo final : public: void clear_animation(); const ::Canary::protobuf::appearances::SpriteAnimation& animation() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::SpriteAnimation* release_animation(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::SpriteAnimation* release_animation(); ::Canary::protobuf::appearances::SpriteAnimation* mutable_animation(); void set_allocated_animation(::Canary::protobuf::appearances::SpriteAnimation* animation); private: @@ -1591,11 +1573,11 @@ class SpriteInfo final : bool _internal_has_pattern_width() const; public: void clear_pattern_width(); - uint32_t pattern_width() const; - void set_pattern_width(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 pattern_width() const; + void set_pattern_width(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_pattern_width() const; - void _internal_set_pattern_width(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_pattern_width() const; + void _internal_set_pattern_width(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 pattern_height = 2; @@ -1604,11 +1586,11 @@ class SpriteInfo final : bool _internal_has_pattern_height() const; public: void clear_pattern_height(); - uint32_t pattern_height() const; - void set_pattern_height(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 pattern_height() const; + void set_pattern_height(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_pattern_height() const; - void _internal_set_pattern_height(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_pattern_height() const; + void _internal_set_pattern_height(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 pattern_depth = 3; @@ -1617,11 +1599,11 @@ class SpriteInfo final : bool _internal_has_pattern_depth() const; public: void clear_pattern_depth(); - uint32_t pattern_depth() const; - void set_pattern_depth(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 pattern_depth() const; + void set_pattern_depth(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_pattern_depth() const; - void _internal_set_pattern_depth(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_pattern_depth() const; + void _internal_set_pattern_depth(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 layers = 4; @@ -1630,11 +1612,11 @@ class SpriteInfo final : bool _internal_has_layers() const; public: void clear_layers(); - uint32_t layers() const; - void set_layers(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 layers() const; + void set_layers(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_layers() const; - void _internal_set_layers(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_layers() const; + void _internal_set_layers(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 bounding_square = 7; @@ -1643,11 +1625,11 @@ class SpriteInfo final : bool _internal_has_bounding_square() const; public: void clear_bounding_square(); - uint32_t bounding_square() const; - void set_bounding_square(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 bounding_square() const; + void set_bounding_square(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_bounding_square() const; - void _internal_set_bounding_square(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_bounding_square() const; + void _internal_set_bounding_square(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional bool is_opaque = 8; @@ -1672,14 +1654,14 @@ class SpriteInfo final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t > sprite_id_; + ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 > sprite_id_; ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Canary::protobuf::appearances::Box > bounding_box_per_direction_; ::Canary::protobuf::appearances::SpriteAnimation* animation_; - uint32_t pattern_width_; - uint32_t pattern_height_; - uint32_t pattern_depth_; - uint32_t layers_; - uint32_t bounding_square_; + ::PROTOBUF_NAMESPACE_ID::uint32 pattern_width_; + ::PROTOBUF_NAMESPACE_ID::uint32 pattern_height_; + ::PROTOBUF_NAMESPACE_ID::uint32 pattern_depth_; + ::PROTOBUF_NAMESPACE_ID::uint32 layers_; + ::PROTOBUF_NAMESPACE_ID::uint32 bounding_square_; bool is_opaque_; friend struct ::TableStruct_appearances_2eproto; }; @@ -1747,12 +1729,7 @@ class FrameGroup final : } inline void Swap(FrameGroup* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -1766,7 +1743,11 @@ class FrameGroup final : // implements Message ---------------------------------------------- - FrameGroup* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline FrameGroup* New() const final { + return new FrameGroup(); + } + + FrameGroup* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -1781,8 +1762,8 @@ class FrameGroup final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -1790,8 +1771,6 @@ class FrameGroup final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(FrameGroup* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.FrameGroup"; @@ -1825,7 +1804,7 @@ class FrameGroup final : public: void clear_sprite_info(); const ::Canary::protobuf::appearances::SpriteInfo& sprite_info() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::SpriteInfo* release_sprite_info(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::SpriteInfo* release_sprite_info(); ::Canary::protobuf::appearances::SpriteInfo* mutable_sprite_info(); void set_allocated_sprite_info(::Canary::protobuf::appearances::SpriteInfo* sprite_info); private: @@ -1855,11 +1834,11 @@ class FrameGroup final : bool _internal_has_id() const; public: void clear_id(); - uint32_t id() const; - void set_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 id() const; + void set_id(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_id() const; - void _internal_set_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_id() const; + void _internal_set_id(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.FrameGroup) @@ -1873,7 +1852,7 @@ class FrameGroup final : mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; ::Canary::protobuf::appearances::SpriteInfo* sprite_info_; int fixed_frame_group_; - uint32_t id_; + ::PROTOBUF_NAMESPACE_ID::uint32 id_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -1940,12 +1919,7 @@ class Appearance final : } inline void Swap(Appearance* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -1959,7 +1933,11 @@ class Appearance final : // implements Message ---------------------------------------------- - Appearance* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline Appearance* New() const final { + return new Appearance(); + } + + Appearance* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -1974,8 +1952,8 @@ class Appearance final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -1983,8 +1961,6 @@ class Appearance final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Appearance* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.Appearance"; @@ -2041,7 +2017,7 @@ class Appearance final : template void set_name(ArgT0&& arg0, ArgT... args); std::string* mutable_name(); - PROTOBUF_NODISCARD std::string* release_name(); + PROTOBUF_MUST_USE_RESULT std::string* release_name(); void set_allocated_name(std::string* name); private: const std::string& _internal_name() const; @@ -2059,7 +2035,7 @@ class Appearance final : template void set_description(ArgT0&& arg0, ArgT... args); std::string* mutable_description(); - PROTOBUF_NODISCARD std::string* release_description(); + PROTOBUF_MUST_USE_RESULT std::string* release_description(); void set_allocated_description(std::string* description); private: const std::string& _internal_description() const; @@ -2074,7 +2050,7 @@ class Appearance final : public: void clear_flags(); const ::Canary::protobuf::appearances::AppearanceFlags& flags() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlags* release_flags(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlags* release_flags(); ::Canary::protobuf::appearances::AppearanceFlags* mutable_flags(); void set_allocated_flags(::Canary::protobuf::appearances::AppearanceFlags* flags); private: @@ -2091,11 +2067,11 @@ class Appearance final : bool _internal_has_id() const; public: void clear_id(); - uint32_t id() const; - void set_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 id() const; + void set_id(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_id() const; - void _internal_set_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_id() const; + void _internal_set_id(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.Appearance) @@ -2111,7 +2087,7 @@ class Appearance final : ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr description_; ::Canary::protobuf::appearances::AppearanceFlags* flags_; - uint32_t id_; + ::PROTOBUF_NAMESPACE_ID::uint32 id_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -2178,12 +2154,7 @@ class AppearanceFlags final : } inline void Swap(AppearanceFlags* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -2197,7 +2168,11 @@ class AppearanceFlags final : // implements Message ---------------------------------------------- - AppearanceFlags* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlags* New() const final { + return new AppearanceFlags(); + } + + AppearanceFlags* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -2212,8 +2187,8 @@ class AppearanceFlags final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -2221,8 +2196,6 @@ class AppearanceFlags final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlags* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlags"; @@ -2319,7 +2292,7 @@ class AppearanceFlags final : public: void clear_bank(); const ::Canary::protobuf::appearances::AppearanceFlagBank& bank() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagBank* release_bank(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagBank* release_bank(); ::Canary::protobuf::appearances::AppearanceFlagBank* mutable_bank(); void set_allocated_bank(::Canary::protobuf::appearances::AppearanceFlagBank* bank); private: @@ -2337,7 +2310,7 @@ class AppearanceFlags final : public: void clear_write(); const ::Canary::protobuf::appearances::AppearanceFlagWrite& write() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagWrite* release_write(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagWrite* release_write(); ::Canary::protobuf::appearances::AppearanceFlagWrite* mutable_write(); void set_allocated_write(::Canary::protobuf::appearances::AppearanceFlagWrite* write); private: @@ -2355,7 +2328,7 @@ class AppearanceFlags final : public: void clear_write_once(); const ::Canary::protobuf::appearances::AppearanceFlagWriteOnce& write_once() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagWriteOnce* release_write_once(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagWriteOnce* release_write_once(); ::Canary::protobuf::appearances::AppearanceFlagWriteOnce* mutable_write_once(); void set_allocated_write_once(::Canary::protobuf::appearances::AppearanceFlagWriteOnce* write_once); private: @@ -2373,7 +2346,7 @@ class AppearanceFlags final : public: void clear_hook(); const ::Canary::protobuf::appearances::AppearanceFlagHook& hook() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagHook* release_hook(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagHook* release_hook(); ::Canary::protobuf::appearances::AppearanceFlagHook* mutable_hook(); void set_allocated_hook(::Canary::protobuf::appearances::AppearanceFlagHook* hook); private: @@ -2391,7 +2364,7 @@ class AppearanceFlags final : public: void clear_light(); const ::Canary::protobuf::appearances::AppearanceFlagLight& light() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagLight* release_light(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagLight* release_light(); ::Canary::protobuf::appearances::AppearanceFlagLight* mutable_light(); void set_allocated_light(::Canary::protobuf::appearances::AppearanceFlagLight* light); private: @@ -2409,7 +2382,7 @@ class AppearanceFlags final : public: void clear_shift(); const ::Canary::protobuf::appearances::AppearanceFlagShift& shift() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagShift* release_shift(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagShift* release_shift(); ::Canary::protobuf::appearances::AppearanceFlagShift* mutable_shift(); void set_allocated_shift(::Canary::protobuf::appearances::AppearanceFlagShift* shift); private: @@ -2427,7 +2400,7 @@ class AppearanceFlags final : public: void clear_height(); const ::Canary::protobuf::appearances::AppearanceFlagHeight& height() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagHeight* release_height(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagHeight* release_height(); ::Canary::protobuf::appearances::AppearanceFlagHeight* mutable_height(); void set_allocated_height(::Canary::protobuf::appearances::AppearanceFlagHeight* height); private: @@ -2445,7 +2418,7 @@ class AppearanceFlags final : public: void clear_automap(); const ::Canary::protobuf::appearances::AppearanceFlagAutomap& automap() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagAutomap* release_automap(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagAutomap* release_automap(); ::Canary::protobuf::appearances::AppearanceFlagAutomap* mutable_automap(); void set_allocated_automap(::Canary::protobuf::appearances::AppearanceFlagAutomap* automap); private: @@ -2463,7 +2436,7 @@ class AppearanceFlags final : public: void clear_lenshelp(); const ::Canary::protobuf::appearances::AppearanceFlagLenshelp& lenshelp() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagLenshelp* release_lenshelp(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagLenshelp* release_lenshelp(); ::Canary::protobuf::appearances::AppearanceFlagLenshelp* mutable_lenshelp(); void set_allocated_lenshelp(::Canary::protobuf::appearances::AppearanceFlagLenshelp* lenshelp); private: @@ -2481,7 +2454,7 @@ class AppearanceFlags final : public: void clear_clothes(); const ::Canary::protobuf::appearances::AppearanceFlagClothes& clothes() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagClothes* release_clothes(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagClothes* release_clothes(); ::Canary::protobuf::appearances::AppearanceFlagClothes* mutable_clothes(); void set_allocated_clothes(::Canary::protobuf::appearances::AppearanceFlagClothes* clothes); private: @@ -2499,7 +2472,7 @@ class AppearanceFlags final : public: void clear_default_action(); const ::Canary::protobuf::appearances::AppearanceFlagDefaultAction& default_action() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagDefaultAction* release_default_action(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagDefaultAction* release_default_action(); ::Canary::protobuf::appearances::AppearanceFlagDefaultAction* mutable_default_action(); void set_allocated_default_action(::Canary::protobuf::appearances::AppearanceFlagDefaultAction* default_action); private: @@ -2517,7 +2490,7 @@ class AppearanceFlags final : public: void clear_market(); const ::Canary::protobuf::appearances::AppearanceFlagMarket& market() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagMarket* release_market(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagMarket* release_market(); ::Canary::protobuf::appearances::AppearanceFlagMarket* mutable_market(); void set_allocated_market(::Canary::protobuf::appearances::AppearanceFlagMarket* market); private: @@ -2535,7 +2508,7 @@ class AppearanceFlags final : public: void clear_changedtoexpire(); const ::Canary::protobuf::appearances::AppearanceFlagChangedToExpire& changedtoexpire() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagChangedToExpire* release_changedtoexpire(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagChangedToExpire* release_changedtoexpire(); ::Canary::protobuf::appearances::AppearanceFlagChangedToExpire* mutable_changedtoexpire(); void set_allocated_changedtoexpire(::Canary::protobuf::appearances::AppearanceFlagChangedToExpire* changedtoexpire); private: @@ -2553,7 +2526,7 @@ class AppearanceFlags final : public: void clear_cyclopediaitem(); const ::Canary::protobuf::appearances::AppearanceFlagCyclopedia& cyclopediaitem() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagCyclopedia* release_cyclopediaitem(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagCyclopedia* release_cyclopediaitem(); ::Canary::protobuf::appearances::AppearanceFlagCyclopedia* mutable_cyclopediaitem(); void set_allocated_cyclopediaitem(::Canary::protobuf::appearances::AppearanceFlagCyclopedia* cyclopediaitem); private: @@ -2571,7 +2544,7 @@ class AppearanceFlags final : public: void clear_upgradeclassification(); const ::Canary::protobuf::appearances::AppearanceFlagUpgradeClassification& upgradeclassification() const; - PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagUpgradeClassification* release_upgradeclassification(); + PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagUpgradeClassification* release_upgradeclassification(); ::Canary::protobuf::appearances::AppearanceFlagUpgradeClassification* mutable_upgradeclassification(); void set_allocated_upgradeclassification(::Canary::protobuf::appearances::AppearanceFlagUpgradeClassification* upgradeclassification); private: @@ -3121,12 +3094,7 @@ class AppearanceFlagUpgradeClassification final : } inline void Swap(AppearanceFlagUpgradeClassification* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -3140,7 +3108,11 @@ class AppearanceFlagUpgradeClassification final : // implements Message ---------------------------------------------- - AppearanceFlagUpgradeClassification* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagUpgradeClassification* New() const final { + return new AppearanceFlagUpgradeClassification(); + } + + AppearanceFlagUpgradeClassification* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -3155,8 +3127,8 @@ class AppearanceFlagUpgradeClassification final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -3164,8 +3136,6 @@ class AppearanceFlagUpgradeClassification final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagUpgradeClassification* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagUpgradeClassification"; @@ -3196,11 +3166,11 @@ class AppearanceFlagUpgradeClassification final : bool _internal_has_upgrade_classification() const; public: void clear_upgrade_classification(); - uint32_t upgrade_classification() const; - void set_upgrade_classification(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 upgrade_classification() const; + void set_upgrade_classification(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_upgrade_classification() const; - void _internal_set_upgrade_classification(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_upgrade_classification() const; + void _internal_set_upgrade_classification(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification) @@ -3212,7 +3182,7 @@ class AppearanceFlagUpgradeClassification final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t upgrade_classification_; + ::PROTOBUF_NAMESPACE_ID::uint32 upgrade_classification_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -3279,12 +3249,7 @@ class AppearanceFlagBank final : } inline void Swap(AppearanceFlagBank* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -3298,7 +3263,11 @@ class AppearanceFlagBank final : // implements Message ---------------------------------------------- - AppearanceFlagBank* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagBank* New() const final { + return new AppearanceFlagBank(); + } + + AppearanceFlagBank* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -3313,8 +3282,8 @@ class AppearanceFlagBank final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -3322,8 +3291,6 @@ class AppearanceFlagBank final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagBank* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagBank"; @@ -3354,11 +3321,11 @@ class AppearanceFlagBank final : bool _internal_has_waypoints() const; public: void clear_waypoints(); - uint32_t waypoints() const; - void set_waypoints(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 waypoints() const; + void set_waypoints(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_waypoints() const; - void _internal_set_waypoints(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_waypoints() const; + void _internal_set_waypoints(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagBank) @@ -3370,7 +3337,7 @@ class AppearanceFlagBank final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t waypoints_; + ::PROTOBUF_NAMESPACE_ID::uint32 waypoints_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -3437,12 +3404,7 @@ class AppearanceFlagWrite final : } inline void Swap(AppearanceFlagWrite* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -3456,7 +3418,11 @@ class AppearanceFlagWrite final : // implements Message ---------------------------------------------- - AppearanceFlagWrite* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagWrite* New() const final { + return new AppearanceFlagWrite(); + } + + AppearanceFlagWrite* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -3471,8 +3437,8 @@ class AppearanceFlagWrite final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -3480,8 +3446,6 @@ class AppearanceFlagWrite final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagWrite* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagWrite"; @@ -3512,11 +3476,11 @@ class AppearanceFlagWrite final : bool _internal_has_max_text_length() const; public: void clear_max_text_length(); - uint32_t max_text_length() const; - void set_max_text_length(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 max_text_length() const; + void set_max_text_length(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_max_text_length() const; - void _internal_set_max_text_length(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_max_text_length() const; + void _internal_set_max_text_length(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagWrite) @@ -3528,7 +3492,7 @@ class AppearanceFlagWrite final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t max_text_length_; + ::PROTOBUF_NAMESPACE_ID::uint32 max_text_length_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -3595,12 +3559,7 @@ class AppearanceFlagWriteOnce final : } inline void Swap(AppearanceFlagWriteOnce* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -3614,7 +3573,11 @@ class AppearanceFlagWriteOnce final : // implements Message ---------------------------------------------- - AppearanceFlagWriteOnce* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagWriteOnce* New() const final { + return new AppearanceFlagWriteOnce(); + } + + AppearanceFlagWriteOnce* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -3629,8 +3592,8 @@ class AppearanceFlagWriteOnce final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -3638,8 +3601,6 @@ class AppearanceFlagWriteOnce final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagWriteOnce* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagWriteOnce"; @@ -3670,11 +3631,11 @@ class AppearanceFlagWriteOnce final : bool _internal_has_max_text_length_once() const; public: void clear_max_text_length_once(); - uint32_t max_text_length_once() const; - void set_max_text_length_once(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 max_text_length_once() const; + void set_max_text_length_once(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_max_text_length_once() const; - void _internal_set_max_text_length_once(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_max_text_length_once() const; + void _internal_set_max_text_length_once(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagWriteOnce) @@ -3686,7 +3647,7 @@ class AppearanceFlagWriteOnce final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t max_text_length_once_; + ::PROTOBUF_NAMESPACE_ID::uint32 max_text_length_once_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -3753,12 +3714,7 @@ class AppearanceFlagLight final : } inline void Swap(AppearanceFlagLight* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -3772,7 +3728,11 @@ class AppearanceFlagLight final : // implements Message ---------------------------------------------- - AppearanceFlagLight* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagLight* New() const final { + return new AppearanceFlagLight(); + } + + AppearanceFlagLight* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -3787,8 +3747,8 @@ class AppearanceFlagLight final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -3796,8 +3756,6 @@ class AppearanceFlagLight final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagLight* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagLight"; @@ -3829,11 +3787,11 @@ class AppearanceFlagLight final : bool _internal_has_brightness() const; public: void clear_brightness(); - uint32_t brightness() const; - void set_brightness(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 brightness() const; + void set_brightness(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_brightness() const; - void _internal_set_brightness(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_brightness() const; + void _internal_set_brightness(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 color = 2; @@ -3842,11 +3800,11 @@ class AppearanceFlagLight final : bool _internal_has_color() const; public: void clear_color(); - uint32_t color() const; - void set_color(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 color() const; + void set_color(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_color() const; - void _internal_set_color(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_color() const; + void _internal_set_color(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagLight) @@ -3858,8 +3816,8 @@ class AppearanceFlagLight final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t brightness_; - uint32_t color_; + ::PROTOBUF_NAMESPACE_ID::uint32 brightness_; + ::PROTOBUF_NAMESPACE_ID::uint32 color_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -3926,12 +3884,7 @@ class AppearanceFlagHeight final : } inline void Swap(AppearanceFlagHeight* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -3945,7 +3898,11 @@ class AppearanceFlagHeight final : // implements Message ---------------------------------------------- - AppearanceFlagHeight* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagHeight* New() const final { + return new AppearanceFlagHeight(); + } + + AppearanceFlagHeight* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -3960,8 +3917,8 @@ class AppearanceFlagHeight final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -3969,8 +3926,6 @@ class AppearanceFlagHeight final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagHeight* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagHeight"; @@ -4001,11 +3956,11 @@ class AppearanceFlagHeight final : bool _internal_has_elevation() const; public: void clear_elevation(); - uint32_t elevation() const; - void set_elevation(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 elevation() const; + void set_elevation(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_elevation() const; - void _internal_set_elevation(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_elevation() const; + void _internal_set_elevation(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagHeight) @@ -4017,7 +3972,7 @@ class AppearanceFlagHeight final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t elevation_; + ::PROTOBUF_NAMESPACE_ID::uint32 elevation_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -4084,12 +4039,7 @@ class AppearanceFlagShift final : } inline void Swap(AppearanceFlagShift* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -4103,7 +4053,11 @@ class AppearanceFlagShift final : // implements Message ---------------------------------------------- - AppearanceFlagShift* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagShift* New() const final { + return new AppearanceFlagShift(); + } + + AppearanceFlagShift* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -4118,8 +4072,8 @@ class AppearanceFlagShift final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -4127,8 +4081,6 @@ class AppearanceFlagShift final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagShift* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagShift"; @@ -4160,11 +4112,11 @@ class AppearanceFlagShift final : bool _internal_has_x() const; public: void clear_x(); - uint32_t x() const; - void set_x(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 x() const; + void set_x(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_x() const; - void _internal_set_x(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_x() const; + void _internal_set_x(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 y = 2; @@ -4173,11 +4125,11 @@ class AppearanceFlagShift final : bool _internal_has_y() const; public: void clear_y(); - uint32_t y() const; - void set_y(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 y() const; + void set_y(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_y() const; - void _internal_set_y(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_y() const; + void _internal_set_y(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagShift) @@ -4189,8 +4141,8 @@ class AppearanceFlagShift final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t x_; - uint32_t y_; + ::PROTOBUF_NAMESPACE_ID::uint32 x_; + ::PROTOBUF_NAMESPACE_ID::uint32 y_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -4257,12 +4209,7 @@ class AppearanceFlagClothes final : } inline void Swap(AppearanceFlagClothes* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -4276,7 +4223,11 @@ class AppearanceFlagClothes final : // implements Message ---------------------------------------------- - AppearanceFlagClothes* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagClothes* New() const final { + return new AppearanceFlagClothes(); + } + + AppearanceFlagClothes* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -4291,8 +4242,8 @@ class AppearanceFlagClothes final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -4300,8 +4251,6 @@ class AppearanceFlagClothes final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagClothes* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagClothes"; @@ -4332,11 +4281,11 @@ class AppearanceFlagClothes final : bool _internal_has_slot() const; public: void clear_slot(); - uint32_t slot() const; - void set_slot(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 slot() const; + void set_slot(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_slot() const; - void _internal_set_slot(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_slot() const; + void _internal_set_slot(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagClothes) @@ -4348,7 +4297,7 @@ class AppearanceFlagClothes final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t slot_; + ::PROTOBUF_NAMESPACE_ID::uint32 slot_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -4415,12 +4364,7 @@ class AppearanceFlagDefaultAction final : } inline void Swap(AppearanceFlagDefaultAction* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -4434,7 +4378,11 @@ class AppearanceFlagDefaultAction final : // implements Message ---------------------------------------------- - AppearanceFlagDefaultAction* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagDefaultAction* New() const final { + return new AppearanceFlagDefaultAction(); + } + + AppearanceFlagDefaultAction* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -4449,8 +4397,8 @@ class AppearanceFlagDefaultAction final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -4458,8 +4406,6 @@ class AppearanceFlagDefaultAction final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagDefaultAction* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagDefaultAction"; @@ -4573,12 +4519,7 @@ class AppearanceFlagMarket final : } inline void Swap(AppearanceFlagMarket* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -4592,7 +4533,11 @@ class AppearanceFlagMarket final : // implements Message ---------------------------------------------- - AppearanceFlagMarket* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagMarket* New() const final { + return new AppearanceFlagMarket(); + } + + AppearanceFlagMarket* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -4607,8 +4552,8 @@ class AppearanceFlagMarket final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -4616,8 +4561,6 @@ class AppearanceFlagMarket final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagMarket* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagMarket"; @@ -4669,11 +4612,11 @@ class AppearanceFlagMarket final : bool _internal_has_trade_as_object_id() const; public: void clear_trade_as_object_id(); - uint32_t trade_as_object_id() const; - void set_trade_as_object_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 trade_as_object_id() const; + void set_trade_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_trade_as_object_id() const; - void _internal_set_trade_as_object_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_trade_as_object_id() const; + void _internal_set_trade_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 show_as_object_id = 3; @@ -4682,11 +4625,11 @@ class AppearanceFlagMarket final : bool _internal_has_show_as_object_id() const; public: void clear_show_as_object_id(); - uint32_t show_as_object_id() const; - void set_show_as_object_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 show_as_object_id() const; + void set_show_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_show_as_object_id() const; - void _internal_set_show_as_object_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_show_as_object_id() const; + void _internal_set_show_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 minimum_level = 6; @@ -4695,11 +4638,11 @@ class AppearanceFlagMarket final : bool _internal_has_minimum_level() const; public: void clear_minimum_level(); - uint32_t minimum_level() const; - void set_minimum_level(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 minimum_level() const; + void set_minimum_level(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_minimum_level() const; - void _internal_set_minimum_level(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_minimum_level() const; + void _internal_set_minimum_level(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional .Canary.protobuf.appearances.ITEM_CATEGORY category = 1; @@ -4725,9 +4668,9 @@ class AppearanceFlagMarket final : ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; ::PROTOBUF_NAMESPACE_ID::RepeatedField restrict_to_profession_; - uint32_t trade_as_object_id_; - uint32_t show_as_object_id_; - uint32_t minimum_level_; + ::PROTOBUF_NAMESPACE_ID::uint32 trade_as_object_id_; + ::PROTOBUF_NAMESPACE_ID::uint32 show_as_object_id_; + ::PROTOBUF_NAMESPACE_ID::uint32 minimum_level_; int category_; friend struct ::TableStruct_appearances_2eproto; }; @@ -4795,12 +4738,7 @@ class AppearanceFlagNPC final : } inline void Swap(AppearanceFlagNPC* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -4814,7 +4752,11 @@ class AppearanceFlagNPC final : // implements Message ---------------------------------------------- - AppearanceFlagNPC* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagNPC* New() const final { + return new AppearanceFlagNPC(); + } + + AppearanceFlagNPC* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -4829,8 +4771,8 @@ class AppearanceFlagNPC final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -4838,8 +4780,6 @@ class AppearanceFlagNPC final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagNPC* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagNPC"; @@ -4879,7 +4819,7 @@ class AppearanceFlagNPC final : template void set_name(ArgT0&& arg0, ArgT... args); std::string* mutable_name(); - PROTOBUF_NODISCARD std::string* release_name(); + PROTOBUF_MUST_USE_RESULT std::string* release_name(); void set_allocated_name(std::string* name); private: const std::string& _internal_name() const; @@ -4897,7 +4837,7 @@ class AppearanceFlagNPC final : template void set_location(ArgT0&& arg0, ArgT... args); std::string* mutable_location(); - PROTOBUF_NODISCARD std::string* release_location(); + PROTOBUF_MUST_USE_RESULT std::string* release_location(); void set_allocated_location(std::string* location); private: const std::string& _internal_location() const; @@ -4915,7 +4855,7 @@ class AppearanceFlagNPC final : template void set_currency_quest_flag_display_name(ArgT0&& arg0, ArgT... args); std::string* mutable_currency_quest_flag_display_name(); - PROTOBUF_NODISCARD std::string* release_currency_quest_flag_display_name(); + PROTOBUF_MUST_USE_RESULT std::string* release_currency_quest_flag_display_name(); void set_allocated_currency_quest_flag_display_name(std::string* currency_quest_flag_display_name); private: const std::string& _internal_currency_quest_flag_display_name() const; @@ -4929,11 +4869,11 @@ class AppearanceFlagNPC final : bool _internal_has_sale_price() const; public: void clear_sale_price(); - uint32_t sale_price() const; - void set_sale_price(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 sale_price() const; + void set_sale_price(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_sale_price() const; - void _internal_set_sale_price(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_sale_price() const; + void _internal_set_sale_price(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 buy_price = 4; @@ -4942,11 +4882,11 @@ class AppearanceFlagNPC final : bool _internal_has_buy_price() const; public: void clear_buy_price(); - uint32_t buy_price() const; - void set_buy_price(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 buy_price() const; + void set_buy_price(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_buy_price() const; - void _internal_set_buy_price(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_buy_price() const; + void _internal_set_buy_price(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 currency_object_type_id = 5; @@ -4955,11 +4895,11 @@ class AppearanceFlagNPC final : bool _internal_has_currency_object_type_id() const; public: void clear_currency_object_type_id(); - uint32_t currency_object_type_id() const; - void set_currency_object_type_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 currency_object_type_id() const; + void set_currency_object_type_id(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_currency_object_type_id() const; - void _internal_set_currency_object_type_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_currency_object_type_id() const; + void _internal_set_currency_object_type_id(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagNPC) @@ -4974,9 +4914,9 @@ class AppearanceFlagNPC final : ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr location_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr currency_quest_flag_display_name_; - uint32_t sale_price_; - uint32_t buy_price_; - uint32_t currency_object_type_id_; + ::PROTOBUF_NAMESPACE_ID::uint32 sale_price_; + ::PROTOBUF_NAMESPACE_ID::uint32 buy_price_; + ::PROTOBUF_NAMESPACE_ID::uint32 currency_object_type_id_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -5043,12 +4983,7 @@ class AppearanceFlagAutomap final : } inline void Swap(AppearanceFlagAutomap* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -5062,7 +4997,11 @@ class AppearanceFlagAutomap final : // implements Message ---------------------------------------------- - AppearanceFlagAutomap* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagAutomap* New() const final { + return new AppearanceFlagAutomap(); + } + + AppearanceFlagAutomap* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -5077,8 +5016,8 @@ class AppearanceFlagAutomap final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -5086,8 +5025,6 @@ class AppearanceFlagAutomap final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagAutomap* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagAutomap"; @@ -5118,11 +5055,11 @@ class AppearanceFlagAutomap final : bool _internal_has_color() const; public: void clear_color(); - uint32_t color() const; - void set_color(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 color() const; + void set_color(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_color() const; - void _internal_set_color(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_color() const; + void _internal_set_color(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagAutomap) @@ -5134,7 +5071,7 @@ class AppearanceFlagAutomap final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t color_; + ::PROTOBUF_NAMESPACE_ID::uint32 color_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -5201,12 +5138,7 @@ class AppearanceFlagHook final : } inline void Swap(AppearanceFlagHook* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -5220,7 +5152,11 @@ class AppearanceFlagHook final : // implements Message ---------------------------------------------- - AppearanceFlagHook* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagHook* New() const final { + return new AppearanceFlagHook(); + } + + AppearanceFlagHook* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -5235,8 +5171,8 @@ class AppearanceFlagHook final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -5244,8 +5180,6 @@ class AppearanceFlagHook final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagHook* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagHook"; @@ -5359,12 +5293,7 @@ class AppearanceFlagLenshelp final : } inline void Swap(AppearanceFlagLenshelp* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -5378,7 +5307,11 @@ class AppearanceFlagLenshelp final : // implements Message ---------------------------------------------- - AppearanceFlagLenshelp* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagLenshelp* New() const final { + return new AppearanceFlagLenshelp(); + } + + AppearanceFlagLenshelp* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -5393,8 +5326,8 @@ class AppearanceFlagLenshelp final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -5402,8 +5335,6 @@ class AppearanceFlagLenshelp final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagLenshelp* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagLenshelp"; @@ -5434,11 +5365,11 @@ class AppearanceFlagLenshelp final : bool _internal_has_id() const; public: void clear_id(); - uint32_t id() const; - void set_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 id() const; + void set_id(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_id() const; - void _internal_set_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_id() const; + void _internal_set_id(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagLenshelp) @@ -5450,7 +5381,7 @@ class AppearanceFlagLenshelp final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t id_; + ::PROTOBUF_NAMESPACE_ID::uint32 id_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -5517,12 +5448,7 @@ class AppearanceFlagChangedToExpire final : } inline void Swap(AppearanceFlagChangedToExpire* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -5536,7 +5462,11 @@ class AppearanceFlagChangedToExpire final : // implements Message ---------------------------------------------- - AppearanceFlagChangedToExpire* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagChangedToExpire* New() const final { + return new AppearanceFlagChangedToExpire(); + } + + AppearanceFlagChangedToExpire* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -5551,8 +5481,8 @@ class AppearanceFlagChangedToExpire final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -5560,8 +5490,6 @@ class AppearanceFlagChangedToExpire final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagChangedToExpire* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagChangedToExpire"; @@ -5592,11 +5520,11 @@ class AppearanceFlagChangedToExpire final : bool _internal_has_former_object_typeid() const; public: void clear_former_object_typeid(); - uint32_t former_object_typeid() const; - void set_former_object_typeid(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 former_object_typeid() const; + void set_former_object_typeid(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_former_object_typeid() const; - void _internal_set_former_object_typeid(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_former_object_typeid() const; + void _internal_set_former_object_typeid(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagChangedToExpire) @@ -5608,7 +5536,7 @@ class AppearanceFlagChangedToExpire final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t former_object_typeid_; + ::PROTOBUF_NAMESPACE_ID::uint32 former_object_typeid_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -5675,12 +5603,7 @@ class AppearanceFlagCyclopedia final : } inline void Swap(AppearanceFlagCyclopedia* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -5694,7 +5617,11 @@ class AppearanceFlagCyclopedia final : // implements Message ---------------------------------------------- - AppearanceFlagCyclopedia* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline AppearanceFlagCyclopedia* New() const final { + return new AppearanceFlagCyclopedia(); + } + + AppearanceFlagCyclopedia* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -5709,8 +5636,8 @@ class AppearanceFlagCyclopedia final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -5718,8 +5645,6 @@ class AppearanceFlagCyclopedia final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagCyclopedia* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagCyclopedia"; @@ -5750,11 +5675,11 @@ class AppearanceFlagCyclopedia final : bool _internal_has_cyclopedia_type() const; public: void clear_cyclopedia_type(); - uint32_t cyclopedia_type() const; - void set_cyclopedia_type(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 cyclopedia_type() const; + void set_cyclopedia_type(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_cyclopedia_type() const; - void _internal_set_cyclopedia_type(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_cyclopedia_type() const; + void _internal_set_cyclopedia_type(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagCyclopedia) @@ -5766,7 +5691,7 @@ class AppearanceFlagCyclopedia final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t cyclopedia_type_; + ::PROTOBUF_NAMESPACE_ID::uint32 cyclopedia_type_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -5833,12 +5758,7 @@ class SpecialMeaningAppearanceIds final : } inline void Swap(SpecialMeaningAppearanceIds* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -5852,7 +5772,11 @@ class SpecialMeaningAppearanceIds final : // implements Message ---------------------------------------------- - SpecialMeaningAppearanceIds* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + inline SpecialMeaningAppearanceIds* New() const final { + return new SpecialMeaningAppearanceIds(); + } + + SpecialMeaningAppearanceIds* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -5867,8 +5791,8 @@ class SpecialMeaningAppearanceIds final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -5876,8 +5800,6 @@ class SpecialMeaningAppearanceIds final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(SpecialMeaningAppearanceIds* other); - - private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.SpecialMeaningAppearanceIds"; @@ -5913,11 +5835,11 @@ class SpecialMeaningAppearanceIds final : bool _internal_has_gold_coin_id() const; public: void clear_gold_coin_id(); - uint32_t gold_coin_id() const; - void set_gold_coin_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 gold_coin_id() const; + void set_gold_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_gold_coin_id() const; - void _internal_set_gold_coin_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_gold_coin_id() const; + void _internal_set_gold_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 platinum_coin_id = 2; @@ -5926,11 +5848,11 @@ class SpecialMeaningAppearanceIds final : bool _internal_has_platinum_coin_id() const; public: void clear_platinum_coin_id(); - uint32_t platinum_coin_id() const; - void set_platinum_coin_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 platinum_coin_id() const; + void set_platinum_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_platinum_coin_id() const; - void _internal_set_platinum_coin_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_platinum_coin_id() const; + void _internal_set_platinum_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 crystal_coin_id = 3; @@ -5939,11 +5861,11 @@ class SpecialMeaningAppearanceIds final : bool _internal_has_crystal_coin_id() const; public: void clear_crystal_coin_id(); - uint32_t crystal_coin_id() const; - void set_crystal_coin_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 crystal_coin_id() const; + void set_crystal_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_crystal_coin_id() const; - void _internal_set_crystal_coin_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_crystal_coin_id() const; + void _internal_set_crystal_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 tibia_coin_id = 4; @@ -5952,11 +5874,11 @@ class SpecialMeaningAppearanceIds final : bool _internal_has_tibia_coin_id() const; public: void clear_tibia_coin_id(); - uint32_t tibia_coin_id() const; - void set_tibia_coin_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 tibia_coin_id() const; + void set_tibia_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_tibia_coin_id() const; - void _internal_set_tibia_coin_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_tibia_coin_id() const; + void _internal_set_tibia_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 stamped_letter_id = 5; @@ -5965,11 +5887,11 @@ class SpecialMeaningAppearanceIds final : bool _internal_has_stamped_letter_id() const; public: void clear_stamped_letter_id(); - uint32_t stamped_letter_id() const; - void set_stamped_letter_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 stamped_letter_id() const; + void set_stamped_letter_id(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_stamped_letter_id() const; - void _internal_set_stamped_letter_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_stamped_letter_id() const; + void _internal_set_stamped_letter_id(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // optional uint32 supply_stash_id = 6; @@ -5978,11 +5900,11 @@ class SpecialMeaningAppearanceIds final : bool _internal_has_supply_stash_id() const; public: void clear_supply_stash_id(); - uint32_t supply_stash_id() const; - void set_supply_stash_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 supply_stash_id() const; + void set_supply_stash_id(::PROTOBUF_NAMESPACE_ID::uint32 value); private: - uint32_t _internal_supply_stash_id() const; - void _internal_set_supply_stash_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::uint32 _internal_supply_stash_id() const; + void _internal_set_supply_stash_id(::PROTOBUF_NAMESPACE_ID::uint32 value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.SpecialMeaningAppearanceIds) @@ -5994,12 +5916,12 @@ class SpecialMeaningAppearanceIds final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t gold_coin_id_; - uint32_t platinum_coin_id_; - uint32_t crystal_coin_id_; - uint32_t tibia_coin_id_; - uint32_t stamped_letter_id_; - uint32_t supply_stash_id_; + ::PROTOBUF_NAMESPACE_ID::uint32 gold_coin_id_; + ::PROTOBUF_NAMESPACE_ID::uint32 platinum_coin_id_; + ::PROTOBUF_NAMESPACE_ID::uint32 crystal_coin_id_; + ::PROTOBUF_NAMESPACE_ID::uint32 tibia_coin_id_; + ::PROTOBUF_NAMESPACE_ID::uint32 stamped_letter_id_; + ::PROTOBUF_NAMESPACE_ID::uint32 supply_stash_id_; friend struct ::TableStruct_appearances_2eproto; }; // =================================================================== @@ -6025,18 +5947,18 @@ inline void Coordinate::clear_x() { x_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t Coordinate::_internal_x() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Coordinate::_internal_x() const { return x_; } -inline uint32_t Coordinate::x() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Coordinate::x() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Coordinate.x) return _internal_x(); } -inline void Coordinate::_internal_set_x(uint32_t value) { +inline void Coordinate::_internal_set_x(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; x_ = value; } -inline void Coordinate::set_x(uint32_t value) { +inline void Coordinate::set_x(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_x(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Coordinate.x) } @@ -6053,18 +5975,18 @@ inline void Coordinate::clear_y() { y_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline uint32_t Coordinate::_internal_y() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Coordinate::_internal_y() const { return y_; } -inline uint32_t Coordinate::y() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Coordinate::y() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Coordinate.y) return _internal_y(); } -inline void Coordinate::_internal_set_y(uint32_t value) { +inline void Coordinate::_internal_set_y(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000002u; y_ = value; } -inline void Coordinate::set_y(uint32_t value) { +inline void Coordinate::set_y(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_y(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Coordinate.y) } @@ -6081,18 +6003,18 @@ inline void Coordinate::clear_z() { z_ = 0u; _has_bits_[0] &= ~0x00000004u; } -inline uint32_t Coordinate::_internal_z() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Coordinate::_internal_z() const { return z_; } -inline uint32_t Coordinate::z() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Coordinate::z() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Coordinate.z) return _internal_z(); } -inline void Coordinate::_internal_set_z(uint32_t value) { +inline void Coordinate::_internal_set_z(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000004u; z_ = value; } -inline void Coordinate::set_z(uint32_t value) { +inline void Coordinate::set_z(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_z(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Coordinate.z) } @@ -6367,18 +6289,18 @@ inline void SpritePhase::clear_duration_min() { duration_min_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t SpritePhase::_internal_duration_min() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpritePhase::_internal_duration_min() const { return duration_min_; } -inline uint32_t SpritePhase::duration_min() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpritePhase::duration_min() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpritePhase.duration_min) return _internal_duration_min(); } -inline void SpritePhase::_internal_set_duration_min(uint32_t value) { +inline void SpritePhase::_internal_set_duration_min(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; duration_min_ = value; } -inline void SpritePhase::set_duration_min(uint32_t value) { +inline void SpritePhase::set_duration_min(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_duration_min(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpritePhase.duration_min) } @@ -6395,18 +6317,18 @@ inline void SpritePhase::clear_duration_max() { duration_max_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline uint32_t SpritePhase::_internal_duration_max() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpritePhase::_internal_duration_max() const { return duration_max_; } -inline uint32_t SpritePhase::duration_max() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpritePhase::duration_max() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpritePhase.duration_max) return _internal_duration_max(); } -inline void SpritePhase::_internal_set_duration_max(uint32_t value) { +inline void SpritePhase::_internal_set_duration_max(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000002u; duration_max_ = value; } -inline void SpritePhase::set_duration_max(uint32_t value) { +inline void SpritePhase::set_duration_max(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_duration_max(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpritePhase.duration_max) } @@ -6427,18 +6349,18 @@ inline void SpriteAnimation::clear_default_start_phase() { default_start_phase_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t SpriteAnimation::_internal_default_start_phase() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteAnimation::_internal_default_start_phase() const { return default_start_phase_; } -inline uint32_t SpriteAnimation::default_start_phase() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteAnimation::default_start_phase() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteAnimation.default_start_phase) return _internal_default_start_phase(); } -inline void SpriteAnimation::_internal_set_default_start_phase(uint32_t value) { +inline void SpriteAnimation::_internal_set_default_start_phase(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; default_start_phase_ = value; } -inline void SpriteAnimation::set_default_start_phase(uint32_t value) { +inline void SpriteAnimation::set_default_start_phase(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_default_start_phase(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteAnimation.default_start_phase) } @@ -6540,18 +6462,18 @@ inline void SpriteAnimation::clear_loop_count() { loop_count_ = 0u; _has_bits_[0] &= ~0x00000008u; } -inline uint32_t SpriteAnimation::_internal_loop_count() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteAnimation::_internal_loop_count() const { return loop_count_; } -inline uint32_t SpriteAnimation::loop_count() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteAnimation::loop_count() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteAnimation.loop_count) return _internal_loop_count(); } -inline void SpriteAnimation::_internal_set_loop_count(uint32_t value) { +inline void SpriteAnimation::_internal_set_loop_count(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000008u; loop_count_ = value; } -inline void SpriteAnimation::set_loop_count(uint32_t value) { +inline void SpriteAnimation::set_loop_count(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_loop_count(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteAnimation.loop_count) } @@ -6612,18 +6534,18 @@ inline void Box::clear_x() { x_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t Box::_internal_x() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::_internal_x() const { return x_; } -inline uint32_t Box::x() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::x() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Box.x) return _internal_x(); } -inline void Box::_internal_set_x(uint32_t value) { +inline void Box::_internal_set_x(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; x_ = value; } -inline void Box::set_x(uint32_t value) { +inline void Box::set_x(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_x(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Box.x) } @@ -6640,18 +6562,18 @@ inline void Box::clear_y() { y_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline uint32_t Box::_internal_y() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::_internal_y() const { return y_; } -inline uint32_t Box::y() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::y() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Box.y) return _internal_y(); } -inline void Box::_internal_set_y(uint32_t value) { +inline void Box::_internal_set_y(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000002u; y_ = value; } -inline void Box::set_y(uint32_t value) { +inline void Box::set_y(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_y(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Box.y) } @@ -6668,18 +6590,18 @@ inline void Box::clear_width() { width_ = 0u; _has_bits_[0] &= ~0x00000004u; } -inline uint32_t Box::_internal_width() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::_internal_width() const { return width_; } -inline uint32_t Box::width() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::width() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Box.width) return _internal_width(); } -inline void Box::_internal_set_width(uint32_t value) { +inline void Box::_internal_set_width(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000004u; width_ = value; } -inline void Box::set_width(uint32_t value) { +inline void Box::set_width(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_width(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Box.width) } @@ -6696,18 +6618,18 @@ inline void Box::clear_height() { height_ = 0u; _has_bits_[0] &= ~0x00000008u; } -inline uint32_t Box::_internal_height() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::_internal_height() const { return height_; } -inline uint32_t Box::height() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::height() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Box.height) return _internal_height(); } -inline void Box::_internal_set_height(uint32_t value) { +inline void Box::_internal_set_height(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000008u; height_ = value; } -inline void Box::set_height(uint32_t value) { +inline void Box::set_height(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_height(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Box.height) } @@ -6728,18 +6650,18 @@ inline void SpriteInfo::clear_pattern_width() { pattern_width_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline uint32_t SpriteInfo::_internal_pattern_width() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::_internal_pattern_width() const { return pattern_width_; } -inline uint32_t SpriteInfo::pattern_width() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::pattern_width() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteInfo.pattern_width) return _internal_pattern_width(); } -inline void SpriteInfo::_internal_set_pattern_width(uint32_t value) { +inline void SpriteInfo::_internal_set_pattern_width(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000002u; pattern_width_ = value; } -inline void SpriteInfo::set_pattern_width(uint32_t value) { +inline void SpriteInfo::set_pattern_width(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_pattern_width(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteInfo.pattern_width) } @@ -6756,18 +6678,18 @@ inline void SpriteInfo::clear_pattern_height() { pattern_height_ = 0u; _has_bits_[0] &= ~0x00000004u; } -inline uint32_t SpriteInfo::_internal_pattern_height() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::_internal_pattern_height() const { return pattern_height_; } -inline uint32_t SpriteInfo::pattern_height() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::pattern_height() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteInfo.pattern_height) return _internal_pattern_height(); } -inline void SpriteInfo::_internal_set_pattern_height(uint32_t value) { +inline void SpriteInfo::_internal_set_pattern_height(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000004u; pattern_height_ = value; } -inline void SpriteInfo::set_pattern_height(uint32_t value) { +inline void SpriteInfo::set_pattern_height(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_pattern_height(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteInfo.pattern_height) } @@ -6784,18 +6706,18 @@ inline void SpriteInfo::clear_pattern_depth() { pattern_depth_ = 0u; _has_bits_[0] &= ~0x00000008u; } -inline uint32_t SpriteInfo::_internal_pattern_depth() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::_internal_pattern_depth() const { return pattern_depth_; } -inline uint32_t SpriteInfo::pattern_depth() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::pattern_depth() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteInfo.pattern_depth) return _internal_pattern_depth(); } -inline void SpriteInfo::_internal_set_pattern_depth(uint32_t value) { +inline void SpriteInfo::_internal_set_pattern_depth(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000008u; pattern_depth_ = value; } -inline void SpriteInfo::set_pattern_depth(uint32_t value) { +inline void SpriteInfo::set_pattern_depth(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_pattern_depth(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteInfo.pattern_depth) } @@ -6812,18 +6734,18 @@ inline void SpriteInfo::clear_layers() { layers_ = 0u; _has_bits_[0] &= ~0x00000010u; } -inline uint32_t SpriteInfo::_internal_layers() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::_internal_layers() const { return layers_; } -inline uint32_t SpriteInfo::layers() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::layers() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteInfo.layers) return _internal_layers(); } -inline void SpriteInfo::_internal_set_layers(uint32_t value) { +inline void SpriteInfo::_internal_set_layers(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000010u; layers_ = value; } -inline void SpriteInfo::set_layers(uint32_t value) { +inline void SpriteInfo::set_layers(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_layers(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteInfo.layers) } @@ -6838,38 +6760,38 @@ inline int SpriteInfo::sprite_id_size() const { inline void SpriteInfo::clear_sprite_id() { sprite_id_.Clear(); } -inline uint32_t SpriteInfo::_internal_sprite_id(int index) const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::_internal_sprite_id(int index) const { return sprite_id_.Get(index); } -inline uint32_t SpriteInfo::sprite_id(int index) const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::sprite_id(int index) const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteInfo.sprite_id) return _internal_sprite_id(index); } -inline void SpriteInfo::set_sprite_id(int index, uint32_t value) { +inline void SpriteInfo::set_sprite_id(int index, ::PROTOBUF_NAMESPACE_ID::uint32 value) { sprite_id_.Set(index, value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteInfo.sprite_id) } -inline void SpriteInfo::_internal_add_sprite_id(uint32_t value) { +inline void SpriteInfo::_internal_add_sprite_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { sprite_id_.Add(value); } -inline void SpriteInfo::add_sprite_id(uint32_t value) { +inline void SpriteInfo::add_sprite_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_add_sprite_id(value); // @@protoc_insertion_point(field_add:Canary.protobuf.appearances.SpriteInfo.sprite_id) } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >& SpriteInfo::_internal_sprite_id() const { return sprite_id_; } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >& SpriteInfo::sprite_id() const { // @@protoc_insertion_point(field_list:Canary.protobuf.appearances.SpriteInfo.sprite_id) return _internal_sprite_id(); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >* SpriteInfo::_internal_mutable_sprite_id() { return &sprite_id_; } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >* SpriteInfo::mutable_sprite_id() { // @@protoc_insertion_point(field_mutable_list:Canary.protobuf.appearances.SpriteInfo.sprite_id) return _internal_mutable_sprite_id(); @@ -6887,18 +6809,18 @@ inline void SpriteInfo::clear_bounding_square() { bounding_square_ = 0u; _has_bits_[0] &= ~0x00000020u; } -inline uint32_t SpriteInfo::_internal_bounding_square() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::_internal_bounding_square() const { return bounding_square_; } -inline uint32_t SpriteInfo::bounding_square() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::bounding_square() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteInfo.bounding_square) return _internal_bounding_square(); } -inline void SpriteInfo::_internal_set_bounding_square(uint32_t value) { +inline void SpriteInfo::_internal_set_bounding_square(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000020u; bounding_square_ = value; } -inline void SpriteInfo::set_bounding_square(uint32_t value) { +inline void SpriteInfo::set_bounding_square(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_bounding_square(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteInfo.bounding_square) } @@ -7106,18 +7028,18 @@ inline void FrameGroup::clear_id() { id_ = 0u; _has_bits_[0] &= ~0x00000004u; } -inline uint32_t FrameGroup::_internal_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 FrameGroup::_internal_id() const { return id_; } -inline uint32_t FrameGroup::id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 FrameGroup::id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.FrameGroup.id) return _internal_id(); } -inline void FrameGroup::_internal_set_id(uint32_t value) { +inline void FrameGroup::_internal_set_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000004u; id_ = value; } -inline void FrameGroup::set_id(uint32_t value) { +inline void FrameGroup::set_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.FrameGroup.id) } @@ -7228,18 +7150,18 @@ inline void Appearance::clear_id() { id_ = 0u; _has_bits_[0] &= ~0x00000008u; } -inline uint32_t Appearance::_internal_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Appearance::_internal_id() const { return id_; } -inline uint32_t Appearance::id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 Appearance::id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Appearance.id) return _internal_id(); } -inline void Appearance::_internal_set_id(uint32_t value) { +inline void Appearance::_internal_set_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000008u; id_ = value; } -inline void Appearance::set_id(uint32_t value) { +inline void Appearance::set_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Appearance.id) } @@ -7419,13 +7341,7 @@ inline std::string* Appearance::release_name() { return nullptr; } _has_bits_[0] &= ~0x00000001u; - auto* p = name_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - return p; + return name_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); } inline void Appearance::set_allocated_name(std::string* name) { if (name != nullptr) { @@ -7435,11 +7351,6 @@ inline void Appearance::set_allocated_name(std::string* name) { } name_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), name, GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:Canary.protobuf.appearances.Appearance.name) } @@ -7488,13 +7399,7 @@ inline std::string* Appearance::release_description() { return nullptr; } _has_bits_[0] &= ~0x00000002u; - auto* p = description_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (description_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { - description_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - return p; + return description_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); } inline void Appearance::set_allocated_description(std::string* description) { if (description != nullptr) { @@ -7504,11 +7409,6 @@ inline void Appearance::set_allocated_description(std::string* description) { } description_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), description, GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (description_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { - description_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:Canary.protobuf.appearances.Appearance.description) } @@ -9818,18 +9718,18 @@ inline void AppearanceFlagUpgradeClassification::clear_upgrade_classification() upgrade_classification_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t AppearanceFlagUpgradeClassification::_internal_upgrade_classification() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagUpgradeClassification::_internal_upgrade_classification() const { return upgrade_classification_; } -inline uint32_t AppearanceFlagUpgradeClassification::upgrade_classification() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagUpgradeClassification::upgrade_classification() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification.upgrade_classification) return _internal_upgrade_classification(); } -inline void AppearanceFlagUpgradeClassification::_internal_set_upgrade_classification(uint32_t value) { +inline void AppearanceFlagUpgradeClassification::_internal_set_upgrade_classification(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; upgrade_classification_ = value; } -inline void AppearanceFlagUpgradeClassification::set_upgrade_classification(uint32_t value) { +inline void AppearanceFlagUpgradeClassification::set_upgrade_classification(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_upgrade_classification(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification.upgrade_classification) } @@ -9850,18 +9750,18 @@ inline void AppearanceFlagBank::clear_waypoints() { waypoints_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t AppearanceFlagBank::_internal_waypoints() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagBank::_internal_waypoints() const { return waypoints_; } -inline uint32_t AppearanceFlagBank::waypoints() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagBank::waypoints() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagBank.waypoints) return _internal_waypoints(); } -inline void AppearanceFlagBank::_internal_set_waypoints(uint32_t value) { +inline void AppearanceFlagBank::_internal_set_waypoints(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; waypoints_ = value; } -inline void AppearanceFlagBank::set_waypoints(uint32_t value) { +inline void AppearanceFlagBank::set_waypoints(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_waypoints(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagBank.waypoints) } @@ -9882,18 +9782,18 @@ inline void AppearanceFlagWrite::clear_max_text_length() { max_text_length_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t AppearanceFlagWrite::_internal_max_text_length() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagWrite::_internal_max_text_length() const { return max_text_length_; } -inline uint32_t AppearanceFlagWrite::max_text_length() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagWrite::max_text_length() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagWrite.max_text_length) return _internal_max_text_length(); } -inline void AppearanceFlagWrite::_internal_set_max_text_length(uint32_t value) { +inline void AppearanceFlagWrite::_internal_set_max_text_length(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; max_text_length_ = value; } -inline void AppearanceFlagWrite::set_max_text_length(uint32_t value) { +inline void AppearanceFlagWrite::set_max_text_length(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_max_text_length(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagWrite.max_text_length) } @@ -9914,18 +9814,18 @@ inline void AppearanceFlagWriteOnce::clear_max_text_length_once() { max_text_length_once_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t AppearanceFlagWriteOnce::_internal_max_text_length_once() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagWriteOnce::_internal_max_text_length_once() const { return max_text_length_once_; } -inline uint32_t AppearanceFlagWriteOnce::max_text_length_once() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagWriteOnce::max_text_length_once() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagWriteOnce.max_text_length_once) return _internal_max_text_length_once(); } -inline void AppearanceFlagWriteOnce::_internal_set_max_text_length_once(uint32_t value) { +inline void AppearanceFlagWriteOnce::_internal_set_max_text_length_once(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; max_text_length_once_ = value; } -inline void AppearanceFlagWriteOnce::set_max_text_length_once(uint32_t value) { +inline void AppearanceFlagWriteOnce::set_max_text_length_once(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_max_text_length_once(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagWriteOnce.max_text_length_once) } @@ -9946,18 +9846,18 @@ inline void AppearanceFlagLight::clear_brightness() { brightness_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t AppearanceFlagLight::_internal_brightness() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagLight::_internal_brightness() const { return brightness_; } -inline uint32_t AppearanceFlagLight::brightness() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagLight::brightness() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagLight.brightness) return _internal_brightness(); } -inline void AppearanceFlagLight::_internal_set_brightness(uint32_t value) { +inline void AppearanceFlagLight::_internal_set_brightness(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; brightness_ = value; } -inline void AppearanceFlagLight::set_brightness(uint32_t value) { +inline void AppearanceFlagLight::set_brightness(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_brightness(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagLight.brightness) } @@ -9974,18 +9874,18 @@ inline void AppearanceFlagLight::clear_color() { color_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline uint32_t AppearanceFlagLight::_internal_color() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagLight::_internal_color() const { return color_; } -inline uint32_t AppearanceFlagLight::color() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagLight::color() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagLight.color) return _internal_color(); } -inline void AppearanceFlagLight::_internal_set_color(uint32_t value) { +inline void AppearanceFlagLight::_internal_set_color(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000002u; color_ = value; } -inline void AppearanceFlagLight::set_color(uint32_t value) { +inline void AppearanceFlagLight::set_color(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_color(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagLight.color) } @@ -10006,18 +9906,18 @@ inline void AppearanceFlagHeight::clear_elevation() { elevation_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t AppearanceFlagHeight::_internal_elevation() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagHeight::_internal_elevation() const { return elevation_; } -inline uint32_t AppearanceFlagHeight::elevation() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagHeight::elevation() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagHeight.elevation) return _internal_elevation(); } -inline void AppearanceFlagHeight::_internal_set_elevation(uint32_t value) { +inline void AppearanceFlagHeight::_internal_set_elevation(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; elevation_ = value; } -inline void AppearanceFlagHeight::set_elevation(uint32_t value) { +inline void AppearanceFlagHeight::set_elevation(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_elevation(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagHeight.elevation) } @@ -10038,18 +9938,18 @@ inline void AppearanceFlagShift::clear_x() { x_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t AppearanceFlagShift::_internal_x() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagShift::_internal_x() const { return x_; } -inline uint32_t AppearanceFlagShift::x() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagShift::x() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagShift.x) return _internal_x(); } -inline void AppearanceFlagShift::_internal_set_x(uint32_t value) { +inline void AppearanceFlagShift::_internal_set_x(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; x_ = value; } -inline void AppearanceFlagShift::set_x(uint32_t value) { +inline void AppearanceFlagShift::set_x(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_x(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagShift.x) } @@ -10066,18 +9966,18 @@ inline void AppearanceFlagShift::clear_y() { y_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline uint32_t AppearanceFlagShift::_internal_y() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagShift::_internal_y() const { return y_; } -inline uint32_t AppearanceFlagShift::y() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagShift::y() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagShift.y) return _internal_y(); } -inline void AppearanceFlagShift::_internal_set_y(uint32_t value) { +inline void AppearanceFlagShift::_internal_set_y(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000002u; y_ = value; } -inline void AppearanceFlagShift::set_y(uint32_t value) { +inline void AppearanceFlagShift::set_y(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_y(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagShift.y) } @@ -10098,18 +9998,18 @@ inline void AppearanceFlagClothes::clear_slot() { slot_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t AppearanceFlagClothes::_internal_slot() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagClothes::_internal_slot() const { return slot_; } -inline uint32_t AppearanceFlagClothes::slot() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagClothes::slot() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagClothes.slot) return _internal_slot(); } -inline void AppearanceFlagClothes::_internal_set_slot(uint32_t value) { +inline void AppearanceFlagClothes::_internal_set_slot(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; slot_ = value; } -inline void AppearanceFlagClothes::set_slot(uint32_t value) { +inline void AppearanceFlagClothes::set_slot(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_slot(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagClothes.slot) } @@ -10192,18 +10092,18 @@ inline void AppearanceFlagMarket::clear_trade_as_object_id() { trade_as_object_id_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t AppearanceFlagMarket::_internal_trade_as_object_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagMarket::_internal_trade_as_object_id() const { return trade_as_object_id_; } -inline uint32_t AppearanceFlagMarket::trade_as_object_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagMarket::trade_as_object_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagMarket.trade_as_object_id) return _internal_trade_as_object_id(); } -inline void AppearanceFlagMarket::_internal_set_trade_as_object_id(uint32_t value) { +inline void AppearanceFlagMarket::_internal_set_trade_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; trade_as_object_id_ = value; } -inline void AppearanceFlagMarket::set_trade_as_object_id(uint32_t value) { +inline void AppearanceFlagMarket::set_trade_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_trade_as_object_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagMarket.trade_as_object_id) } @@ -10220,18 +10120,18 @@ inline void AppearanceFlagMarket::clear_show_as_object_id() { show_as_object_id_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline uint32_t AppearanceFlagMarket::_internal_show_as_object_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagMarket::_internal_show_as_object_id() const { return show_as_object_id_; } -inline uint32_t AppearanceFlagMarket::show_as_object_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagMarket::show_as_object_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagMarket.show_as_object_id) return _internal_show_as_object_id(); } -inline void AppearanceFlagMarket::_internal_set_show_as_object_id(uint32_t value) { +inline void AppearanceFlagMarket::_internal_set_show_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000002u; show_as_object_id_ = value; } -inline void AppearanceFlagMarket::set_show_as_object_id(uint32_t value) { +inline void AppearanceFlagMarket::set_show_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_show_as_object_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagMarket.show_as_object_id) } @@ -10293,18 +10193,18 @@ inline void AppearanceFlagMarket::clear_minimum_level() { minimum_level_ = 0u; _has_bits_[0] &= ~0x00000004u; } -inline uint32_t AppearanceFlagMarket::_internal_minimum_level() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagMarket::_internal_minimum_level() const { return minimum_level_; } -inline uint32_t AppearanceFlagMarket::minimum_level() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagMarket::minimum_level() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagMarket.minimum_level) return _internal_minimum_level(); } -inline void AppearanceFlagMarket::_internal_set_minimum_level(uint32_t value) { +inline void AppearanceFlagMarket::_internal_set_minimum_level(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000004u; minimum_level_ = value; } -inline void AppearanceFlagMarket::set_minimum_level(uint32_t value) { +inline void AppearanceFlagMarket::set_minimum_level(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_minimum_level(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagMarket.minimum_level) } @@ -10358,13 +10258,7 @@ inline std::string* AppearanceFlagNPC::release_name() { return nullptr; } _has_bits_[0] &= ~0x00000001u; - auto* p = name_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - return p; + return name_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); } inline void AppearanceFlagNPC::set_allocated_name(std::string* name) { if (name != nullptr) { @@ -10374,11 +10268,6 @@ inline void AppearanceFlagNPC::set_allocated_name(std::string* name) { } name_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), name, GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:Canary.protobuf.appearances.AppearanceFlagNPC.name) } @@ -10427,13 +10316,7 @@ inline std::string* AppearanceFlagNPC::release_location() { return nullptr; } _has_bits_[0] &= ~0x00000002u; - auto* p = location_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (location_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { - location_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - return p; + return location_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); } inline void AppearanceFlagNPC::set_allocated_location(std::string* location) { if (location != nullptr) { @@ -10443,11 +10326,6 @@ inline void AppearanceFlagNPC::set_allocated_location(std::string* location) { } location_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), location, GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (location_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { - location_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:Canary.protobuf.appearances.AppearanceFlagNPC.location) } @@ -10463,18 +10341,18 @@ inline void AppearanceFlagNPC::clear_sale_price() { sale_price_ = 0u; _has_bits_[0] &= ~0x00000008u; } -inline uint32_t AppearanceFlagNPC::_internal_sale_price() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagNPC::_internal_sale_price() const { return sale_price_; } -inline uint32_t AppearanceFlagNPC::sale_price() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagNPC::sale_price() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagNPC.sale_price) return _internal_sale_price(); } -inline void AppearanceFlagNPC::_internal_set_sale_price(uint32_t value) { +inline void AppearanceFlagNPC::_internal_set_sale_price(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000008u; sale_price_ = value; } -inline void AppearanceFlagNPC::set_sale_price(uint32_t value) { +inline void AppearanceFlagNPC::set_sale_price(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_sale_price(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagNPC.sale_price) } @@ -10491,18 +10369,18 @@ inline void AppearanceFlagNPC::clear_buy_price() { buy_price_ = 0u; _has_bits_[0] &= ~0x00000010u; } -inline uint32_t AppearanceFlagNPC::_internal_buy_price() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagNPC::_internal_buy_price() const { return buy_price_; } -inline uint32_t AppearanceFlagNPC::buy_price() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagNPC::buy_price() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagNPC.buy_price) return _internal_buy_price(); } -inline void AppearanceFlagNPC::_internal_set_buy_price(uint32_t value) { +inline void AppearanceFlagNPC::_internal_set_buy_price(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000010u; buy_price_ = value; } -inline void AppearanceFlagNPC::set_buy_price(uint32_t value) { +inline void AppearanceFlagNPC::set_buy_price(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_buy_price(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagNPC.buy_price) } @@ -10519,18 +10397,18 @@ inline void AppearanceFlagNPC::clear_currency_object_type_id() { currency_object_type_id_ = 0u; _has_bits_[0] &= ~0x00000020u; } -inline uint32_t AppearanceFlagNPC::_internal_currency_object_type_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagNPC::_internal_currency_object_type_id() const { return currency_object_type_id_; } -inline uint32_t AppearanceFlagNPC::currency_object_type_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagNPC::currency_object_type_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagNPC.currency_object_type_id) return _internal_currency_object_type_id(); } -inline void AppearanceFlagNPC::_internal_set_currency_object_type_id(uint32_t value) { +inline void AppearanceFlagNPC::_internal_set_currency_object_type_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000020u; currency_object_type_id_ = value; } -inline void AppearanceFlagNPC::set_currency_object_type_id(uint32_t value) { +inline void AppearanceFlagNPC::set_currency_object_type_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_currency_object_type_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagNPC.currency_object_type_id) } @@ -10580,13 +10458,7 @@ inline std::string* AppearanceFlagNPC::release_currency_quest_flag_display_name( return nullptr; } _has_bits_[0] &= ~0x00000004u; - auto* p = currency_quest_flag_display_name_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (currency_quest_flag_display_name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { - currency_quest_flag_display_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - return p; + return currency_quest_flag_display_name_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); } inline void AppearanceFlagNPC::set_allocated_currency_quest_flag_display_name(std::string* currency_quest_flag_display_name) { if (currency_quest_flag_display_name != nullptr) { @@ -10596,11 +10468,6 @@ inline void AppearanceFlagNPC::set_allocated_currency_quest_flag_display_name(st } currency_quest_flag_display_name_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), currency_quest_flag_display_name, GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (currency_quest_flag_display_name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { - currency_quest_flag_display_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:Canary.protobuf.appearances.AppearanceFlagNPC.currency_quest_flag_display_name) } @@ -10620,18 +10487,18 @@ inline void AppearanceFlagAutomap::clear_color() { color_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t AppearanceFlagAutomap::_internal_color() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagAutomap::_internal_color() const { return color_; } -inline uint32_t AppearanceFlagAutomap::color() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagAutomap::color() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagAutomap.color) return _internal_color(); } -inline void AppearanceFlagAutomap::_internal_set_color(uint32_t value) { +inline void AppearanceFlagAutomap::_internal_set_color(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; color_ = value; } -inline void AppearanceFlagAutomap::set_color(uint32_t value) { +inline void AppearanceFlagAutomap::set_color(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_color(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagAutomap.color) } @@ -10685,18 +10552,18 @@ inline void AppearanceFlagLenshelp::clear_id() { id_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t AppearanceFlagLenshelp::_internal_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagLenshelp::_internal_id() const { return id_; } -inline uint32_t AppearanceFlagLenshelp::id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagLenshelp::id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagLenshelp.id) return _internal_id(); } -inline void AppearanceFlagLenshelp::_internal_set_id(uint32_t value) { +inline void AppearanceFlagLenshelp::_internal_set_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; id_ = value; } -inline void AppearanceFlagLenshelp::set_id(uint32_t value) { +inline void AppearanceFlagLenshelp::set_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagLenshelp.id) } @@ -10717,18 +10584,18 @@ inline void AppearanceFlagChangedToExpire::clear_former_object_typeid() { former_object_typeid_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t AppearanceFlagChangedToExpire::_internal_former_object_typeid() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagChangedToExpire::_internal_former_object_typeid() const { return former_object_typeid_; } -inline uint32_t AppearanceFlagChangedToExpire::former_object_typeid() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagChangedToExpire::former_object_typeid() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagChangedToExpire.former_object_typeid) return _internal_former_object_typeid(); } -inline void AppearanceFlagChangedToExpire::_internal_set_former_object_typeid(uint32_t value) { +inline void AppearanceFlagChangedToExpire::_internal_set_former_object_typeid(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; former_object_typeid_ = value; } -inline void AppearanceFlagChangedToExpire::set_former_object_typeid(uint32_t value) { +inline void AppearanceFlagChangedToExpire::set_former_object_typeid(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_former_object_typeid(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagChangedToExpire.former_object_typeid) } @@ -10749,18 +10616,18 @@ inline void AppearanceFlagCyclopedia::clear_cyclopedia_type() { cyclopedia_type_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t AppearanceFlagCyclopedia::_internal_cyclopedia_type() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagCyclopedia::_internal_cyclopedia_type() const { return cyclopedia_type_; } -inline uint32_t AppearanceFlagCyclopedia::cyclopedia_type() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagCyclopedia::cyclopedia_type() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagCyclopedia.cyclopedia_type) return _internal_cyclopedia_type(); } -inline void AppearanceFlagCyclopedia::_internal_set_cyclopedia_type(uint32_t value) { +inline void AppearanceFlagCyclopedia::_internal_set_cyclopedia_type(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; cyclopedia_type_ = value; } -inline void AppearanceFlagCyclopedia::set_cyclopedia_type(uint32_t value) { +inline void AppearanceFlagCyclopedia::set_cyclopedia_type(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_cyclopedia_type(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagCyclopedia.cyclopedia_type) } @@ -10781,18 +10648,18 @@ inline void SpecialMeaningAppearanceIds::clear_gold_coin_id() { gold_coin_id_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline uint32_t SpecialMeaningAppearanceIds::_internal_gold_coin_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::_internal_gold_coin_id() const { return gold_coin_id_; } -inline uint32_t SpecialMeaningAppearanceIds::gold_coin_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::gold_coin_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.gold_coin_id) return _internal_gold_coin_id(); } -inline void SpecialMeaningAppearanceIds::_internal_set_gold_coin_id(uint32_t value) { +inline void SpecialMeaningAppearanceIds::_internal_set_gold_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000001u; gold_coin_id_ = value; } -inline void SpecialMeaningAppearanceIds::set_gold_coin_id(uint32_t value) { +inline void SpecialMeaningAppearanceIds::set_gold_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_gold_coin_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.gold_coin_id) } @@ -10809,18 +10676,18 @@ inline void SpecialMeaningAppearanceIds::clear_platinum_coin_id() { platinum_coin_id_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline uint32_t SpecialMeaningAppearanceIds::_internal_platinum_coin_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::_internal_platinum_coin_id() const { return platinum_coin_id_; } -inline uint32_t SpecialMeaningAppearanceIds::platinum_coin_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::platinum_coin_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.platinum_coin_id) return _internal_platinum_coin_id(); } -inline void SpecialMeaningAppearanceIds::_internal_set_platinum_coin_id(uint32_t value) { +inline void SpecialMeaningAppearanceIds::_internal_set_platinum_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000002u; platinum_coin_id_ = value; } -inline void SpecialMeaningAppearanceIds::set_platinum_coin_id(uint32_t value) { +inline void SpecialMeaningAppearanceIds::set_platinum_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_platinum_coin_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.platinum_coin_id) } @@ -10837,18 +10704,18 @@ inline void SpecialMeaningAppearanceIds::clear_crystal_coin_id() { crystal_coin_id_ = 0u; _has_bits_[0] &= ~0x00000004u; } -inline uint32_t SpecialMeaningAppearanceIds::_internal_crystal_coin_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::_internal_crystal_coin_id() const { return crystal_coin_id_; } -inline uint32_t SpecialMeaningAppearanceIds::crystal_coin_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::crystal_coin_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.crystal_coin_id) return _internal_crystal_coin_id(); } -inline void SpecialMeaningAppearanceIds::_internal_set_crystal_coin_id(uint32_t value) { +inline void SpecialMeaningAppearanceIds::_internal_set_crystal_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000004u; crystal_coin_id_ = value; } -inline void SpecialMeaningAppearanceIds::set_crystal_coin_id(uint32_t value) { +inline void SpecialMeaningAppearanceIds::set_crystal_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_crystal_coin_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.crystal_coin_id) } @@ -10865,18 +10732,18 @@ inline void SpecialMeaningAppearanceIds::clear_tibia_coin_id() { tibia_coin_id_ = 0u; _has_bits_[0] &= ~0x00000008u; } -inline uint32_t SpecialMeaningAppearanceIds::_internal_tibia_coin_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::_internal_tibia_coin_id() const { return tibia_coin_id_; } -inline uint32_t SpecialMeaningAppearanceIds::tibia_coin_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::tibia_coin_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.tibia_coin_id) return _internal_tibia_coin_id(); } -inline void SpecialMeaningAppearanceIds::_internal_set_tibia_coin_id(uint32_t value) { +inline void SpecialMeaningAppearanceIds::_internal_set_tibia_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000008u; tibia_coin_id_ = value; } -inline void SpecialMeaningAppearanceIds::set_tibia_coin_id(uint32_t value) { +inline void SpecialMeaningAppearanceIds::set_tibia_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_tibia_coin_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.tibia_coin_id) } @@ -10893,18 +10760,18 @@ inline void SpecialMeaningAppearanceIds::clear_stamped_letter_id() { stamped_letter_id_ = 0u; _has_bits_[0] &= ~0x00000010u; } -inline uint32_t SpecialMeaningAppearanceIds::_internal_stamped_letter_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::_internal_stamped_letter_id() const { return stamped_letter_id_; } -inline uint32_t SpecialMeaningAppearanceIds::stamped_letter_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::stamped_letter_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.stamped_letter_id) return _internal_stamped_letter_id(); } -inline void SpecialMeaningAppearanceIds::_internal_set_stamped_letter_id(uint32_t value) { +inline void SpecialMeaningAppearanceIds::_internal_set_stamped_letter_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000010u; stamped_letter_id_ = value; } -inline void SpecialMeaningAppearanceIds::set_stamped_letter_id(uint32_t value) { +inline void SpecialMeaningAppearanceIds::set_stamped_letter_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_stamped_letter_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.stamped_letter_id) } @@ -10921,18 +10788,18 @@ inline void SpecialMeaningAppearanceIds::clear_supply_stash_id() { supply_stash_id_ = 0u; _has_bits_[0] &= ~0x00000020u; } -inline uint32_t SpecialMeaningAppearanceIds::_internal_supply_stash_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::_internal_supply_stash_id() const { return supply_stash_id_; } -inline uint32_t SpecialMeaningAppearanceIds::supply_stash_id() const { +inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::supply_stash_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.supply_stash_id) return _internal_supply_stash_id(); } -inline void SpecialMeaningAppearanceIds::_internal_set_supply_stash_id(uint32_t value) { +inline void SpecialMeaningAppearanceIds::_internal_set_supply_stash_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _has_bits_[0] |= 0x00000020u; supply_stash_id_ = value; } -inline void SpecialMeaningAppearanceIds::set_supply_stash_id(uint32_t value) { +inline void SpecialMeaningAppearanceIds::set_supply_stash_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { _internal_set_supply_stash_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.supply_stash_id) } From e5d5bf84d6c05899a6bfc890aa44fc51da18ced3 Mon Sep 17 00:00:00 2001 From: Marcos <66353315+marcosvf132@users.noreply.github.com> Date: Tue, 31 May 2022 18:09:59 -0300 Subject: [PATCH 3/7] Revert "Few prey improvements" This reverts commit 6d716a5d4946385e2f2ebbdc2d7e6af5eaf43094. --- src/io/ioprey.cpp | 22 +- src/protobuf/appearances.pb.cc | 700 ++++++++-------- src/protobuf/appearances.pb.h | 1391 +++++++++++++++++--------------- 3 files changed, 1138 insertions(+), 975 deletions(-) diff --git a/src/io/ioprey.cpp b/src/io/ioprey.cpp index 0adf8b944de..8b80310c7f8 100644 --- a/src/io/ioprey.cpp +++ b/src/io/ioprey.cpp @@ -40,12 +40,12 @@ void PreySlot::reloadBonusType() if (bonusRarity == 10) { PreyBonus_t bonus_tmp = bonus; while (bonus_tmp == bonus) { - bonus = static_cast(uniform_random(PreyBonus_First, PreyBonus_Last)); + bonus = static_cast(normal_random(PreyBonus_First, PreyBonus_Last)); } return; } - bonus = static_cast(uniform_random(PreyBonus_First, PreyBonus_Last)); + bonus = static_cast(normal_random(PreyBonus_First, PreyBonus_Last)); } void PreySlot::reloadBonusValue() @@ -56,7 +56,7 @@ void PreySlot::reloadBonusValue() if (bonusRarity >= 9) { bonusRarity = 10; } else { - bonusRarity = static_cast(uniform_random(bonusRarity + 1, 10)); + bonusRarity = static_cast(normal_random(bonusRarity + 1, 10)); } bonusPercentage = stagePercent * bonusRarity; @@ -113,7 +113,7 @@ void PreySlot::reloadMonsterGrid(std::vector blackList, uint32_t level uint8_t tries = 0; auto maxIndex = static_cast(bestiary.size() - 1); while (raceIdList.size() < 9) { - uint16_t raceId = (*(std::next(bestiary.begin(), uniform_random(0, maxIndex)))).first; + uint16_t raceId = (*(std::next(bestiary.begin(), normal_random(0, maxIndex)))).first; tries++; if (std::count(blackList.begin(), blackList.end(), raceId) != 0) { @@ -195,7 +195,7 @@ void TaskHuntingSlot::reloadMonsterGrid(std::vector blackList, uint32_ uint8_t tries = 0; auto maxIndex = static_cast(bestiary.size() - 1); while (raceIdList.size() < 9) { - uint16_t raceId = (*(std::next(bestiary.begin(), uniform_random(0, maxIndex)))).first; + uint16_t raceId = (*(std::next(bestiary.begin(), normal_random(0, maxIndex)))).first; tries++; if (std::count(blackList.begin(), blackList.end(), raceId) != 0) { @@ -238,13 +238,13 @@ void TaskHuntingSlot::reloadReward() int32_t chance; if (rarity == 0) { - chance = uniform_random(0, 100); + chance = normal_random(0, 100); } else if (rarity == 1) { - chance = uniform_random(0, 70); + chance = normal_random(0, 70); } else if (rarity == 2) { - chance = uniform_random(0, 45); + chance = normal_random(0, 45); } else if (rarity == 3) { - chance = uniform_random(0, 20); + chance = normal_random(0, 20); } else { return; } @@ -330,7 +330,7 @@ void IOPrey::ParsePreyAction(Player* player, } slot->eraseBonus(true); - slot->state = PreyDataState_SelectionChangeMonster; + slot->state = PreyDataState_Selection; slot->reloadMonsterGrid(player->getPreyBlackList(), player->getLevel()); } else if (action == PreyAction_ListAll_Cards) { if (!player->usePreyCards(static_cast(g_configManager().getNumber(PREY_SELECTION_LIST_PRICE)))) { @@ -506,7 +506,7 @@ void IOPrey::ParseTaskHuntingAction(Player* player, if (const TaskHuntingOption* option = GetTaskRewardOption(slot)) { uint16_t reward; - int32_t boostChange = uniform_random(0, 100); + int32_t boostChange = normal_random(0, 100); if (slot->rarity >= 4 && boostChange <= 5) { boostChange = 20; } else if (slot->rarity >= 4 && boostChange <= 10) { diff --git a/src/protobuf/appearances.pb.cc b/src/protobuf/appearances.pb.cc index a17698fe73f..719a7c64ac6 100644 --- a/src/protobuf/appearances.pb.cc +++ b/src/protobuf/appearances.pb.cc @@ -435,7 +435,7 @@ static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_appearances_2eproto static const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* file_level_enum_descriptors_appearances_2eproto[6]; static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_appearances_2eproto = nullptr; -const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_appearances_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { +const uint32_t TableStruct_appearances_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { PROTOBUF_FIELD_OFFSET(::Canary::protobuf::appearances::Coordinate, _has_bits_), PROTOBUF_FIELD_OFFSET(::Canary::protobuf::appearances::Coordinate, _internal_metadata_), ~0u, // no _extensions_ @@ -1209,7 +1209,7 @@ Coordinate::Coordinate(const Coordinate& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.Coordinate) } -void Coordinate::SharedCtor() { +inline void Coordinate::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&x_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&z_) - @@ -1239,7 +1239,7 @@ void Coordinate::SetCachedSize(int size) const { void Coordinate::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.Coordinate) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1257,12 +1257,12 @@ const char* Coordinate::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 x = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_x(&has_bits); x_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -1271,7 +1271,7 @@ const char* Coordinate::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional uint32 y = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { _Internal::set_has_y(&has_bits); y_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -1280,7 +1280,7 @@ const char* Coordinate::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional uint32 z = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { _Internal::set_has_z(&has_bits); z_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -1311,10 +1311,10 @@ const char* Coordinate::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* Coordinate::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* Coordinate::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.Coordinate) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -1348,7 +1348,7 @@ size_t Coordinate::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.Coordinate) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1389,7 +1389,7 @@ void Coordinate::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void Coordinate::MergeFrom(const Coordinate& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.Coordinate) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; @@ -1481,7 +1481,7 @@ Appearances::Appearances(const Appearances& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.Appearances) } -void Appearances::SharedCtor() { +inline void Appearances::SharedCtor() { special_meaning_appearance_ids_ = nullptr; } @@ -1509,7 +1509,7 @@ void Appearances::SetCachedSize(int size) const { void Appearances::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.Appearances) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1530,12 +1530,12 @@ const char* Appearances::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // repeated .Canary.protobuf.appearances.Appearance object = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { ptr -= 1; do { ptr += 1; @@ -1548,7 +1548,7 @@ const char* Appearances::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID continue; // repeated .Canary.protobuf.appearances.Appearance outfit = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { ptr -= 1; do { ptr += 1; @@ -1561,7 +1561,7 @@ const char* Appearances::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID continue; // repeated .Canary.protobuf.appearances.Appearance effect = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { ptr -= 1; do { ptr += 1; @@ -1574,7 +1574,7 @@ const char* Appearances::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID continue; // repeated .Canary.protobuf.appearances.Appearance missile = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { ptr -= 1; do { ptr += 1; @@ -1587,7 +1587,7 @@ const char* Appearances::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID continue; // optional .Canary.protobuf.appearances.SpecialMeaningAppearanceIds special_meaning_appearance_ids = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 42)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 42)) { ptr = ctx->ParseMessage(_internal_mutable_special_meaning_appearance_ids(), ptr); CHK_(ptr); } else @@ -1617,10 +1617,10 @@ const char* Appearances::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* Appearances::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* Appearances::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.Appearances) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; // repeated .Canary.protobuf.appearances.Appearance object = 1; @@ -1676,7 +1676,7 @@ size_t Appearances::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.Appearances) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1735,7 +1735,7 @@ void Appearances::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void Appearances::MergeFrom(const Appearances& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.Appearances) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; object_.MergeFrom(from.object_); @@ -1808,7 +1808,7 @@ SpritePhase::SpritePhase(const SpritePhase& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.SpritePhase) } -void SpritePhase::SharedCtor() { +inline void SpritePhase::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&duration_min_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&duration_max_) - @@ -1838,7 +1838,7 @@ void SpritePhase::SetCachedSize(int size) const { void SpritePhase::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.SpritePhase) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1856,12 +1856,12 @@ const char* SpritePhase::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 duration_min = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_duration_min(&has_bits); duration_min_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -1870,7 +1870,7 @@ const char* SpritePhase::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID continue; // optional uint32 duration_max = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { _Internal::set_has_duration_max(&has_bits); duration_max_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -1901,10 +1901,10 @@ const char* SpritePhase::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* SpritePhase::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* SpritePhase::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.SpritePhase) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -1932,7 +1932,7 @@ size_t SpritePhase::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.SpritePhase) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1968,7 +1968,7 @@ void SpritePhase::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void SpritePhase::MergeFrom(const SpritePhase& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.SpritePhase) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; @@ -2056,7 +2056,7 @@ SpriteAnimation::SpriteAnimation(const SpriteAnimation& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.SpriteAnimation) } -void SpriteAnimation::SharedCtor() { +inline void SpriteAnimation::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&default_start_phase_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&loop_count_) - @@ -2087,7 +2087,7 @@ void SpriteAnimation::SetCachedSize(int size) const { void SpriteAnimation::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.SpriteAnimation) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2107,12 +2107,12 @@ const char* SpriteAnimation::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 default_start_phase = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_default_start_phase(&has_bits); default_start_phase_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2121,7 +2121,7 @@ const char* SpriteAnimation::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool synchronized = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { _Internal::set_has_synchronized(&has_bits); synchronized_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -2130,7 +2130,7 @@ const char* SpriteAnimation::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool random_start_phase = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { _Internal::set_has_random_start_phase(&has_bits); random_start_phase_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -2139,8 +2139,8 @@ const char* SpriteAnimation::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.ANIMATION_LOOP_TYPE loop_type = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) { - ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { + uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); if (PROTOBUF_PREDICT_TRUE(::Canary::protobuf::appearances::ANIMATION_LOOP_TYPE_IsValid(val))) { _internal_set_loop_type(static_cast<::Canary::protobuf::appearances::ANIMATION_LOOP_TYPE>(val)); @@ -2152,7 +2152,7 @@ const char* SpriteAnimation::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional uint32 loop_count = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { _Internal::set_has_loop_count(&has_bits); loop_count_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2161,7 +2161,7 @@ const char* SpriteAnimation::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // repeated .Canary.protobuf.appearances.SpritePhase sprite_phase = 6; case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 50)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 50)) { ptr -= 1; do { ptr += 1; @@ -2196,10 +2196,10 @@ const char* SpriteAnimation::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* SpriteAnimation::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* SpriteAnimation::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.SpriteAnimation) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -2254,7 +2254,7 @@ size_t SpriteAnimation::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.SpriteAnimation) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2313,7 +2313,7 @@ void SpriteAnimation::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void SpriteAnimation::MergeFrom(const SpriteAnimation& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.SpriteAnimation) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; sprite_phase_.MergeFrom(from.sprite_phase_); @@ -2408,7 +2408,7 @@ Box::Box(const Box& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.Box) } -void Box::SharedCtor() { +inline void Box::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&x_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&height_) - @@ -2438,7 +2438,7 @@ void Box::SetCachedSize(int size) const { void Box::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.Box) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2456,12 +2456,12 @@ const char* Box::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::intern #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 x = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_x(&has_bits); x_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2470,7 +2470,7 @@ const char* Box::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::intern continue; // optional uint32 y = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { _Internal::set_has_y(&has_bits); y_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2479,7 +2479,7 @@ const char* Box::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::intern continue; // optional uint32 width = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { _Internal::set_has_width(&has_bits); width_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2488,7 +2488,7 @@ const char* Box::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::intern continue; // optional uint32 height = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { _Internal::set_has_height(&has_bits); height_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2519,10 +2519,10 @@ const char* Box::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::intern #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* Box::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* Box::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.Box) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -2562,7 +2562,7 @@ size_t Box::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.Box) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2608,7 +2608,7 @@ void Box::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void Box::MergeFrom(const Box& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.Box) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; @@ -2720,7 +2720,7 @@ SpriteInfo::SpriteInfo(const SpriteInfo& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.SpriteInfo) } -void SpriteInfo::SharedCtor() { +inline void SpriteInfo::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&animation_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&is_opaque_) - @@ -2751,7 +2751,7 @@ void SpriteInfo::SetCachedSize(int size) const { void SpriteInfo::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.SpriteInfo) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2775,12 +2775,12 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 pattern_width = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_pattern_width(&has_bits); pattern_width_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2789,7 +2789,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional uint32 pattern_height = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { _Internal::set_has_pattern_height(&has_bits); pattern_height_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2798,7 +2798,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional uint32 pattern_depth = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { _Internal::set_has_pattern_depth(&has_bits); pattern_depth_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2807,7 +2807,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional uint32 layers = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { _Internal::set_has_layers(&has_bits); layers_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2816,7 +2816,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // repeated uint32 sprite_id = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { ptr -= 1; do { ptr += 1; @@ -2824,7 +2824,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<40>(ptr)); - } else if (static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 42) { + } else if (static_cast(tag) == 42) { ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedUInt32Parser(_internal_mutable_sprite_id(), ptr, ctx); CHK_(ptr); } else @@ -2832,7 +2832,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional .Canary.protobuf.appearances.SpriteAnimation animation = 6; case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 50)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 50)) { ptr = ctx->ParseMessage(_internal_mutable_animation(), ptr); CHK_(ptr); } else @@ -2840,7 +2840,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional uint32 bounding_square = 7; case 7: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 56)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 56)) { _Internal::set_has_bounding_square(&has_bits); bounding_square_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -2849,7 +2849,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional bool is_opaque = 8; case 8: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 64)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 64)) { _Internal::set_has_is_opaque(&has_bits); is_opaque_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -2858,7 +2858,7 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // repeated .Canary.protobuf.appearances.Box bounding_box_per_direction = 9; case 9: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 74)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 74)) { ptr -= 1; do { ptr += 1; @@ -2893,10 +2893,10 @@ const char* SpriteInfo::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* SpriteInfo::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* SpriteInfo::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.SpriteInfo) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -2970,7 +2970,7 @@ size_t SpriteInfo::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.SpriteInfo) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -3049,7 +3049,7 @@ void SpriteInfo::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void SpriteInfo::MergeFrom(const SpriteInfo& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.SpriteInfo) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; sprite_id_.MergeFrom(from.sprite_id_); @@ -3158,7 +3158,7 @@ FrameGroup::FrameGroup(const FrameGroup& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.FrameGroup) } -void FrameGroup::SharedCtor() { +inline void FrameGroup::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&sprite_info_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&id_) - @@ -3189,7 +3189,7 @@ void FrameGroup::SetCachedSize(int size) const { void FrameGroup::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.FrameGroup) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -3211,13 +3211,13 @@ const char* FrameGroup::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional .Canary.protobuf.appearances.FIXED_FRAME_GROUP fixed_frame_group = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { - ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); if (PROTOBUF_PREDICT_TRUE(::Canary::protobuf::appearances::FIXED_FRAME_GROUP_IsValid(val))) { _internal_set_fixed_frame_group(static_cast<::Canary::protobuf::appearances::FIXED_FRAME_GROUP>(val)); @@ -3229,7 +3229,7 @@ const char* FrameGroup::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional uint32 id = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { _Internal::set_has_id(&has_bits); id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -3238,7 +3238,7 @@ const char* FrameGroup::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional .Canary.protobuf.appearances.SpriteInfo sprite_info = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { ptr = ctx->ParseMessage(_internal_mutable_sprite_info(), ptr); CHK_(ptr); } else @@ -3268,10 +3268,10 @@ const char* FrameGroup::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* FrameGroup::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* FrameGroup::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.FrameGroup) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -3308,7 +3308,7 @@ size_t FrameGroup::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.FrameGroup) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -3352,7 +3352,7 @@ void FrameGroup::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void FrameGroup::MergeFrom(const FrameGroup& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.FrameGroup) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; @@ -3440,11 +3440,17 @@ Appearance::Appearance(const Appearance& from) frame_group_(from.frame_group_) { _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING if (from._internal_has_name()) { name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_name(), GetArenaForAllocation()); } description_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + description_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING if (from._internal_has_description()) { description_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_description(), GetArenaForAllocation()); @@ -3458,9 +3464,15 @@ Appearance::Appearance(const Appearance& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.Appearance) } -void Appearance::SharedCtor() { +inline void Appearance::SharedCtor() { name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING description_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + description_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&flags_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&id_) - @@ -3493,7 +3505,7 @@ void Appearance::SetCachedSize(int size) const { void Appearance::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.Appearance) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -3520,12 +3532,12 @@ const char* Appearance::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 id = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_id(&has_bits); id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -3534,7 +3546,7 @@ const char* Appearance::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // repeated .Canary.protobuf.appearances.FrameGroup frame_group = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { ptr -= 1; do { ptr += 1; @@ -3547,7 +3559,7 @@ const char* Appearance::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional .Canary.protobuf.appearances.AppearanceFlags flags = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { ptr = ctx->ParseMessage(_internal_mutable_flags(), ptr); CHK_(ptr); } else @@ -3555,7 +3567,7 @@ const char* Appearance::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional bytes name = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { auto str = _internal_mutable_name(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); @@ -3564,7 +3576,7 @@ const char* Appearance::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: continue; // optional bytes description = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 42)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 42)) { auto str = _internal_mutable_description(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); @@ -3595,10 +3607,10 @@ const char* Appearance::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID: #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* Appearance::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* Appearance::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.Appearance) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -3648,7 +3660,7 @@ size_t Appearance::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.Appearance) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -3707,7 +3719,7 @@ void Appearance::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void Appearance::MergeFrom(const Appearance& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.Appearance) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; frame_group_.MergeFrom(from.frame_group_); @@ -4091,7 +4103,7 @@ AppearanceFlags::AppearanceFlags(const AppearanceFlags& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlags) } -void AppearanceFlags::SharedCtor() { +inline void AppearanceFlags::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&bank_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&reportable_) - @@ -4136,7 +4148,7 @@ void AppearanceFlags::SetCachedSize(int size) const { void AppearanceFlags::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlags) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -4235,12 +4247,12 @@ void AppearanceFlags::Clear() { const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional .Canary.protobuf.appearances.AppearanceFlagBank bank = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { ptr = ctx->ParseMessage(_internal_mutable_bank(), ptr); CHK_(ptr); } else @@ -4248,7 +4260,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool clip = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { _Internal::set_has_clip(&_has_bits_); clip_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4257,7 +4269,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool bottom = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { _Internal::set_has_bottom(&_has_bits_); bottom_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4266,7 +4278,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool top = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { _Internal::set_has_top(&_has_bits_); top_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4275,7 +4287,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool container = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { _Internal::set_has_container(&_has_bits_); container_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4284,7 +4296,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool cumulative = 6; case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 48)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 48)) { _Internal::set_has_cumulative(&_has_bits_); cumulative_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4293,7 +4305,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool usable = 7; case 7: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 56)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 56)) { _Internal::set_has_usable(&_has_bits_); usable_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4302,7 +4314,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool forceuse = 8; case 8: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 64)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 64)) { _Internal::set_has_forceuse(&_has_bits_); forceuse_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4311,7 +4323,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool multiuse = 9; case 9: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 72)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 72)) { _Internal::set_has_multiuse(&_has_bits_); multiuse_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4320,7 +4332,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagWrite write = 10; case 10: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 82)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 82)) { ptr = ctx->ParseMessage(_internal_mutable_write(), ptr); CHK_(ptr); } else @@ -4328,7 +4340,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagWriteOnce write_once = 11; case 11: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 90)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 90)) { ptr = ctx->ParseMessage(_internal_mutable_write_once(), ptr); CHK_(ptr); } else @@ -4336,7 +4348,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool liquidpool = 12; case 12: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 96)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 96)) { _Internal::set_has_liquidpool(&_has_bits_); liquidpool_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4345,7 +4357,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool unpass = 13; case 13: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 104)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 104)) { _Internal::set_has_unpass(&_has_bits_); unpass_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4354,7 +4366,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool unmove = 14; case 14: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 112)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 112)) { _Internal::set_has_unmove(&_has_bits_); unmove_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4363,7 +4375,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool unsight = 15; case 15: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 120)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 120)) { _Internal::set_has_unsight(&_has_bits_); unsight_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4372,7 +4384,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool avoid = 16; case 16: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 128)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 128)) { _Internal::set_has_avoid(&_has_bits_); avoid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4381,7 +4393,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool no_movement_animation = 17; case 17: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 136)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 136)) { _Internal::set_has_no_movement_animation(&_has_bits_); no_movement_animation_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4390,7 +4402,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool take = 18; case 18: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 144)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 144)) { _Internal::set_has_take(&_has_bits_); take_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4399,7 +4411,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool liquidcontainer = 19; case 19: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 152)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 152)) { _Internal::set_has_liquidcontainer(&_has_bits_); liquidcontainer_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4408,7 +4420,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool hang = 20; case 20: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 160)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 160)) { _Internal::set_has_hang(&_has_bits_); hang_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4417,7 +4429,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagHook hook = 21; case 21: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 170)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 170)) { ptr = ctx->ParseMessage(_internal_mutable_hook(), ptr); CHK_(ptr); } else @@ -4425,7 +4437,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool rotate = 22; case 22: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 176)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 176)) { _Internal::set_has_rotate(&_has_bits_); rotate_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4434,7 +4446,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagLight light = 23; case 23: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 186)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 186)) { ptr = ctx->ParseMessage(_internal_mutable_light(), ptr); CHK_(ptr); } else @@ -4442,7 +4454,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool dont_hide = 24; case 24: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 192)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 192)) { _Internal::set_has_dont_hide(&_has_bits_); dont_hide_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4451,7 +4463,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool translucent = 25; case 25: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 200)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 200)) { _Internal::set_has_translucent(&_has_bits_); translucent_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4460,7 +4472,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagShift shift = 26; case 26: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 210)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 210)) { ptr = ctx->ParseMessage(_internal_mutable_shift(), ptr); CHK_(ptr); } else @@ -4468,7 +4480,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagHeight height = 27; case 27: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 218)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 218)) { ptr = ctx->ParseMessage(_internal_mutable_height(), ptr); CHK_(ptr); } else @@ -4476,7 +4488,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool lying_object = 28; case 28: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 224)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 224)) { _Internal::set_has_lying_object(&_has_bits_); lying_object_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4485,7 +4497,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool animate_always = 29; case 29: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 232)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 232)) { _Internal::set_has_animate_always(&_has_bits_); animate_always_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4494,7 +4506,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagAutomap automap = 30; case 30: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 242)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 242)) { ptr = ctx->ParseMessage(_internal_mutable_automap(), ptr); CHK_(ptr); } else @@ -4502,7 +4514,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagLenshelp lenshelp = 31; case 31: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 250)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 250)) { ptr = ctx->ParseMessage(_internal_mutable_lenshelp(), ptr); CHK_(ptr); } else @@ -4510,7 +4522,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool fullbank = 32; case 32: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 0)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 0)) { _Internal::set_has_fullbank(&_has_bits_); fullbank_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4519,7 +4531,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool ignore_look = 33; case 33: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_ignore_look(&_has_bits_); ignore_look_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4528,7 +4540,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagClothes clothes = 34; case 34: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { ptr = ctx->ParseMessage(_internal_mutable_clothes(), ptr); CHK_(ptr); } else @@ -4536,7 +4548,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagDefaultAction default_action = 35; case 35: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { ptr = ctx->ParseMessage(_internal_mutable_default_action(), ptr); CHK_(ptr); } else @@ -4544,7 +4556,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagMarket market = 36; case 36: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { ptr = ctx->ParseMessage(_internal_mutable_market(), ptr); CHK_(ptr); } else @@ -4552,7 +4564,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool wrap = 37; case 37: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { _Internal::set_has_wrap(&_has_bits_); wrap_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4561,7 +4573,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool unwrap = 38; case 38: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 48)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 48)) { _Internal::set_has_unwrap(&_has_bits_); unwrap_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4570,7 +4582,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool topeffect = 39; case 39: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 56)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 56)) { _Internal::set_has_topeffect(&_has_bits_); topeffect_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4579,7 +4591,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // repeated .Canary.protobuf.appearances.AppearanceFlagNPC npcsaledata = 40; case 40: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 66)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 66)) { ptr -= 2; do { ptr += 2; @@ -4592,7 +4604,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagChangedToExpire changedtoexpire = 41; case 41: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 74)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 74)) { ptr = ctx->ParseMessage(_internal_mutable_changedtoexpire(), ptr); CHK_(ptr); } else @@ -4600,7 +4612,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool corpse = 42; case 42: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 80)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 80)) { _Internal::set_has_corpse(&_has_bits_); corpse_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4609,7 +4621,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool player_corpse = 43; case 43: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 88)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 88)) { _Internal::set_has_player_corpse(&_has_bits_); player_corpse_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4618,7 +4630,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagCyclopedia cyclopediaitem = 44; case 44: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 98)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 98)) { ptr = ctx->ParseMessage(_internal_mutable_cyclopediaitem(), ptr); CHK_(ptr); } else @@ -4626,7 +4638,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool ammo = 45; case 45: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 104)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 104)) { _Internal::set_has_ammo(&_has_bits_); ammo_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4635,7 +4647,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool show_off_socket = 46; case 46: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 112)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 112)) { _Internal::set_has_show_off_socket(&_has_bits_); show_off_socket_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4644,7 +4656,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional bool reportable = 47; case 47: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 120)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 120)) { _Internal::set_has_reportable(&_has_bits_); reportable_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -4653,7 +4665,7 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC continue; // optional .Canary.protobuf.appearances.AppearanceFlagUpgradeClassification upgradeclassification = 48; case 48: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 130)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 130)) { ptr = ctx->ParseMessage(_internal_mutable_upgradeclassification(), ptr); CHK_(ptr); } else @@ -4682,10 +4694,10 @@ const char* AppearanceFlags::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPAC #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlags::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlags::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlags) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -5035,7 +5047,7 @@ size_t AppearanceFlags::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlags) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -5344,7 +5356,7 @@ void AppearanceFlags::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlags::MergeFrom(const AppearanceFlags& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlags) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; npcsaledata_.MergeFrom(from.npcsaledata_); @@ -5569,7 +5581,7 @@ AppearanceFlagUpgradeClassification::AppearanceFlagUpgradeClassification(const A // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification) } -void AppearanceFlagUpgradeClassification::SharedCtor() { +inline void AppearanceFlagUpgradeClassification::SharedCtor() { upgrade_classification_ = 0u; } @@ -5596,7 +5608,7 @@ void AppearanceFlagUpgradeClassification::SetCachedSize(int size) const { void AppearanceFlagUpgradeClassification::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -5609,12 +5621,12 @@ const char* AppearanceFlagUpgradeClassification::_InternalParse(const char* ptr, #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 upgrade_classification = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_upgrade_classification(&has_bits); upgrade_classification_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -5645,10 +5657,10 @@ const char* AppearanceFlagUpgradeClassification::_InternalParse(const char* ptr, #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagUpgradeClassification::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagUpgradeClassification::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -5670,7 +5682,7 @@ size_t AppearanceFlagUpgradeClassification::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -5699,7 +5711,7 @@ void AppearanceFlagUpgradeClassification::MergeImpl(::PROTOBUF_NAMESPACE_ID::Mes void AppearanceFlagUpgradeClassification::MergeFrom(const AppearanceFlagUpgradeClassification& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_upgrade_classification()) { @@ -5759,7 +5771,7 @@ AppearanceFlagBank::AppearanceFlagBank(const AppearanceFlagBank& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagBank) } -void AppearanceFlagBank::SharedCtor() { +inline void AppearanceFlagBank::SharedCtor() { waypoints_ = 0u; } @@ -5786,7 +5798,7 @@ void AppearanceFlagBank::SetCachedSize(int size) const { void AppearanceFlagBank::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagBank) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -5799,12 +5811,12 @@ const char* AppearanceFlagBank::_InternalParse(const char* ptr, ::PROTOBUF_NAMES #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 waypoints = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_waypoints(&has_bits); waypoints_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -5835,10 +5847,10 @@ const char* AppearanceFlagBank::_InternalParse(const char* ptr, ::PROTOBUF_NAMES #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagBank::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagBank::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagBank) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -5860,7 +5872,7 @@ size_t AppearanceFlagBank::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagBank) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -5889,7 +5901,7 @@ void AppearanceFlagBank::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagBank::MergeFrom(const AppearanceFlagBank& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagBank) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_waypoints()) { @@ -5949,7 +5961,7 @@ AppearanceFlagWrite::AppearanceFlagWrite(const AppearanceFlagWrite& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagWrite) } -void AppearanceFlagWrite::SharedCtor() { +inline void AppearanceFlagWrite::SharedCtor() { max_text_length_ = 0u; } @@ -5976,7 +5988,7 @@ void AppearanceFlagWrite::SetCachedSize(int size) const { void AppearanceFlagWrite::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagWrite) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -5989,12 +6001,12 @@ const char* AppearanceFlagWrite::_InternalParse(const char* ptr, ::PROTOBUF_NAME #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 max_text_length = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_max_text_length(&has_bits); max_text_length_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -6025,10 +6037,10 @@ const char* AppearanceFlagWrite::_InternalParse(const char* ptr, ::PROTOBUF_NAME #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagWrite::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagWrite::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagWrite) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -6050,7 +6062,7 @@ size_t AppearanceFlagWrite::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagWrite) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6079,7 +6091,7 @@ void AppearanceFlagWrite::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagWrite::MergeFrom(const AppearanceFlagWrite& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagWrite) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_max_text_length()) { @@ -6139,7 +6151,7 @@ AppearanceFlagWriteOnce::AppearanceFlagWriteOnce(const AppearanceFlagWriteOnce& // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagWriteOnce) } -void AppearanceFlagWriteOnce::SharedCtor() { +inline void AppearanceFlagWriteOnce::SharedCtor() { max_text_length_once_ = 0u; } @@ -6166,7 +6178,7 @@ void AppearanceFlagWriteOnce::SetCachedSize(int size) const { void AppearanceFlagWriteOnce::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagWriteOnce) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6179,12 +6191,12 @@ const char* AppearanceFlagWriteOnce::_InternalParse(const char* ptr, ::PROTOBUF_ #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 max_text_length_once = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_max_text_length_once(&has_bits); max_text_length_once_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -6215,10 +6227,10 @@ const char* AppearanceFlagWriteOnce::_InternalParse(const char* ptr, ::PROTOBUF_ #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagWriteOnce::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagWriteOnce::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagWriteOnce) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -6240,7 +6252,7 @@ size_t AppearanceFlagWriteOnce::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagWriteOnce) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6269,7 +6281,7 @@ void AppearanceFlagWriteOnce::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagWriteOnce::MergeFrom(const AppearanceFlagWriteOnce& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagWriteOnce) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_max_text_length_once()) { @@ -6334,7 +6346,7 @@ AppearanceFlagLight::AppearanceFlagLight(const AppearanceFlagLight& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagLight) } -void AppearanceFlagLight::SharedCtor() { +inline void AppearanceFlagLight::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&brightness_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&color_) - @@ -6364,7 +6376,7 @@ void AppearanceFlagLight::SetCachedSize(int size) const { void AppearanceFlagLight::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagLight) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6382,12 +6394,12 @@ const char* AppearanceFlagLight::_InternalParse(const char* ptr, ::PROTOBUF_NAME #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 brightness = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_brightness(&has_bits); brightness_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -6396,7 +6408,7 @@ const char* AppearanceFlagLight::_InternalParse(const char* ptr, ::PROTOBUF_NAME continue; // optional uint32 color = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { _Internal::set_has_color(&has_bits); color_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -6427,10 +6439,10 @@ const char* AppearanceFlagLight::_InternalParse(const char* ptr, ::PROTOBUF_NAME #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagLight::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagLight::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagLight) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -6458,7 +6470,7 @@ size_t AppearanceFlagLight::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagLight) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6494,7 +6506,7 @@ void AppearanceFlagLight::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagLight::MergeFrom(const AppearanceFlagLight& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagLight) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; @@ -6566,7 +6578,7 @@ AppearanceFlagHeight::AppearanceFlagHeight(const AppearanceFlagHeight& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagHeight) } -void AppearanceFlagHeight::SharedCtor() { +inline void AppearanceFlagHeight::SharedCtor() { elevation_ = 0u; } @@ -6593,7 +6605,7 @@ void AppearanceFlagHeight::SetCachedSize(int size) const { void AppearanceFlagHeight::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagHeight) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6606,12 +6618,12 @@ const char* AppearanceFlagHeight::_InternalParse(const char* ptr, ::PROTOBUF_NAM #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 elevation = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_elevation(&has_bits); elevation_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -6642,10 +6654,10 @@ const char* AppearanceFlagHeight::_InternalParse(const char* ptr, ::PROTOBUF_NAM #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagHeight::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagHeight::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagHeight) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -6667,7 +6679,7 @@ size_t AppearanceFlagHeight::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagHeight) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6696,7 +6708,7 @@ void AppearanceFlagHeight::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagHeight::MergeFrom(const AppearanceFlagHeight& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagHeight) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_elevation()) { @@ -6761,7 +6773,7 @@ AppearanceFlagShift::AppearanceFlagShift(const AppearanceFlagShift& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagShift) } -void AppearanceFlagShift::SharedCtor() { +inline void AppearanceFlagShift::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&x_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&y_) - @@ -6791,7 +6803,7 @@ void AppearanceFlagShift::SetCachedSize(int size) const { void AppearanceFlagShift::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagShift) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6809,12 +6821,12 @@ const char* AppearanceFlagShift::_InternalParse(const char* ptr, ::PROTOBUF_NAME #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 x = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_x(&has_bits); x_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -6823,7 +6835,7 @@ const char* AppearanceFlagShift::_InternalParse(const char* ptr, ::PROTOBUF_NAME continue; // optional uint32 y = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { _Internal::set_has_y(&has_bits); y_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -6854,10 +6866,10 @@ const char* AppearanceFlagShift::_InternalParse(const char* ptr, ::PROTOBUF_NAME #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagShift::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagShift::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagShift) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -6885,7 +6897,7 @@ size_t AppearanceFlagShift::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagShift) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -6921,7 +6933,7 @@ void AppearanceFlagShift::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagShift::MergeFrom(const AppearanceFlagShift& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagShift) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; @@ -6993,7 +7005,7 @@ AppearanceFlagClothes::AppearanceFlagClothes(const AppearanceFlagClothes& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagClothes) } -void AppearanceFlagClothes::SharedCtor() { +inline void AppearanceFlagClothes::SharedCtor() { slot_ = 0u; } @@ -7020,7 +7032,7 @@ void AppearanceFlagClothes::SetCachedSize(int size) const { void AppearanceFlagClothes::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagClothes) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -7033,12 +7045,12 @@ const char* AppearanceFlagClothes::_InternalParse(const char* ptr, ::PROTOBUF_NA #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 slot = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_slot(&has_bits); slot_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -7069,10 +7081,10 @@ const char* AppearanceFlagClothes::_InternalParse(const char* ptr, ::PROTOBUF_NA #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagClothes::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagClothes::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagClothes) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -7094,7 +7106,7 @@ size_t AppearanceFlagClothes::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagClothes) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -7123,7 +7135,7 @@ void AppearanceFlagClothes::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagClothes::MergeFrom(const AppearanceFlagClothes& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagClothes) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_slot()) { @@ -7183,7 +7195,7 @@ AppearanceFlagDefaultAction::AppearanceFlagDefaultAction(const AppearanceFlagDef // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagDefaultAction) } -void AppearanceFlagDefaultAction::SharedCtor() { +inline void AppearanceFlagDefaultAction::SharedCtor() { action_ = 0; } @@ -7210,7 +7222,7 @@ void AppearanceFlagDefaultAction::SetCachedSize(int size) const { void AppearanceFlagDefaultAction::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagDefaultAction) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -7223,13 +7235,13 @@ const char* AppearanceFlagDefaultAction::_InternalParse(const char* ptr, ::PROTO #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional .Canary.protobuf.appearances.PLAYER_ACTION action = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { - ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); if (PROTOBUF_PREDICT_TRUE(::Canary::protobuf::appearances::PLAYER_ACTION_IsValid(val))) { _internal_set_action(static_cast<::Canary::protobuf::appearances::PLAYER_ACTION>(val)); @@ -7263,10 +7275,10 @@ const char* AppearanceFlagDefaultAction::_InternalParse(const char* ptr, ::PROTO #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagDefaultAction::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagDefaultAction::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagDefaultAction) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -7289,7 +7301,7 @@ size_t AppearanceFlagDefaultAction::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagDefaultAction) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -7319,7 +7331,7 @@ void AppearanceFlagDefaultAction::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to void AppearanceFlagDefaultAction::MergeFrom(const AppearanceFlagDefaultAction& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagDefaultAction) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_action()) { @@ -7392,7 +7404,7 @@ AppearanceFlagMarket::AppearanceFlagMarket(const AppearanceFlagMarket& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagMarket) } -void AppearanceFlagMarket::SharedCtor() { +inline void AppearanceFlagMarket::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&trade_as_object_id_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&minimum_level_) - @@ -7423,7 +7435,7 @@ void AppearanceFlagMarket::SetCachedSize(int size) const { void AppearanceFlagMarket::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagMarket) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -7443,13 +7455,13 @@ const char* AppearanceFlagMarket::_InternalParse(const char* ptr, ::PROTOBUF_NAM #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional .Canary.protobuf.appearances.ITEM_CATEGORY category = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { - ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); if (PROTOBUF_PREDICT_TRUE(::Canary::protobuf::appearances::ITEM_CATEGORY_IsValid(val))) { _internal_set_category(static_cast<::Canary::protobuf::appearances::ITEM_CATEGORY>(val)); @@ -7461,7 +7473,7 @@ const char* AppearanceFlagMarket::_InternalParse(const char* ptr, ::PROTOBUF_NAM continue; // optional uint32 trade_as_object_id = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { _Internal::set_has_trade_as_object_id(&has_bits); trade_as_object_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -7470,7 +7482,7 @@ const char* AppearanceFlagMarket::_InternalParse(const char* ptr, ::PROTOBUF_NAM continue; // optional uint32 show_as_object_id = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { _Internal::set_has_show_as_object_id(&has_bits); show_as_object_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -7479,11 +7491,11 @@ const char* AppearanceFlagMarket::_InternalParse(const char* ptr, ::PROTOBUF_NAM continue; // repeated .Canary.protobuf.appearances.PLAYER_PROFESSION restrict_to_profession = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { ptr -= 1; do { ptr += 1; - ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); if (PROTOBUF_PREDICT_TRUE(::Canary::protobuf::appearances::PLAYER_PROFESSION_IsValid(val))) { _internal_add_restrict_to_profession(static_cast<::Canary::protobuf::appearances::PLAYER_PROFESSION>(val)); @@ -7492,7 +7504,7 @@ const char* AppearanceFlagMarket::_InternalParse(const char* ptr, ::PROTOBUF_NAM } if (!ctx->DataAvailable(ptr)) break; } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<40>(ptr)); - } else if (static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 42) { + } else if (static_cast(tag) == 42) { ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedEnumParser<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(_internal_mutable_restrict_to_profession(), ptr, ctx, ::Canary::protobuf::appearances::PLAYER_PROFESSION_IsValid, &_internal_metadata_, 5); CHK_(ptr); } else @@ -7500,7 +7512,7 @@ const char* AppearanceFlagMarket::_InternalParse(const char* ptr, ::PROTOBUF_NAM continue; // optional uint32 minimum_level = 6; case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 48)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 48)) { _Internal::set_has_minimum_level(&has_bits); minimum_level_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -7531,10 +7543,10 @@ const char* AppearanceFlagMarket::_InternalParse(const char* ptr, ::PROTOBUF_NAM #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagMarket::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagMarket::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagMarket) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -7582,7 +7594,7 @@ size_t AppearanceFlagMarket::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagMarket) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -7639,7 +7651,7 @@ void AppearanceFlagMarket::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagMarket::MergeFrom(const AppearanceFlagMarket& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagMarket) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; restrict_to_profession_.MergeFrom(from.restrict_to_profession_); @@ -7732,16 +7744,25 @@ AppearanceFlagNPC::AppearanceFlagNPC(const AppearanceFlagNPC& from) _has_bits_(from._has_bits_) { _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING if (from._internal_has_name()) { name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_name(), GetArenaForAllocation()); } location_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + location_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING if (from._internal_has_location()) { location_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_location(), GetArenaForAllocation()); } currency_quest_flag_display_name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + currency_quest_flag_display_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING if (from._internal_has_currency_quest_flag_display_name()) { currency_quest_flag_display_name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_currency_quest_flag_display_name(), GetArenaForAllocation()); @@ -7752,10 +7773,19 @@ AppearanceFlagNPC::AppearanceFlagNPC(const AppearanceFlagNPC& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagNPC) } -void AppearanceFlagNPC::SharedCtor() { +inline void AppearanceFlagNPC::SharedCtor() { name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING location_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + location_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING currency_quest_flag_display_name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + currency_quest_flag_display_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&sale_price_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(¤cy_object_type_id_) - @@ -7788,7 +7818,7 @@ void AppearanceFlagNPC::SetCachedSize(int size) const { void AppearanceFlagNPC::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagNPC) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -7817,12 +7847,12 @@ const char* AppearanceFlagNPC::_InternalParse(const char* ptr, ::PROTOBUF_NAMESP #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional bytes name = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { auto str = _internal_mutable_name(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); @@ -7831,7 +7861,7 @@ const char* AppearanceFlagNPC::_InternalParse(const char* ptr, ::PROTOBUF_NAMESP continue; // optional bytes location = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { auto str = _internal_mutable_location(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); @@ -7840,7 +7870,7 @@ const char* AppearanceFlagNPC::_InternalParse(const char* ptr, ::PROTOBUF_NAMESP continue; // optional uint32 sale_price = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { _Internal::set_has_sale_price(&has_bits); sale_price_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -7849,7 +7879,7 @@ const char* AppearanceFlagNPC::_InternalParse(const char* ptr, ::PROTOBUF_NAMESP continue; // optional uint32 buy_price = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { _Internal::set_has_buy_price(&has_bits); buy_price_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -7858,7 +7888,7 @@ const char* AppearanceFlagNPC::_InternalParse(const char* ptr, ::PROTOBUF_NAMESP continue; // optional uint32 currency_object_type_id = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { _Internal::set_has_currency_object_type_id(&has_bits); currency_object_type_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -7867,7 +7897,7 @@ const char* AppearanceFlagNPC::_InternalParse(const char* ptr, ::PROTOBUF_NAMESP continue; // optional bytes currency_quest_flag_display_name = 6; case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 50)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 50)) { auto str = _internal_mutable_currency_quest_flag_display_name(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); @@ -7898,10 +7928,10 @@ const char* AppearanceFlagNPC::_InternalParse(const char* ptr, ::PROTOBUF_NAMESP #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagNPC::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagNPC::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagNPC) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -7953,7 +7983,7 @@ size_t AppearanceFlagNPC::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagNPC) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8015,7 +8045,7 @@ void AppearanceFlagNPC::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagNPC::MergeFrom(const AppearanceFlagNPC& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagNPC) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; @@ -8116,7 +8146,7 @@ AppearanceFlagAutomap::AppearanceFlagAutomap(const AppearanceFlagAutomap& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagAutomap) } -void AppearanceFlagAutomap::SharedCtor() { +inline void AppearanceFlagAutomap::SharedCtor() { color_ = 0u; } @@ -8143,7 +8173,7 @@ void AppearanceFlagAutomap::SetCachedSize(int size) const { void AppearanceFlagAutomap::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagAutomap) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8156,12 +8186,12 @@ const char* AppearanceFlagAutomap::_InternalParse(const char* ptr, ::PROTOBUF_NA #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 color = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_color(&has_bits); color_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -8192,10 +8222,10 @@ const char* AppearanceFlagAutomap::_InternalParse(const char* ptr, ::PROTOBUF_NA #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagAutomap::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagAutomap::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagAutomap) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -8217,7 +8247,7 @@ size_t AppearanceFlagAutomap::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagAutomap) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8246,7 +8276,7 @@ void AppearanceFlagAutomap::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagAutomap::MergeFrom(const AppearanceFlagAutomap& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagAutomap) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_color()) { @@ -8306,7 +8336,7 @@ AppearanceFlagHook::AppearanceFlagHook(const AppearanceFlagHook& from) // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagHook) } -void AppearanceFlagHook::SharedCtor() { +inline void AppearanceFlagHook::SharedCtor() { direction_ = 1; } @@ -8333,7 +8363,7 @@ void AppearanceFlagHook::SetCachedSize(int size) const { void AppearanceFlagHook::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagHook) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8346,13 +8376,13 @@ const char* AppearanceFlagHook::_InternalParse(const char* ptr, ::PROTOBUF_NAMES #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional .Canary.protobuf.appearances.HOOK_TYPE direction = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { - ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); if (PROTOBUF_PREDICT_TRUE(::Canary::protobuf::appearances::HOOK_TYPE_IsValid(val))) { _internal_set_direction(static_cast<::Canary::protobuf::appearances::HOOK_TYPE>(val)); @@ -8386,10 +8416,10 @@ const char* AppearanceFlagHook::_InternalParse(const char* ptr, ::PROTOBUF_NAMES #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagHook::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagHook::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagHook) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -8412,7 +8442,7 @@ size_t AppearanceFlagHook::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagHook) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8442,7 +8472,7 @@ void AppearanceFlagHook::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagHook::MergeFrom(const AppearanceFlagHook& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagHook) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_direction()) { @@ -8502,7 +8532,7 @@ AppearanceFlagLenshelp::AppearanceFlagLenshelp(const AppearanceFlagLenshelp& fro // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagLenshelp) } -void AppearanceFlagLenshelp::SharedCtor() { +inline void AppearanceFlagLenshelp::SharedCtor() { id_ = 0u; } @@ -8529,7 +8559,7 @@ void AppearanceFlagLenshelp::SetCachedSize(int size) const { void AppearanceFlagLenshelp::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagLenshelp) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8542,12 +8572,12 @@ const char* AppearanceFlagLenshelp::_InternalParse(const char* ptr, ::PROTOBUF_N #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 id = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_id(&has_bits); id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -8578,10 +8608,10 @@ const char* AppearanceFlagLenshelp::_InternalParse(const char* ptr, ::PROTOBUF_N #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagLenshelp::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagLenshelp::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagLenshelp) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -8603,7 +8633,7 @@ size_t AppearanceFlagLenshelp::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagLenshelp) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8632,7 +8662,7 @@ void AppearanceFlagLenshelp::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagLenshelp::MergeFrom(const AppearanceFlagLenshelp& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagLenshelp) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_id()) { @@ -8692,7 +8722,7 @@ AppearanceFlagChangedToExpire::AppearanceFlagChangedToExpire(const AppearanceFla // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagChangedToExpire) } -void AppearanceFlagChangedToExpire::SharedCtor() { +inline void AppearanceFlagChangedToExpire::SharedCtor() { former_object_typeid_ = 0u; } @@ -8719,7 +8749,7 @@ void AppearanceFlagChangedToExpire::SetCachedSize(int size) const { void AppearanceFlagChangedToExpire::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagChangedToExpire) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8732,12 +8762,12 @@ const char* AppearanceFlagChangedToExpire::_InternalParse(const char* ptr, ::PRO #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 former_object_typeid = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_former_object_typeid(&has_bits); former_object_typeid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -8768,10 +8798,10 @@ const char* AppearanceFlagChangedToExpire::_InternalParse(const char* ptr, ::PRO #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagChangedToExpire::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagChangedToExpire::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagChangedToExpire) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -8793,7 +8823,7 @@ size_t AppearanceFlagChangedToExpire::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagChangedToExpire) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8822,7 +8852,7 @@ void AppearanceFlagChangedToExpire::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* void AppearanceFlagChangedToExpire::MergeFrom(const AppearanceFlagChangedToExpire& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagChangedToExpire) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_former_object_typeid()) { @@ -8882,7 +8912,7 @@ AppearanceFlagCyclopedia::AppearanceFlagCyclopedia(const AppearanceFlagCyclopedi // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.AppearanceFlagCyclopedia) } -void AppearanceFlagCyclopedia::SharedCtor() { +inline void AppearanceFlagCyclopedia::SharedCtor() { cyclopedia_type_ = 0u; } @@ -8909,7 +8939,7 @@ void AppearanceFlagCyclopedia::SetCachedSize(int size) const { void AppearanceFlagCyclopedia::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.AppearanceFlagCyclopedia) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -8922,12 +8952,12 @@ const char* AppearanceFlagCyclopedia::_InternalParse(const char* ptr, ::PROTOBUF #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 cyclopedia_type = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_cyclopedia_type(&has_bits); cyclopedia_type_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -8958,10 +8988,10 @@ const char* AppearanceFlagCyclopedia::_InternalParse(const char* ptr, ::PROTOBUF #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* AppearanceFlagCyclopedia::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* AppearanceFlagCyclopedia::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.AppearanceFlagCyclopedia) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -8983,7 +9013,7 @@ size_t AppearanceFlagCyclopedia::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.AppearanceFlagCyclopedia) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -9012,7 +9042,7 @@ void AppearanceFlagCyclopedia::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, void AppearanceFlagCyclopedia::MergeFrom(const AppearanceFlagCyclopedia& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.AppearanceFlagCyclopedia) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; if (from._internal_has_cyclopedia_type()) { @@ -9089,7 +9119,7 @@ SpecialMeaningAppearanceIds::SpecialMeaningAppearanceIds(const SpecialMeaningApp // @@protoc_insertion_point(copy_constructor:Canary.protobuf.appearances.SpecialMeaningAppearanceIds) } -void SpecialMeaningAppearanceIds::SharedCtor() { +inline void SpecialMeaningAppearanceIds::SharedCtor() { ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&gold_coin_id_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&supply_stash_id_) - @@ -9119,7 +9149,7 @@ void SpecialMeaningAppearanceIds::SetCachedSize(int size) const { void SpecialMeaningAppearanceIds::Clear() { // @@protoc_insertion_point(message_clear_start:Canary.protobuf.appearances.SpecialMeaningAppearanceIds) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -9137,12 +9167,12 @@ const char* SpecialMeaningAppearanceIds::_InternalParse(const char* ptr, ::PROTO #define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure _Internal::HasBits has_bits{}; while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; + uint32_t tag; ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); switch (tag >> 3) { // optional uint32 gold_coin_id = 1; case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { _Internal::set_has_gold_coin_id(&has_bits); gold_coin_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -9151,7 +9181,7 @@ const char* SpecialMeaningAppearanceIds::_InternalParse(const char* ptr, ::PROTO continue; // optional uint32 platinum_coin_id = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { _Internal::set_has_platinum_coin_id(&has_bits); platinum_coin_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -9160,7 +9190,7 @@ const char* SpecialMeaningAppearanceIds::_InternalParse(const char* ptr, ::PROTO continue; // optional uint32 crystal_coin_id = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { _Internal::set_has_crystal_coin_id(&has_bits); crystal_coin_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -9169,7 +9199,7 @@ const char* SpecialMeaningAppearanceIds::_InternalParse(const char* ptr, ::PROTO continue; // optional uint32 tibia_coin_id = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { _Internal::set_has_tibia_coin_id(&has_bits); tibia_coin_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -9178,7 +9208,7 @@ const char* SpecialMeaningAppearanceIds::_InternalParse(const char* ptr, ::PROTO continue; // optional uint32 stamped_letter_id = 5; case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { _Internal::set_has_stamped_letter_id(&has_bits); stamped_letter_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -9187,7 +9217,7 @@ const char* SpecialMeaningAppearanceIds::_InternalParse(const char* ptr, ::PROTO continue; // optional uint32 supply_stash_id = 6; case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 48)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 48)) { _Internal::set_has_supply_stash_id(&has_bits); supply_stash_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); @@ -9218,10 +9248,10 @@ const char* SpecialMeaningAppearanceIds::_InternalParse(const char* ptr, ::PROTO #undef CHK_ } -::PROTOBUF_NAMESPACE_ID::uint8* SpecialMeaningAppearanceIds::_InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +uint8_t* SpecialMeaningAppearanceIds::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:Canary.protobuf.appearances.SpecialMeaningAppearanceIds) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = _has_bits_[0]; @@ -9273,7 +9303,7 @@ size_t SpecialMeaningAppearanceIds::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:Canary.protobuf.appearances.SpecialMeaningAppearanceIds) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -9329,7 +9359,7 @@ void SpecialMeaningAppearanceIds::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to void SpecialMeaningAppearanceIds::MergeFrom(const SpecialMeaningAppearanceIds& from) { // @@protoc_insertion_point(class_specific_merge_from_start:Canary.protobuf.appearances.SpecialMeaningAppearanceIds) GOOGLE_DCHECK_NE(&from, this); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + uint32_t cached_has_bits = 0; (void) cached_has_bits; cached_has_bits = from._has_bits_[0]; diff --git a/src/protobuf/appearances.pb.h b/src/protobuf/appearances.pb.h index 8c8095587d2..870dc2f9779 100644 --- a/src/protobuf/appearances.pb.h +++ b/src/protobuf/appearances.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3018000 +#if PROTOBUF_VERSION < 3019000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3018000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3019004 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. @@ -51,7 +51,7 @@ struct TableStruct_appearances_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[]; static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[]; - static const ::PROTOBUF_NAMESPACE_ID::uint32 offsets[]; + static const uint32_t offsets[]; }; extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_appearances_2eproto; namespace Canary { @@ -405,7 +405,12 @@ class Coordinate final : } inline void Swap(Coordinate* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -419,11 +424,7 @@ class Coordinate final : // implements Message ---------------------------------------------- - inline Coordinate* New() const final { - return new Coordinate(); - } - - Coordinate* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + Coordinate* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -438,8 +439,8 @@ class Coordinate final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -447,6 +448,8 @@ class Coordinate final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Coordinate* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.Coordinate"; @@ -479,11 +482,11 @@ class Coordinate final : bool _internal_has_x() const; public: void clear_x(); - ::PROTOBUF_NAMESPACE_ID::uint32 x() const; - void set_x(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t x() const; + void set_x(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_x() const; - void _internal_set_x(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_x() const; + void _internal_set_x(uint32_t value); public: // optional uint32 y = 2; @@ -492,11 +495,11 @@ class Coordinate final : bool _internal_has_y() const; public: void clear_y(); - ::PROTOBUF_NAMESPACE_ID::uint32 y() const; - void set_y(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t y() const; + void set_y(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_y() const; - void _internal_set_y(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_y() const; + void _internal_set_y(uint32_t value); public: // optional uint32 z = 3; @@ -505,11 +508,11 @@ class Coordinate final : bool _internal_has_z() const; public: void clear_z(); - ::PROTOBUF_NAMESPACE_ID::uint32 z() const; - void set_z(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t z() const; + void set_z(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_z() const; - void _internal_set_z(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_z() const; + void _internal_set_z(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.Coordinate) @@ -521,9 +524,9 @@ class Coordinate final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 x_; - ::PROTOBUF_NAMESPACE_ID::uint32 y_; - ::PROTOBUF_NAMESPACE_ID::uint32 z_; + uint32_t x_; + uint32_t y_; + uint32_t z_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -590,7 +593,12 @@ class Appearances final : } inline void Swap(Appearances* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -604,11 +612,7 @@ class Appearances final : // implements Message ---------------------------------------------- - inline Appearances* New() const final { - return new Appearances(); - } - - Appearances* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + Appearances* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -623,8 +627,8 @@ class Appearances final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -632,6 +636,8 @@ class Appearances final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Appearances* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.Appearances"; @@ -739,7 +745,7 @@ class Appearances final : public: void clear_special_meaning_appearance_ids(); const ::Canary::protobuf::appearances::SpecialMeaningAppearanceIds& special_meaning_appearance_ids() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::SpecialMeaningAppearanceIds* release_special_meaning_appearance_ids(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::SpecialMeaningAppearanceIds* release_special_meaning_appearance_ids(); ::Canary::protobuf::appearances::SpecialMeaningAppearanceIds* mutable_special_meaning_appearance_ids(); void set_allocated_special_meaning_appearance_ids(::Canary::protobuf::appearances::SpecialMeaningAppearanceIds* special_meaning_appearance_ids); private: @@ -830,7 +836,12 @@ class SpritePhase final : } inline void Swap(SpritePhase* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -844,11 +855,7 @@ class SpritePhase final : // implements Message ---------------------------------------------- - inline SpritePhase* New() const final { - return new SpritePhase(); - } - - SpritePhase* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + SpritePhase* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -863,8 +870,8 @@ class SpritePhase final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -872,6 +879,8 @@ class SpritePhase final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(SpritePhase* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.SpritePhase"; @@ -903,11 +912,11 @@ class SpritePhase final : bool _internal_has_duration_min() const; public: void clear_duration_min(); - ::PROTOBUF_NAMESPACE_ID::uint32 duration_min() const; - void set_duration_min(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t duration_min() const; + void set_duration_min(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_duration_min() const; - void _internal_set_duration_min(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_duration_min() const; + void _internal_set_duration_min(uint32_t value); public: // optional uint32 duration_max = 2; @@ -916,11 +925,11 @@ class SpritePhase final : bool _internal_has_duration_max() const; public: void clear_duration_max(); - ::PROTOBUF_NAMESPACE_ID::uint32 duration_max() const; - void set_duration_max(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t duration_max() const; + void set_duration_max(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_duration_max() const; - void _internal_set_duration_max(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_duration_max() const; + void _internal_set_duration_max(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.SpritePhase) @@ -932,8 +941,8 @@ class SpritePhase final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 duration_min_; - ::PROTOBUF_NAMESPACE_ID::uint32 duration_max_; + uint32_t duration_min_; + uint32_t duration_max_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -1000,7 +1009,12 @@ class SpriteAnimation final : } inline void Swap(SpriteAnimation* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -1014,11 +1028,7 @@ class SpriteAnimation final : // implements Message ---------------------------------------------- - inline SpriteAnimation* New() const final { - return new SpriteAnimation(); - } - - SpriteAnimation* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + SpriteAnimation* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -1033,8 +1043,8 @@ class SpriteAnimation final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -1042,6 +1052,8 @@ class SpriteAnimation final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(SpriteAnimation* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.SpriteAnimation"; @@ -1095,11 +1107,11 @@ class SpriteAnimation final : bool _internal_has_default_start_phase() const; public: void clear_default_start_phase(); - ::PROTOBUF_NAMESPACE_ID::uint32 default_start_phase() const; - void set_default_start_phase(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t default_start_phase() const; + void set_default_start_phase(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_default_start_phase() const; - void _internal_set_default_start_phase(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_default_start_phase() const; + void _internal_set_default_start_phase(uint32_t value); public: // optional bool synchronized = 2; @@ -1134,11 +1146,11 @@ class SpriteAnimation final : bool _internal_has_loop_count() const; public: void clear_loop_count(); - ::PROTOBUF_NAMESPACE_ID::uint32 loop_count() const; - void set_loop_count(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t loop_count() const; + void set_loop_count(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_loop_count() const; - void _internal_set_loop_count(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_loop_count() const; + void _internal_set_loop_count(uint32_t value); public: // optional .Canary.protobuf.appearances.ANIMATION_LOOP_TYPE loop_type = 4; @@ -1164,10 +1176,10 @@ class SpriteAnimation final : ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Canary::protobuf::appearances::SpritePhase > sprite_phase_; - ::PROTOBUF_NAMESPACE_ID::uint32 default_start_phase_; + uint32_t default_start_phase_; bool synchronized_; bool random_start_phase_; - ::PROTOBUF_NAMESPACE_ID::uint32 loop_count_; + uint32_t loop_count_; int loop_type_; friend struct ::TableStruct_appearances_2eproto; }; @@ -1235,7 +1247,12 @@ class Box final : } inline void Swap(Box* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -1249,11 +1266,7 @@ class Box final : // implements Message ---------------------------------------------- - inline Box* New() const final { - return new Box(); - } - - Box* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + Box* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -1268,8 +1281,8 @@ class Box final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -1277,6 +1290,8 @@ class Box final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Box* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.Box"; @@ -1310,11 +1325,11 @@ class Box final : bool _internal_has_x() const; public: void clear_x(); - ::PROTOBUF_NAMESPACE_ID::uint32 x() const; - void set_x(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t x() const; + void set_x(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_x() const; - void _internal_set_x(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_x() const; + void _internal_set_x(uint32_t value); public: // optional uint32 y = 2; @@ -1323,11 +1338,11 @@ class Box final : bool _internal_has_y() const; public: void clear_y(); - ::PROTOBUF_NAMESPACE_ID::uint32 y() const; - void set_y(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t y() const; + void set_y(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_y() const; - void _internal_set_y(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_y() const; + void _internal_set_y(uint32_t value); public: // optional uint32 width = 3; @@ -1336,11 +1351,11 @@ class Box final : bool _internal_has_width() const; public: void clear_width(); - ::PROTOBUF_NAMESPACE_ID::uint32 width() const; - void set_width(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t width() const; + void set_width(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_width() const; - void _internal_set_width(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_width() const; + void _internal_set_width(uint32_t value); public: // optional uint32 height = 4; @@ -1349,11 +1364,11 @@ class Box final : bool _internal_has_height() const; public: void clear_height(); - ::PROTOBUF_NAMESPACE_ID::uint32 height() const; - void set_height(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t height() const; + void set_height(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_height() const; - void _internal_set_height(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_height() const; + void _internal_set_height(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.Box) @@ -1365,10 +1380,10 @@ class Box final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 x_; - ::PROTOBUF_NAMESPACE_ID::uint32 y_; - ::PROTOBUF_NAMESPACE_ID::uint32 width_; - ::PROTOBUF_NAMESPACE_ID::uint32 height_; + uint32_t x_; + uint32_t y_; + uint32_t width_; + uint32_t height_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -1435,7 +1450,12 @@ class SpriteInfo final : } inline void Swap(SpriteInfo* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -1449,11 +1469,7 @@ class SpriteInfo final : // implements Message ---------------------------------------------- - inline SpriteInfo* New() const final { - return new SpriteInfo(); - } - - SpriteInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + SpriteInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -1468,8 +1484,8 @@ class SpriteInfo final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -1477,6 +1493,8 @@ class SpriteInfo final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(SpriteInfo* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.SpriteInfo"; @@ -1516,19 +1534,19 @@ class SpriteInfo final : public: void clear_sprite_id(); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_sprite_id(int index) const; - const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >& + uint32_t _internal_sprite_id(int index) const; + const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >& _internal_sprite_id() const; - void _internal_add_sprite_id(::PROTOBUF_NAMESPACE_ID::uint32 value); - ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >* + void _internal_add_sprite_id(uint32_t value); + ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >* _internal_mutable_sprite_id(); public: - ::PROTOBUF_NAMESPACE_ID::uint32 sprite_id(int index) const; - void set_sprite_id(int index, ::PROTOBUF_NAMESPACE_ID::uint32 value); - void add_sprite_id(::PROTOBUF_NAMESPACE_ID::uint32 value); - const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >& + uint32_t sprite_id(int index) const; + void set_sprite_id(int index, uint32_t value); + void add_sprite_id(uint32_t value); + const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >& sprite_id() const; - ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >* + ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >* mutable_sprite_id(); // repeated .Canary.protobuf.appearances.Box bounding_box_per_direction = 9; @@ -1556,7 +1574,7 @@ class SpriteInfo final : public: void clear_animation(); const ::Canary::protobuf::appearances::SpriteAnimation& animation() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::SpriteAnimation* release_animation(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::SpriteAnimation* release_animation(); ::Canary::protobuf::appearances::SpriteAnimation* mutable_animation(); void set_allocated_animation(::Canary::protobuf::appearances::SpriteAnimation* animation); private: @@ -1573,11 +1591,11 @@ class SpriteInfo final : bool _internal_has_pattern_width() const; public: void clear_pattern_width(); - ::PROTOBUF_NAMESPACE_ID::uint32 pattern_width() const; - void set_pattern_width(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t pattern_width() const; + void set_pattern_width(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_pattern_width() const; - void _internal_set_pattern_width(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_pattern_width() const; + void _internal_set_pattern_width(uint32_t value); public: // optional uint32 pattern_height = 2; @@ -1586,11 +1604,11 @@ class SpriteInfo final : bool _internal_has_pattern_height() const; public: void clear_pattern_height(); - ::PROTOBUF_NAMESPACE_ID::uint32 pattern_height() const; - void set_pattern_height(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t pattern_height() const; + void set_pattern_height(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_pattern_height() const; - void _internal_set_pattern_height(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_pattern_height() const; + void _internal_set_pattern_height(uint32_t value); public: // optional uint32 pattern_depth = 3; @@ -1599,11 +1617,11 @@ class SpriteInfo final : bool _internal_has_pattern_depth() const; public: void clear_pattern_depth(); - ::PROTOBUF_NAMESPACE_ID::uint32 pattern_depth() const; - void set_pattern_depth(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t pattern_depth() const; + void set_pattern_depth(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_pattern_depth() const; - void _internal_set_pattern_depth(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_pattern_depth() const; + void _internal_set_pattern_depth(uint32_t value); public: // optional uint32 layers = 4; @@ -1612,11 +1630,11 @@ class SpriteInfo final : bool _internal_has_layers() const; public: void clear_layers(); - ::PROTOBUF_NAMESPACE_ID::uint32 layers() const; - void set_layers(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t layers() const; + void set_layers(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_layers() const; - void _internal_set_layers(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_layers() const; + void _internal_set_layers(uint32_t value); public: // optional uint32 bounding_square = 7; @@ -1625,11 +1643,11 @@ class SpriteInfo final : bool _internal_has_bounding_square() const; public: void clear_bounding_square(); - ::PROTOBUF_NAMESPACE_ID::uint32 bounding_square() const; - void set_bounding_square(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t bounding_square() const; + void set_bounding_square(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_bounding_square() const; - void _internal_set_bounding_square(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_bounding_square() const; + void _internal_set_bounding_square(uint32_t value); public: // optional bool is_opaque = 8; @@ -1654,14 +1672,14 @@ class SpriteInfo final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 > sprite_id_; + ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t > sprite_id_; ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Canary::protobuf::appearances::Box > bounding_box_per_direction_; ::Canary::protobuf::appearances::SpriteAnimation* animation_; - ::PROTOBUF_NAMESPACE_ID::uint32 pattern_width_; - ::PROTOBUF_NAMESPACE_ID::uint32 pattern_height_; - ::PROTOBUF_NAMESPACE_ID::uint32 pattern_depth_; - ::PROTOBUF_NAMESPACE_ID::uint32 layers_; - ::PROTOBUF_NAMESPACE_ID::uint32 bounding_square_; + uint32_t pattern_width_; + uint32_t pattern_height_; + uint32_t pattern_depth_; + uint32_t layers_; + uint32_t bounding_square_; bool is_opaque_; friend struct ::TableStruct_appearances_2eproto; }; @@ -1729,7 +1747,12 @@ class FrameGroup final : } inline void Swap(FrameGroup* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -1743,11 +1766,7 @@ class FrameGroup final : // implements Message ---------------------------------------------- - inline FrameGroup* New() const final { - return new FrameGroup(); - } - - FrameGroup* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + FrameGroup* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -1762,8 +1781,8 @@ class FrameGroup final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -1771,6 +1790,8 @@ class FrameGroup final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(FrameGroup* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.FrameGroup"; @@ -1804,7 +1825,7 @@ class FrameGroup final : public: void clear_sprite_info(); const ::Canary::protobuf::appearances::SpriteInfo& sprite_info() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::SpriteInfo* release_sprite_info(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::SpriteInfo* release_sprite_info(); ::Canary::protobuf::appearances::SpriteInfo* mutable_sprite_info(); void set_allocated_sprite_info(::Canary::protobuf::appearances::SpriteInfo* sprite_info); private: @@ -1834,11 +1855,11 @@ class FrameGroup final : bool _internal_has_id() const; public: void clear_id(); - ::PROTOBUF_NAMESPACE_ID::uint32 id() const; - void set_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t id() const; + void set_id(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_id() const; - void _internal_set_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_id() const; + void _internal_set_id(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.FrameGroup) @@ -1852,7 +1873,7 @@ class FrameGroup final : mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; ::Canary::protobuf::appearances::SpriteInfo* sprite_info_; int fixed_frame_group_; - ::PROTOBUF_NAMESPACE_ID::uint32 id_; + uint32_t id_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -1919,7 +1940,12 @@ class Appearance final : } inline void Swap(Appearance* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -1933,11 +1959,7 @@ class Appearance final : // implements Message ---------------------------------------------- - inline Appearance* New() const final { - return new Appearance(); - } - - Appearance* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + Appearance* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -1952,8 +1974,8 @@ class Appearance final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -1961,6 +1983,8 @@ class Appearance final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Appearance* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.Appearance"; @@ -2017,7 +2041,7 @@ class Appearance final : template void set_name(ArgT0&& arg0, ArgT... args); std::string* mutable_name(); - PROTOBUF_MUST_USE_RESULT std::string* release_name(); + PROTOBUF_NODISCARD std::string* release_name(); void set_allocated_name(std::string* name); private: const std::string& _internal_name() const; @@ -2035,7 +2059,7 @@ class Appearance final : template void set_description(ArgT0&& arg0, ArgT... args); std::string* mutable_description(); - PROTOBUF_MUST_USE_RESULT std::string* release_description(); + PROTOBUF_NODISCARD std::string* release_description(); void set_allocated_description(std::string* description); private: const std::string& _internal_description() const; @@ -2050,7 +2074,7 @@ class Appearance final : public: void clear_flags(); const ::Canary::protobuf::appearances::AppearanceFlags& flags() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlags* release_flags(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlags* release_flags(); ::Canary::protobuf::appearances::AppearanceFlags* mutable_flags(); void set_allocated_flags(::Canary::protobuf::appearances::AppearanceFlags* flags); private: @@ -2067,11 +2091,11 @@ class Appearance final : bool _internal_has_id() const; public: void clear_id(); - ::PROTOBUF_NAMESPACE_ID::uint32 id() const; - void set_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t id() const; + void set_id(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_id() const; - void _internal_set_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_id() const; + void _internal_set_id(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.Appearance) @@ -2087,7 +2111,7 @@ class Appearance final : ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr description_; ::Canary::protobuf::appearances::AppearanceFlags* flags_; - ::PROTOBUF_NAMESPACE_ID::uint32 id_; + uint32_t id_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -2154,7 +2178,12 @@ class AppearanceFlags final : } inline void Swap(AppearanceFlags* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -2168,11 +2197,7 @@ class AppearanceFlags final : // implements Message ---------------------------------------------- - inline AppearanceFlags* New() const final { - return new AppearanceFlags(); - } - - AppearanceFlags* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlags* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -2187,8 +2212,8 @@ class AppearanceFlags final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -2196,6 +2221,8 @@ class AppearanceFlags final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlags* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlags"; @@ -2292,7 +2319,7 @@ class AppearanceFlags final : public: void clear_bank(); const ::Canary::protobuf::appearances::AppearanceFlagBank& bank() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagBank* release_bank(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagBank* release_bank(); ::Canary::protobuf::appearances::AppearanceFlagBank* mutable_bank(); void set_allocated_bank(::Canary::protobuf::appearances::AppearanceFlagBank* bank); private: @@ -2310,7 +2337,7 @@ class AppearanceFlags final : public: void clear_write(); const ::Canary::protobuf::appearances::AppearanceFlagWrite& write() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagWrite* release_write(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagWrite* release_write(); ::Canary::protobuf::appearances::AppearanceFlagWrite* mutable_write(); void set_allocated_write(::Canary::protobuf::appearances::AppearanceFlagWrite* write); private: @@ -2328,7 +2355,7 @@ class AppearanceFlags final : public: void clear_write_once(); const ::Canary::protobuf::appearances::AppearanceFlagWriteOnce& write_once() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagWriteOnce* release_write_once(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagWriteOnce* release_write_once(); ::Canary::protobuf::appearances::AppearanceFlagWriteOnce* mutable_write_once(); void set_allocated_write_once(::Canary::protobuf::appearances::AppearanceFlagWriteOnce* write_once); private: @@ -2346,7 +2373,7 @@ class AppearanceFlags final : public: void clear_hook(); const ::Canary::protobuf::appearances::AppearanceFlagHook& hook() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagHook* release_hook(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagHook* release_hook(); ::Canary::protobuf::appearances::AppearanceFlagHook* mutable_hook(); void set_allocated_hook(::Canary::protobuf::appearances::AppearanceFlagHook* hook); private: @@ -2364,7 +2391,7 @@ class AppearanceFlags final : public: void clear_light(); const ::Canary::protobuf::appearances::AppearanceFlagLight& light() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagLight* release_light(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagLight* release_light(); ::Canary::protobuf::appearances::AppearanceFlagLight* mutable_light(); void set_allocated_light(::Canary::protobuf::appearances::AppearanceFlagLight* light); private: @@ -2382,7 +2409,7 @@ class AppearanceFlags final : public: void clear_shift(); const ::Canary::protobuf::appearances::AppearanceFlagShift& shift() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagShift* release_shift(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagShift* release_shift(); ::Canary::protobuf::appearances::AppearanceFlagShift* mutable_shift(); void set_allocated_shift(::Canary::protobuf::appearances::AppearanceFlagShift* shift); private: @@ -2400,7 +2427,7 @@ class AppearanceFlags final : public: void clear_height(); const ::Canary::protobuf::appearances::AppearanceFlagHeight& height() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagHeight* release_height(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagHeight* release_height(); ::Canary::protobuf::appearances::AppearanceFlagHeight* mutable_height(); void set_allocated_height(::Canary::protobuf::appearances::AppearanceFlagHeight* height); private: @@ -2418,7 +2445,7 @@ class AppearanceFlags final : public: void clear_automap(); const ::Canary::protobuf::appearances::AppearanceFlagAutomap& automap() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagAutomap* release_automap(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagAutomap* release_automap(); ::Canary::protobuf::appearances::AppearanceFlagAutomap* mutable_automap(); void set_allocated_automap(::Canary::protobuf::appearances::AppearanceFlagAutomap* automap); private: @@ -2436,7 +2463,7 @@ class AppearanceFlags final : public: void clear_lenshelp(); const ::Canary::protobuf::appearances::AppearanceFlagLenshelp& lenshelp() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagLenshelp* release_lenshelp(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagLenshelp* release_lenshelp(); ::Canary::protobuf::appearances::AppearanceFlagLenshelp* mutable_lenshelp(); void set_allocated_lenshelp(::Canary::protobuf::appearances::AppearanceFlagLenshelp* lenshelp); private: @@ -2454,7 +2481,7 @@ class AppearanceFlags final : public: void clear_clothes(); const ::Canary::protobuf::appearances::AppearanceFlagClothes& clothes() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagClothes* release_clothes(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagClothes* release_clothes(); ::Canary::protobuf::appearances::AppearanceFlagClothes* mutable_clothes(); void set_allocated_clothes(::Canary::protobuf::appearances::AppearanceFlagClothes* clothes); private: @@ -2472,7 +2499,7 @@ class AppearanceFlags final : public: void clear_default_action(); const ::Canary::protobuf::appearances::AppearanceFlagDefaultAction& default_action() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagDefaultAction* release_default_action(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagDefaultAction* release_default_action(); ::Canary::protobuf::appearances::AppearanceFlagDefaultAction* mutable_default_action(); void set_allocated_default_action(::Canary::protobuf::appearances::AppearanceFlagDefaultAction* default_action); private: @@ -2490,7 +2517,7 @@ class AppearanceFlags final : public: void clear_market(); const ::Canary::protobuf::appearances::AppearanceFlagMarket& market() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagMarket* release_market(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagMarket* release_market(); ::Canary::protobuf::appearances::AppearanceFlagMarket* mutable_market(); void set_allocated_market(::Canary::protobuf::appearances::AppearanceFlagMarket* market); private: @@ -2508,7 +2535,7 @@ class AppearanceFlags final : public: void clear_changedtoexpire(); const ::Canary::protobuf::appearances::AppearanceFlagChangedToExpire& changedtoexpire() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagChangedToExpire* release_changedtoexpire(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagChangedToExpire* release_changedtoexpire(); ::Canary::protobuf::appearances::AppearanceFlagChangedToExpire* mutable_changedtoexpire(); void set_allocated_changedtoexpire(::Canary::protobuf::appearances::AppearanceFlagChangedToExpire* changedtoexpire); private: @@ -2526,7 +2553,7 @@ class AppearanceFlags final : public: void clear_cyclopediaitem(); const ::Canary::protobuf::appearances::AppearanceFlagCyclopedia& cyclopediaitem() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagCyclopedia* release_cyclopediaitem(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagCyclopedia* release_cyclopediaitem(); ::Canary::protobuf::appearances::AppearanceFlagCyclopedia* mutable_cyclopediaitem(); void set_allocated_cyclopediaitem(::Canary::protobuf::appearances::AppearanceFlagCyclopedia* cyclopediaitem); private: @@ -2544,7 +2571,7 @@ class AppearanceFlags final : public: void clear_upgradeclassification(); const ::Canary::protobuf::appearances::AppearanceFlagUpgradeClassification& upgradeclassification() const; - PROTOBUF_MUST_USE_RESULT ::Canary::protobuf::appearances::AppearanceFlagUpgradeClassification* release_upgradeclassification(); + PROTOBUF_NODISCARD ::Canary::protobuf::appearances::AppearanceFlagUpgradeClassification* release_upgradeclassification(); ::Canary::protobuf::appearances::AppearanceFlagUpgradeClassification* mutable_upgradeclassification(); void set_allocated_upgradeclassification(::Canary::protobuf::appearances::AppearanceFlagUpgradeClassification* upgradeclassification); private: @@ -3094,7 +3121,12 @@ class AppearanceFlagUpgradeClassification final : } inline void Swap(AppearanceFlagUpgradeClassification* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -3108,11 +3140,7 @@ class AppearanceFlagUpgradeClassification final : // implements Message ---------------------------------------------- - inline AppearanceFlagUpgradeClassification* New() const final { - return new AppearanceFlagUpgradeClassification(); - } - - AppearanceFlagUpgradeClassification* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagUpgradeClassification* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -3127,8 +3155,8 @@ class AppearanceFlagUpgradeClassification final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -3136,6 +3164,8 @@ class AppearanceFlagUpgradeClassification final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagUpgradeClassification* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagUpgradeClassification"; @@ -3166,11 +3196,11 @@ class AppearanceFlagUpgradeClassification final : bool _internal_has_upgrade_classification() const; public: void clear_upgrade_classification(); - ::PROTOBUF_NAMESPACE_ID::uint32 upgrade_classification() const; - void set_upgrade_classification(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t upgrade_classification() const; + void set_upgrade_classification(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_upgrade_classification() const; - void _internal_set_upgrade_classification(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_upgrade_classification() const; + void _internal_set_upgrade_classification(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification) @@ -3182,7 +3212,7 @@ class AppearanceFlagUpgradeClassification final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 upgrade_classification_; + uint32_t upgrade_classification_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -3249,7 +3279,12 @@ class AppearanceFlagBank final : } inline void Swap(AppearanceFlagBank* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -3263,11 +3298,7 @@ class AppearanceFlagBank final : // implements Message ---------------------------------------------- - inline AppearanceFlagBank* New() const final { - return new AppearanceFlagBank(); - } - - AppearanceFlagBank* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagBank* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -3282,8 +3313,8 @@ class AppearanceFlagBank final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -3291,6 +3322,8 @@ class AppearanceFlagBank final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagBank* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagBank"; @@ -3321,11 +3354,11 @@ class AppearanceFlagBank final : bool _internal_has_waypoints() const; public: void clear_waypoints(); - ::PROTOBUF_NAMESPACE_ID::uint32 waypoints() const; - void set_waypoints(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t waypoints() const; + void set_waypoints(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_waypoints() const; - void _internal_set_waypoints(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_waypoints() const; + void _internal_set_waypoints(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagBank) @@ -3337,7 +3370,7 @@ class AppearanceFlagBank final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 waypoints_; + uint32_t waypoints_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -3404,7 +3437,12 @@ class AppearanceFlagWrite final : } inline void Swap(AppearanceFlagWrite* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -3418,11 +3456,7 @@ class AppearanceFlagWrite final : // implements Message ---------------------------------------------- - inline AppearanceFlagWrite* New() const final { - return new AppearanceFlagWrite(); - } - - AppearanceFlagWrite* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagWrite* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -3437,8 +3471,8 @@ class AppearanceFlagWrite final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -3446,6 +3480,8 @@ class AppearanceFlagWrite final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagWrite* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagWrite"; @@ -3476,11 +3512,11 @@ class AppearanceFlagWrite final : bool _internal_has_max_text_length() const; public: void clear_max_text_length(); - ::PROTOBUF_NAMESPACE_ID::uint32 max_text_length() const; - void set_max_text_length(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t max_text_length() const; + void set_max_text_length(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_max_text_length() const; - void _internal_set_max_text_length(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_max_text_length() const; + void _internal_set_max_text_length(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagWrite) @@ -3492,7 +3528,7 @@ class AppearanceFlagWrite final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 max_text_length_; + uint32_t max_text_length_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -3559,7 +3595,12 @@ class AppearanceFlagWriteOnce final : } inline void Swap(AppearanceFlagWriteOnce* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -3573,11 +3614,7 @@ class AppearanceFlagWriteOnce final : // implements Message ---------------------------------------------- - inline AppearanceFlagWriteOnce* New() const final { - return new AppearanceFlagWriteOnce(); - } - - AppearanceFlagWriteOnce* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagWriteOnce* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -3592,8 +3629,8 @@ class AppearanceFlagWriteOnce final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -3601,6 +3638,8 @@ class AppearanceFlagWriteOnce final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagWriteOnce* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagWriteOnce"; @@ -3631,11 +3670,11 @@ class AppearanceFlagWriteOnce final : bool _internal_has_max_text_length_once() const; public: void clear_max_text_length_once(); - ::PROTOBUF_NAMESPACE_ID::uint32 max_text_length_once() const; - void set_max_text_length_once(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t max_text_length_once() const; + void set_max_text_length_once(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_max_text_length_once() const; - void _internal_set_max_text_length_once(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_max_text_length_once() const; + void _internal_set_max_text_length_once(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagWriteOnce) @@ -3647,7 +3686,7 @@ class AppearanceFlagWriteOnce final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 max_text_length_once_; + uint32_t max_text_length_once_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -3714,7 +3753,12 @@ class AppearanceFlagLight final : } inline void Swap(AppearanceFlagLight* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -3728,11 +3772,7 @@ class AppearanceFlagLight final : // implements Message ---------------------------------------------- - inline AppearanceFlagLight* New() const final { - return new AppearanceFlagLight(); - } - - AppearanceFlagLight* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagLight* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -3747,8 +3787,8 @@ class AppearanceFlagLight final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -3756,6 +3796,8 @@ class AppearanceFlagLight final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagLight* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagLight"; @@ -3787,11 +3829,11 @@ class AppearanceFlagLight final : bool _internal_has_brightness() const; public: void clear_brightness(); - ::PROTOBUF_NAMESPACE_ID::uint32 brightness() const; - void set_brightness(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t brightness() const; + void set_brightness(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_brightness() const; - void _internal_set_brightness(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_brightness() const; + void _internal_set_brightness(uint32_t value); public: // optional uint32 color = 2; @@ -3800,11 +3842,11 @@ class AppearanceFlagLight final : bool _internal_has_color() const; public: void clear_color(); - ::PROTOBUF_NAMESPACE_ID::uint32 color() const; - void set_color(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t color() const; + void set_color(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_color() const; - void _internal_set_color(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_color() const; + void _internal_set_color(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagLight) @@ -3816,8 +3858,8 @@ class AppearanceFlagLight final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 brightness_; - ::PROTOBUF_NAMESPACE_ID::uint32 color_; + uint32_t brightness_; + uint32_t color_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -3884,7 +3926,12 @@ class AppearanceFlagHeight final : } inline void Swap(AppearanceFlagHeight* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -3898,11 +3945,7 @@ class AppearanceFlagHeight final : // implements Message ---------------------------------------------- - inline AppearanceFlagHeight* New() const final { - return new AppearanceFlagHeight(); - } - - AppearanceFlagHeight* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagHeight* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -3917,8 +3960,8 @@ class AppearanceFlagHeight final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -3926,6 +3969,8 @@ class AppearanceFlagHeight final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagHeight* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagHeight"; @@ -3956,11 +4001,11 @@ class AppearanceFlagHeight final : bool _internal_has_elevation() const; public: void clear_elevation(); - ::PROTOBUF_NAMESPACE_ID::uint32 elevation() const; - void set_elevation(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t elevation() const; + void set_elevation(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_elevation() const; - void _internal_set_elevation(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_elevation() const; + void _internal_set_elevation(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagHeight) @@ -3972,7 +4017,7 @@ class AppearanceFlagHeight final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 elevation_; + uint32_t elevation_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -4039,7 +4084,12 @@ class AppearanceFlagShift final : } inline void Swap(AppearanceFlagShift* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -4053,11 +4103,7 @@ class AppearanceFlagShift final : // implements Message ---------------------------------------------- - inline AppearanceFlagShift* New() const final { - return new AppearanceFlagShift(); - } - - AppearanceFlagShift* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagShift* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -4072,8 +4118,8 @@ class AppearanceFlagShift final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -4081,6 +4127,8 @@ class AppearanceFlagShift final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagShift* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagShift"; @@ -4112,11 +4160,11 @@ class AppearanceFlagShift final : bool _internal_has_x() const; public: void clear_x(); - ::PROTOBUF_NAMESPACE_ID::uint32 x() const; - void set_x(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t x() const; + void set_x(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_x() const; - void _internal_set_x(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_x() const; + void _internal_set_x(uint32_t value); public: // optional uint32 y = 2; @@ -4125,11 +4173,11 @@ class AppearanceFlagShift final : bool _internal_has_y() const; public: void clear_y(); - ::PROTOBUF_NAMESPACE_ID::uint32 y() const; - void set_y(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t y() const; + void set_y(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_y() const; - void _internal_set_y(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_y() const; + void _internal_set_y(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagShift) @@ -4141,8 +4189,8 @@ class AppearanceFlagShift final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 x_; - ::PROTOBUF_NAMESPACE_ID::uint32 y_; + uint32_t x_; + uint32_t y_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -4209,7 +4257,12 @@ class AppearanceFlagClothes final : } inline void Swap(AppearanceFlagClothes* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -4223,11 +4276,7 @@ class AppearanceFlagClothes final : // implements Message ---------------------------------------------- - inline AppearanceFlagClothes* New() const final { - return new AppearanceFlagClothes(); - } - - AppearanceFlagClothes* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagClothes* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -4242,8 +4291,8 @@ class AppearanceFlagClothes final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -4251,6 +4300,8 @@ class AppearanceFlagClothes final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagClothes* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagClothes"; @@ -4281,11 +4332,11 @@ class AppearanceFlagClothes final : bool _internal_has_slot() const; public: void clear_slot(); - ::PROTOBUF_NAMESPACE_ID::uint32 slot() const; - void set_slot(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t slot() const; + void set_slot(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_slot() const; - void _internal_set_slot(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_slot() const; + void _internal_set_slot(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagClothes) @@ -4297,7 +4348,7 @@ class AppearanceFlagClothes final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 slot_; + uint32_t slot_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -4364,7 +4415,12 @@ class AppearanceFlagDefaultAction final : } inline void Swap(AppearanceFlagDefaultAction* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -4378,11 +4434,7 @@ class AppearanceFlagDefaultAction final : // implements Message ---------------------------------------------- - inline AppearanceFlagDefaultAction* New() const final { - return new AppearanceFlagDefaultAction(); - } - - AppearanceFlagDefaultAction* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagDefaultAction* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -4397,8 +4449,8 @@ class AppearanceFlagDefaultAction final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -4406,6 +4458,8 @@ class AppearanceFlagDefaultAction final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagDefaultAction* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagDefaultAction"; @@ -4519,7 +4573,12 @@ class AppearanceFlagMarket final : } inline void Swap(AppearanceFlagMarket* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -4533,11 +4592,7 @@ class AppearanceFlagMarket final : // implements Message ---------------------------------------------- - inline AppearanceFlagMarket* New() const final { - return new AppearanceFlagMarket(); - } - - AppearanceFlagMarket* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagMarket* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -4552,8 +4607,8 @@ class AppearanceFlagMarket final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -4561,6 +4616,8 @@ class AppearanceFlagMarket final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagMarket* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagMarket"; @@ -4612,11 +4669,11 @@ class AppearanceFlagMarket final : bool _internal_has_trade_as_object_id() const; public: void clear_trade_as_object_id(); - ::PROTOBUF_NAMESPACE_ID::uint32 trade_as_object_id() const; - void set_trade_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t trade_as_object_id() const; + void set_trade_as_object_id(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_trade_as_object_id() const; - void _internal_set_trade_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_trade_as_object_id() const; + void _internal_set_trade_as_object_id(uint32_t value); public: // optional uint32 show_as_object_id = 3; @@ -4625,11 +4682,11 @@ class AppearanceFlagMarket final : bool _internal_has_show_as_object_id() const; public: void clear_show_as_object_id(); - ::PROTOBUF_NAMESPACE_ID::uint32 show_as_object_id() const; - void set_show_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t show_as_object_id() const; + void set_show_as_object_id(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_show_as_object_id() const; - void _internal_set_show_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_show_as_object_id() const; + void _internal_set_show_as_object_id(uint32_t value); public: // optional uint32 minimum_level = 6; @@ -4638,11 +4695,11 @@ class AppearanceFlagMarket final : bool _internal_has_minimum_level() const; public: void clear_minimum_level(); - ::PROTOBUF_NAMESPACE_ID::uint32 minimum_level() const; - void set_minimum_level(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t minimum_level() const; + void set_minimum_level(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_minimum_level() const; - void _internal_set_minimum_level(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_minimum_level() const; + void _internal_set_minimum_level(uint32_t value); public: // optional .Canary.protobuf.appearances.ITEM_CATEGORY category = 1; @@ -4668,9 +4725,9 @@ class AppearanceFlagMarket final : ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; ::PROTOBUF_NAMESPACE_ID::RepeatedField restrict_to_profession_; - ::PROTOBUF_NAMESPACE_ID::uint32 trade_as_object_id_; - ::PROTOBUF_NAMESPACE_ID::uint32 show_as_object_id_; - ::PROTOBUF_NAMESPACE_ID::uint32 minimum_level_; + uint32_t trade_as_object_id_; + uint32_t show_as_object_id_; + uint32_t minimum_level_; int category_; friend struct ::TableStruct_appearances_2eproto; }; @@ -4738,7 +4795,12 @@ class AppearanceFlagNPC final : } inline void Swap(AppearanceFlagNPC* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -4752,11 +4814,7 @@ class AppearanceFlagNPC final : // implements Message ---------------------------------------------- - inline AppearanceFlagNPC* New() const final { - return new AppearanceFlagNPC(); - } - - AppearanceFlagNPC* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagNPC* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -4771,8 +4829,8 @@ class AppearanceFlagNPC final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -4780,6 +4838,8 @@ class AppearanceFlagNPC final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagNPC* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagNPC"; @@ -4819,7 +4879,7 @@ class AppearanceFlagNPC final : template void set_name(ArgT0&& arg0, ArgT... args); std::string* mutable_name(); - PROTOBUF_MUST_USE_RESULT std::string* release_name(); + PROTOBUF_NODISCARD std::string* release_name(); void set_allocated_name(std::string* name); private: const std::string& _internal_name() const; @@ -4837,7 +4897,7 @@ class AppearanceFlagNPC final : template void set_location(ArgT0&& arg0, ArgT... args); std::string* mutable_location(); - PROTOBUF_MUST_USE_RESULT std::string* release_location(); + PROTOBUF_NODISCARD std::string* release_location(); void set_allocated_location(std::string* location); private: const std::string& _internal_location() const; @@ -4855,7 +4915,7 @@ class AppearanceFlagNPC final : template void set_currency_quest_flag_display_name(ArgT0&& arg0, ArgT... args); std::string* mutable_currency_quest_flag_display_name(); - PROTOBUF_MUST_USE_RESULT std::string* release_currency_quest_flag_display_name(); + PROTOBUF_NODISCARD std::string* release_currency_quest_flag_display_name(); void set_allocated_currency_quest_flag_display_name(std::string* currency_quest_flag_display_name); private: const std::string& _internal_currency_quest_flag_display_name() const; @@ -4869,11 +4929,11 @@ class AppearanceFlagNPC final : bool _internal_has_sale_price() const; public: void clear_sale_price(); - ::PROTOBUF_NAMESPACE_ID::uint32 sale_price() const; - void set_sale_price(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t sale_price() const; + void set_sale_price(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_sale_price() const; - void _internal_set_sale_price(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_sale_price() const; + void _internal_set_sale_price(uint32_t value); public: // optional uint32 buy_price = 4; @@ -4882,11 +4942,11 @@ class AppearanceFlagNPC final : bool _internal_has_buy_price() const; public: void clear_buy_price(); - ::PROTOBUF_NAMESPACE_ID::uint32 buy_price() const; - void set_buy_price(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t buy_price() const; + void set_buy_price(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_buy_price() const; - void _internal_set_buy_price(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_buy_price() const; + void _internal_set_buy_price(uint32_t value); public: // optional uint32 currency_object_type_id = 5; @@ -4895,11 +4955,11 @@ class AppearanceFlagNPC final : bool _internal_has_currency_object_type_id() const; public: void clear_currency_object_type_id(); - ::PROTOBUF_NAMESPACE_ID::uint32 currency_object_type_id() const; - void set_currency_object_type_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t currency_object_type_id() const; + void set_currency_object_type_id(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_currency_object_type_id() const; - void _internal_set_currency_object_type_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_currency_object_type_id() const; + void _internal_set_currency_object_type_id(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagNPC) @@ -4914,9 +4974,9 @@ class AppearanceFlagNPC final : ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr location_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr currency_quest_flag_display_name_; - ::PROTOBUF_NAMESPACE_ID::uint32 sale_price_; - ::PROTOBUF_NAMESPACE_ID::uint32 buy_price_; - ::PROTOBUF_NAMESPACE_ID::uint32 currency_object_type_id_; + uint32_t sale_price_; + uint32_t buy_price_; + uint32_t currency_object_type_id_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -4983,7 +5043,12 @@ class AppearanceFlagAutomap final : } inline void Swap(AppearanceFlagAutomap* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -4997,11 +5062,7 @@ class AppearanceFlagAutomap final : // implements Message ---------------------------------------------- - inline AppearanceFlagAutomap* New() const final { - return new AppearanceFlagAutomap(); - } - - AppearanceFlagAutomap* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagAutomap* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -5016,8 +5077,8 @@ class AppearanceFlagAutomap final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -5025,6 +5086,8 @@ class AppearanceFlagAutomap final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagAutomap* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagAutomap"; @@ -5055,11 +5118,11 @@ class AppearanceFlagAutomap final : bool _internal_has_color() const; public: void clear_color(); - ::PROTOBUF_NAMESPACE_ID::uint32 color() const; - void set_color(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t color() const; + void set_color(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_color() const; - void _internal_set_color(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_color() const; + void _internal_set_color(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagAutomap) @@ -5071,7 +5134,7 @@ class AppearanceFlagAutomap final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 color_; + uint32_t color_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -5138,7 +5201,12 @@ class AppearanceFlagHook final : } inline void Swap(AppearanceFlagHook* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -5152,11 +5220,7 @@ class AppearanceFlagHook final : // implements Message ---------------------------------------------- - inline AppearanceFlagHook* New() const final { - return new AppearanceFlagHook(); - } - - AppearanceFlagHook* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagHook* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -5171,8 +5235,8 @@ class AppearanceFlagHook final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -5180,6 +5244,8 @@ class AppearanceFlagHook final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagHook* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagHook"; @@ -5293,7 +5359,12 @@ class AppearanceFlagLenshelp final : } inline void Swap(AppearanceFlagLenshelp* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -5307,11 +5378,7 @@ class AppearanceFlagLenshelp final : // implements Message ---------------------------------------------- - inline AppearanceFlagLenshelp* New() const final { - return new AppearanceFlagLenshelp(); - } - - AppearanceFlagLenshelp* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagLenshelp* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -5326,8 +5393,8 @@ class AppearanceFlagLenshelp final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -5335,6 +5402,8 @@ class AppearanceFlagLenshelp final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagLenshelp* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagLenshelp"; @@ -5365,11 +5434,11 @@ class AppearanceFlagLenshelp final : bool _internal_has_id() const; public: void clear_id(); - ::PROTOBUF_NAMESPACE_ID::uint32 id() const; - void set_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t id() const; + void set_id(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_id() const; - void _internal_set_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_id() const; + void _internal_set_id(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagLenshelp) @@ -5381,7 +5450,7 @@ class AppearanceFlagLenshelp final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 id_; + uint32_t id_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -5448,7 +5517,12 @@ class AppearanceFlagChangedToExpire final : } inline void Swap(AppearanceFlagChangedToExpire* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -5462,11 +5536,7 @@ class AppearanceFlagChangedToExpire final : // implements Message ---------------------------------------------- - inline AppearanceFlagChangedToExpire* New() const final { - return new AppearanceFlagChangedToExpire(); - } - - AppearanceFlagChangedToExpire* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagChangedToExpire* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -5481,8 +5551,8 @@ class AppearanceFlagChangedToExpire final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -5490,6 +5560,8 @@ class AppearanceFlagChangedToExpire final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagChangedToExpire* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagChangedToExpire"; @@ -5520,11 +5592,11 @@ class AppearanceFlagChangedToExpire final : bool _internal_has_former_object_typeid() const; public: void clear_former_object_typeid(); - ::PROTOBUF_NAMESPACE_ID::uint32 former_object_typeid() const; - void set_former_object_typeid(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t former_object_typeid() const; + void set_former_object_typeid(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_former_object_typeid() const; - void _internal_set_former_object_typeid(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_former_object_typeid() const; + void _internal_set_former_object_typeid(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagChangedToExpire) @@ -5536,7 +5608,7 @@ class AppearanceFlagChangedToExpire final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 former_object_typeid_; + uint32_t former_object_typeid_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -5603,7 +5675,12 @@ class AppearanceFlagCyclopedia final : } inline void Swap(AppearanceFlagCyclopedia* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -5617,11 +5694,7 @@ class AppearanceFlagCyclopedia final : // implements Message ---------------------------------------------- - inline AppearanceFlagCyclopedia* New() const final { - return new AppearanceFlagCyclopedia(); - } - - AppearanceFlagCyclopedia* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + AppearanceFlagCyclopedia* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -5636,8 +5709,8 @@ class AppearanceFlagCyclopedia final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -5645,6 +5718,8 @@ class AppearanceFlagCyclopedia final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AppearanceFlagCyclopedia* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.AppearanceFlagCyclopedia"; @@ -5675,11 +5750,11 @@ class AppearanceFlagCyclopedia final : bool _internal_has_cyclopedia_type() const; public: void clear_cyclopedia_type(); - ::PROTOBUF_NAMESPACE_ID::uint32 cyclopedia_type() const; - void set_cyclopedia_type(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t cyclopedia_type() const; + void set_cyclopedia_type(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_cyclopedia_type() const; - void _internal_set_cyclopedia_type(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_cyclopedia_type() const; + void _internal_set_cyclopedia_type(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.AppearanceFlagCyclopedia) @@ -5691,7 +5766,7 @@ class AppearanceFlagCyclopedia final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 cyclopedia_type_; + uint32_t cyclopedia_type_; friend struct ::TableStruct_appearances_2eproto; }; // ------------------------------------------------------------------- @@ -5758,7 +5833,12 @@ class SpecialMeaningAppearanceIds final : } inline void Swap(SpecialMeaningAppearanceIds* other) { if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); @@ -5772,11 +5852,7 @@ class SpecialMeaningAppearanceIds final : // implements Message ---------------------------------------------- - inline SpecialMeaningAppearanceIds* New() const final { - return new SpecialMeaningAppearanceIds(); - } - - SpecialMeaningAppearanceIds* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + SpecialMeaningAppearanceIds* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; @@ -5791,8 +5867,8 @@ class SpecialMeaningAppearanceIds final : size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -5800,6 +5876,8 @@ class SpecialMeaningAppearanceIds final : void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(SpecialMeaningAppearanceIds* other); + + private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { return "Canary.protobuf.appearances.SpecialMeaningAppearanceIds"; @@ -5835,11 +5913,11 @@ class SpecialMeaningAppearanceIds final : bool _internal_has_gold_coin_id() const; public: void clear_gold_coin_id(); - ::PROTOBUF_NAMESPACE_ID::uint32 gold_coin_id() const; - void set_gold_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t gold_coin_id() const; + void set_gold_coin_id(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_gold_coin_id() const; - void _internal_set_gold_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_gold_coin_id() const; + void _internal_set_gold_coin_id(uint32_t value); public: // optional uint32 platinum_coin_id = 2; @@ -5848,11 +5926,11 @@ class SpecialMeaningAppearanceIds final : bool _internal_has_platinum_coin_id() const; public: void clear_platinum_coin_id(); - ::PROTOBUF_NAMESPACE_ID::uint32 platinum_coin_id() const; - void set_platinum_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t platinum_coin_id() const; + void set_platinum_coin_id(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_platinum_coin_id() const; - void _internal_set_platinum_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_platinum_coin_id() const; + void _internal_set_platinum_coin_id(uint32_t value); public: // optional uint32 crystal_coin_id = 3; @@ -5861,11 +5939,11 @@ class SpecialMeaningAppearanceIds final : bool _internal_has_crystal_coin_id() const; public: void clear_crystal_coin_id(); - ::PROTOBUF_NAMESPACE_ID::uint32 crystal_coin_id() const; - void set_crystal_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t crystal_coin_id() const; + void set_crystal_coin_id(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_crystal_coin_id() const; - void _internal_set_crystal_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_crystal_coin_id() const; + void _internal_set_crystal_coin_id(uint32_t value); public: // optional uint32 tibia_coin_id = 4; @@ -5874,11 +5952,11 @@ class SpecialMeaningAppearanceIds final : bool _internal_has_tibia_coin_id() const; public: void clear_tibia_coin_id(); - ::PROTOBUF_NAMESPACE_ID::uint32 tibia_coin_id() const; - void set_tibia_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t tibia_coin_id() const; + void set_tibia_coin_id(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_tibia_coin_id() const; - void _internal_set_tibia_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_tibia_coin_id() const; + void _internal_set_tibia_coin_id(uint32_t value); public: // optional uint32 stamped_letter_id = 5; @@ -5887,11 +5965,11 @@ class SpecialMeaningAppearanceIds final : bool _internal_has_stamped_letter_id() const; public: void clear_stamped_letter_id(); - ::PROTOBUF_NAMESPACE_ID::uint32 stamped_letter_id() const; - void set_stamped_letter_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t stamped_letter_id() const; + void set_stamped_letter_id(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_stamped_letter_id() const; - void _internal_set_stamped_letter_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_stamped_letter_id() const; + void _internal_set_stamped_letter_id(uint32_t value); public: // optional uint32 supply_stash_id = 6; @@ -5900,11 +5978,11 @@ class SpecialMeaningAppearanceIds final : bool _internal_has_supply_stash_id() const; public: void clear_supply_stash_id(); - ::PROTOBUF_NAMESPACE_ID::uint32 supply_stash_id() const; - void set_supply_stash_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t supply_stash_id() const; + void set_supply_stash_id(uint32_t value); private: - ::PROTOBUF_NAMESPACE_ID::uint32 _internal_supply_stash_id() const; - void _internal_set_supply_stash_id(::PROTOBUF_NAMESPACE_ID::uint32 value); + uint32_t _internal_supply_stash_id() const; + void _internal_set_supply_stash_id(uint32_t value); public: // @@protoc_insertion_point(class_scope:Canary.protobuf.appearances.SpecialMeaningAppearanceIds) @@ -5916,12 +5994,12 @@ class SpecialMeaningAppearanceIds final : typedef void DestructorSkippable_; ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 gold_coin_id_; - ::PROTOBUF_NAMESPACE_ID::uint32 platinum_coin_id_; - ::PROTOBUF_NAMESPACE_ID::uint32 crystal_coin_id_; - ::PROTOBUF_NAMESPACE_ID::uint32 tibia_coin_id_; - ::PROTOBUF_NAMESPACE_ID::uint32 stamped_letter_id_; - ::PROTOBUF_NAMESPACE_ID::uint32 supply_stash_id_; + uint32_t gold_coin_id_; + uint32_t platinum_coin_id_; + uint32_t crystal_coin_id_; + uint32_t tibia_coin_id_; + uint32_t stamped_letter_id_; + uint32_t supply_stash_id_; friend struct ::TableStruct_appearances_2eproto; }; // =================================================================== @@ -5947,18 +6025,18 @@ inline void Coordinate::clear_x() { x_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Coordinate::_internal_x() const { +inline uint32_t Coordinate::_internal_x() const { return x_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Coordinate::x() const { +inline uint32_t Coordinate::x() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Coordinate.x) return _internal_x(); } -inline void Coordinate::_internal_set_x(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Coordinate::_internal_set_x(uint32_t value) { _has_bits_[0] |= 0x00000001u; x_ = value; } -inline void Coordinate::set_x(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Coordinate::set_x(uint32_t value) { _internal_set_x(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Coordinate.x) } @@ -5975,18 +6053,18 @@ inline void Coordinate::clear_y() { y_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Coordinate::_internal_y() const { +inline uint32_t Coordinate::_internal_y() const { return y_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Coordinate::y() const { +inline uint32_t Coordinate::y() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Coordinate.y) return _internal_y(); } -inline void Coordinate::_internal_set_y(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Coordinate::_internal_set_y(uint32_t value) { _has_bits_[0] |= 0x00000002u; y_ = value; } -inline void Coordinate::set_y(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Coordinate::set_y(uint32_t value) { _internal_set_y(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Coordinate.y) } @@ -6003,18 +6081,18 @@ inline void Coordinate::clear_z() { z_ = 0u; _has_bits_[0] &= ~0x00000004u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Coordinate::_internal_z() const { +inline uint32_t Coordinate::_internal_z() const { return z_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Coordinate::z() const { +inline uint32_t Coordinate::z() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Coordinate.z) return _internal_z(); } -inline void Coordinate::_internal_set_z(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Coordinate::_internal_set_z(uint32_t value) { _has_bits_[0] |= 0x00000004u; z_ = value; } -inline void Coordinate::set_z(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Coordinate::set_z(uint32_t value) { _internal_set_z(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Coordinate.z) } @@ -6289,18 +6367,18 @@ inline void SpritePhase::clear_duration_min() { duration_min_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpritePhase::_internal_duration_min() const { +inline uint32_t SpritePhase::_internal_duration_min() const { return duration_min_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpritePhase::duration_min() const { +inline uint32_t SpritePhase::duration_min() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpritePhase.duration_min) return _internal_duration_min(); } -inline void SpritePhase::_internal_set_duration_min(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpritePhase::_internal_set_duration_min(uint32_t value) { _has_bits_[0] |= 0x00000001u; duration_min_ = value; } -inline void SpritePhase::set_duration_min(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpritePhase::set_duration_min(uint32_t value) { _internal_set_duration_min(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpritePhase.duration_min) } @@ -6317,18 +6395,18 @@ inline void SpritePhase::clear_duration_max() { duration_max_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpritePhase::_internal_duration_max() const { +inline uint32_t SpritePhase::_internal_duration_max() const { return duration_max_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpritePhase::duration_max() const { +inline uint32_t SpritePhase::duration_max() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpritePhase.duration_max) return _internal_duration_max(); } -inline void SpritePhase::_internal_set_duration_max(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpritePhase::_internal_set_duration_max(uint32_t value) { _has_bits_[0] |= 0x00000002u; duration_max_ = value; } -inline void SpritePhase::set_duration_max(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpritePhase::set_duration_max(uint32_t value) { _internal_set_duration_max(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpritePhase.duration_max) } @@ -6349,18 +6427,18 @@ inline void SpriteAnimation::clear_default_start_phase() { default_start_phase_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteAnimation::_internal_default_start_phase() const { +inline uint32_t SpriteAnimation::_internal_default_start_phase() const { return default_start_phase_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteAnimation::default_start_phase() const { +inline uint32_t SpriteAnimation::default_start_phase() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteAnimation.default_start_phase) return _internal_default_start_phase(); } -inline void SpriteAnimation::_internal_set_default_start_phase(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteAnimation::_internal_set_default_start_phase(uint32_t value) { _has_bits_[0] |= 0x00000001u; default_start_phase_ = value; } -inline void SpriteAnimation::set_default_start_phase(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteAnimation::set_default_start_phase(uint32_t value) { _internal_set_default_start_phase(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteAnimation.default_start_phase) } @@ -6462,18 +6540,18 @@ inline void SpriteAnimation::clear_loop_count() { loop_count_ = 0u; _has_bits_[0] &= ~0x00000008u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteAnimation::_internal_loop_count() const { +inline uint32_t SpriteAnimation::_internal_loop_count() const { return loop_count_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteAnimation::loop_count() const { +inline uint32_t SpriteAnimation::loop_count() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteAnimation.loop_count) return _internal_loop_count(); } -inline void SpriteAnimation::_internal_set_loop_count(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteAnimation::_internal_set_loop_count(uint32_t value) { _has_bits_[0] |= 0x00000008u; loop_count_ = value; } -inline void SpriteAnimation::set_loop_count(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteAnimation::set_loop_count(uint32_t value) { _internal_set_loop_count(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteAnimation.loop_count) } @@ -6534,18 +6612,18 @@ inline void Box::clear_x() { x_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::_internal_x() const { +inline uint32_t Box::_internal_x() const { return x_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::x() const { +inline uint32_t Box::x() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Box.x) return _internal_x(); } -inline void Box::_internal_set_x(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Box::_internal_set_x(uint32_t value) { _has_bits_[0] |= 0x00000001u; x_ = value; } -inline void Box::set_x(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Box::set_x(uint32_t value) { _internal_set_x(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Box.x) } @@ -6562,18 +6640,18 @@ inline void Box::clear_y() { y_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::_internal_y() const { +inline uint32_t Box::_internal_y() const { return y_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::y() const { +inline uint32_t Box::y() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Box.y) return _internal_y(); } -inline void Box::_internal_set_y(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Box::_internal_set_y(uint32_t value) { _has_bits_[0] |= 0x00000002u; y_ = value; } -inline void Box::set_y(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Box::set_y(uint32_t value) { _internal_set_y(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Box.y) } @@ -6590,18 +6668,18 @@ inline void Box::clear_width() { width_ = 0u; _has_bits_[0] &= ~0x00000004u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::_internal_width() const { +inline uint32_t Box::_internal_width() const { return width_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::width() const { +inline uint32_t Box::width() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Box.width) return _internal_width(); } -inline void Box::_internal_set_width(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Box::_internal_set_width(uint32_t value) { _has_bits_[0] |= 0x00000004u; width_ = value; } -inline void Box::set_width(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Box::set_width(uint32_t value) { _internal_set_width(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Box.width) } @@ -6618,18 +6696,18 @@ inline void Box::clear_height() { height_ = 0u; _has_bits_[0] &= ~0x00000008u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::_internal_height() const { +inline uint32_t Box::_internal_height() const { return height_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Box::height() const { +inline uint32_t Box::height() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Box.height) return _internal_height(); } -inline void Box::_internal_set_height(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Box::_internal_set_height(uint32_t value) { _has_bits_[0] |= 0x00000008u; height_ = value; } -inline void Box::set_height(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Box::set_height(uint32_t value) { _internal_set_height(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Box.height) } @@ -6650,18 +6728,18 @@ inline void SpriteInfo::clear_pattern_width() { pattern_width_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::_internal_pattern_width() const { +inline uint32_t SpriteInfo::_internal_pattern_width() const { return pattern_width_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::pattern_width() const { +inline uint32_t SpriteInfo::pattern_width() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteInfo.pattern_width) return _internal_pattern_width(); } -inline void SpriteInfo::_internal_set_pattern_width(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteInfo::_internal_set_pattern_width(uint32_t value) { _has_bits_[0] |= 0x00000002u; pattern_width_ = value; } -inline void SpriteInfo::set_pattern_width(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteInfo::set_pattern_width(uint32_t value) { _internal_set_pattern_width(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteInfo.pattern_width) } @@ -6678,18 +6756,18 @@ inline void SpriteInfo::clear_pattern_height() { pattern_height_ = 0u; _has_bits_[0] &= ~0x00000004u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::_internal_pattern_height() const { +inline uint32_t SpriteInfo::_internal_pattern_height() const { return pattern_height_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::pattern_height() const { +inline uint32_t SpriteInfo::pattern_height() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteInfo.pattern_height) return _internal_pattern_height(); } -inline void SpriteInfo::_internal_set_pattern_height(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteInfo::_internal_set_pattern_height(uint32_t value) { _has_bits_[0] |= 0x00000004u; pattern_height_ = value; } -inline void SpriteInfo::set_pattern_height(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteInfo::set_pattern_height(uint32_t value) { _internal_set_pattern_height(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteInfo.pattern_height) } @@ -6706,18 +6784,18 @@ inline void SpriteInfo::clear_pattern_depth() { pattern_depth_ = 0u; _has_bits_[0] &= ~0x00000008u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::_internal_pattern_depth() const { +inline uint32_t SpriteInfo::_internal_pattern_depth() const { return pattern_depth_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::pattern_depth() const { +inline uint32_t SpriteInfo::pattern_depth() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteInfo.pattern_depth) return _internal_pattern_depth(); } -inline void SpriteInfo::_internal_set_pattern_depth(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteInfo::_internal_set_pattern_depth(uint32_t value) { _has_bits_[0] |= 0x00000008u; pattern_depth_ = value; } -inline void SpriteInfo::set_pattern_depth(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteInfo::set_pattern_depth(uint32_t value) { _internal_set_pattern_depth(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteInfo.pattern_depth) } @@ -6734,18 +6812,18 @@ inline void SpriteInfo::clear_layers() { layers_ = 0u; _has_bits_[0] &= ~0x00000010u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::_internal_layers() const { +inline uint32_t SpriteInfo::_internal_layers() const { return layers_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::layers() const { +inline uint32_t SpriteInfo::layers() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteInfo.layers) return _internal_layers(); } -inline void SpriteInfo::_internal_set_layers(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteInfo::_internal_set_layers(uint32_t value) { _has_bits_[0] |= 0x00000010u; layers_ = value; } -inline void SpriteInfo::set_layers(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteInfo::set_layers(uint32_t value) { _internal_set_layers(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteInfo.layers) } @@ -6760,38 +6838,38 @@ inline int SpriteInfo::sprite_id_size() const { inline void SpriteInfo::clear_sprite_id() { sprite_id_.Clear(); } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::_internal_sprite_id(int index) const { +inline uint32_t SpriteInfo::_internal_sprite_id(int index) const { return sprite_id_.Get(index); } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::sprite_id(int index) const { +inline uint32_t SpriteInfo::sprite_id(int index) const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteInfo.sprite_id) return _internal_sprite_id(index); } -inline void SpriteInfo::set_sprite_id(int index, ::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteInfo::set_sprite_id(int index, uint32_t value) { sprite_id_.Set(index, value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteInfo.sprite_id) } -inline void SpriteInfo::_internal_add_sprite_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteInfo::_internal_add_sprite_id(uint32_t value) { sprite_id_.Add(value); } -inline void SpriteInfo::add_sprite_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteInfo::add_sprite_id(uint32_t value) { _internal_add_sprite_id(value); // @@protoc_insertion_point(field_add:Canary.protobuf.appearances.SpriteInfo.sprite_id) } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >& SpriteInfo::_internal_sprite_id() const { return sprite_id_; } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >& SpriteInfo::sprite_id() const { // @@protoc_insertion_point(field_list:Canary.protobuf.appearances.SpriteInfo.sprite_id) return _internal_sprite_id(); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >* SpriteInfo::_internal_mutable_sprite_id() { return &sprite_id_; } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >* SpriteInfo::mutable_sprite_id() { // @@protoc_insertion_point(field_mutable_list:Canary.protobuf.appearances.SpriteInfo.sprite_id) return _internal_mutable_sprite_id(); @@ -6809,18 +6887,18 @@ inline void SpriteInfo::clear_bounding_square() { bounding_square_ = 0u; _has_bits_[0] &= ~0x00000020u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::_internal_bounding_square() const { +inline uint32_t SpriteInfo::_internal_bounding_square() const { return bounding_square_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpriteInfo::bounding_square() const { +inline uint32_t SpriteInfo::bounding_square() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpriteInfo.bounding_square) return _internal_bounding_square(); } -inline void SpriteInfo::_internal_set_bounding_square(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteInfo::_internal_set_bounding_square(uint32_t value) { _has_bits_[0] |= 0x00000020u; bounding_square_ = value; } -inline void SpriteInfo::set_bounding_square(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpriteInfo::set_bounding_square(uint32_t value) { _internal_set_bounding_square(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpriteInfo.bounding_square) } @@ -7028,18 +7106,18 @@ inline void FrameGroup::clear_id() { id_ = 0u; _has_bits_[0] &= ~0x00000004u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 FrameGroup::_internal_id() const { +inline uint32_t FrameGroup::_internal_id() const { return id_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 FrameGroup::id() const { +inline uint32_t FrameGroup::id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.FrameGroup.id) return _internal_id(); } -inline void FrameGroup::_internal_set_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void FrameGroup::_internal_set_id(uint32_t value) { _has_bits_[0] |= 0x00000004u; id_ = value; } -inline void FrameGroup::set_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void FrameGroup::set_id(uint32_t value) { _internal_set_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.FrameGroup.id) } @@ -7150,18 +7228,18 @@ inline void Appearance::clear_id() { id_ = 0u; _has_bits_[0] &= ~0x00000008u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Appearance::_internal_id() const { +inline uint32_t Appearance::_internal_id() const { return id_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 Appearance::id() const { +inline uint32_t Appearance::id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.Appearance.id) return _internal_id(); } -inline void Appearance::_internal_set_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Appearance::_internal_set_id(uint32_t value) { _has_bits_[0] |= 0x00000008u; id_ = value; } -inline void Appearance::set_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void Appearance::set_id(uint32_t value) { _internal_set_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.Appearance.id) } @@ -7341,7 +7419,13 @@ inline std::string* Appearance::release_name() { return nullptr; } _has_bits_[0] &= ~0x00000001u; - return name_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); + auto* p = name_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { + name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + return p; } inline void Appearance::set_allocated_name(std::string* name) { if (name != nullptr) { @@ -7351,6 +7435,11 @@ inline void Appearance::set_allocated_name(std::string* name) { } name_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), name, GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { + name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:Canary.protobuf.appearances.Appearance.name) } @@ -7399,7 +7488,13 @@ inline std::string* Appearance::release_description() { return nullptr; } _has_bits_[0] &= ~0x00000002u; - return description_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); + auto* p = description_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (description_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { + description_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + return p; } inline void Appearance::set_allocated_description(std::string* description) { if (description != nullptr) { @@ -7409,6 +7504,11 @@ inline void Appearance::set_allocated_description(std::string* description) { } description_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), description, GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (description_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { + description_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:Canary.protobuf.appearances.Appearance.description) } @@ -9718,18 +9818,18 @@ inline void AppearanceFlagUpgradeClassification::clear_upgrade_classification() upgrade_classification_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagUpgradeClassification::_internal_upgrade_classification() const { +inline uint32_t AppearanceFlagUpgradeClassification::_internal_upgrade_classification() const { return upgrade_classification_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagUpgradeClassification::upgrade_classification() const { +inline uint32_t AppearanceFlagUpgradeClassification::upgrade_classification() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification.upgrade_classification) return _internal_upgrade_classification(); } -inline void AppearanceFlagUpgradeClassification::_internal_set_upgrade_classification(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagUpgradeClassification::_internal_set_upgrade_classification(uint32_t value) { _has_bits_[0] |= 0x00000001u; upgrade_classification_ = value; } -inline void AppearanceFlagUpgradeClassification::set_upgrade_classification(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagUpgradeClassification::set_upgrade_classification(uint32_t value) { _internal_set_upgrade_classification(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagUpgradeClassification.upgrade_classification) } @@ -9750,18 +9850,18 @@ inline void AppearanceFlagBank::clear_waypoints() { waypoints_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagBank::_internal_waypoints() const { +inline uint32_t AppearanceFlagBank::_internal_waypoints() const { return waypoints_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagBank::waypoints() const { +inline uint32_t AppearanceFlagBank::waypoints() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagBank.waypoints) return _internal_waypoints(); } -inline void AppearanceFlagBank::_internal_set_waypoints(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagBank::_internal_set_waypoints(uint32_t value) { _has_bits_[0] |= 0x00000001u; waypoints_ = value; } -inline void AppearanceFlagBank::set_waypoints(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagBank::set_waypoints(uint32_t value) { _internal_set_waypoints(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagBank.waypoints) } @@ -9782,18 +9882,18 @@ inline void AppearanceFlagWrite::clear_max_text_length() { max_text_length_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagWrite::_internal_max_text_length() const { +inline uint32_t AppearanceFlagWrite::_internal_max_text_length() const { return max_text_length_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagWrite::max_text_length() const { +inline uint32_t AppearanceFlagWrite::max_text_length() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagWrite.max_text_length) return _internal_max_text_length(); } -inline void AppearanceFlagWrite::_internal_set_max_text_length(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagWrite::_internal_set_max_text_length(uint32_t value) { _has_bits_[0] |= 0x00000001u; max_text_length_ = value; } -inline void AppearanceFlagWrite::set_max_text_length(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagWrite::set_max_text_length(uint32_t value) { _internal_set_max_text_length(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagWrite.max_text_length) } @@ -9814,18 +9914,18 @@ inline void AppearanceFlagWriteOnce::clear_max_text_length_once() { max_text_length_once_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagWriteOnce::_internal_max_text_length_once() const { +inline uint32_t AppearanceFlagWriteOnce::_internal_max_text_length_once() const { return max_text_length_once_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagWriteOnce::max_text_length_once() const { +inline uint32_t AppearanceFlagWriteOnce::max_text_length_once() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagWriteOnce.max_text_length_once) return _internal_max_text_length_once(); } -inline void AppearanceFlagWriteOnce::_internal_set_max_text_length_once(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagWriteOnce::_internal_set_max_text_length_once(uint32_t value) { _has_bits_[0] |= 0x00000001u; max_text_length_once_ = value; } -inline void AppearanceFlagWriteOnce::set_max_text_length_once(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagWriteOnce::set_max_text_length_once(uint32_t value) { _internal_set_max_text_length_once(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagWriteOnce.max_text_length_once) } @@ -9846,18 +9946,18 @@ inline void AppearanceFlagLight::clear_brightness() { brightness_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagLight::_internal_brightness() const { +inline uint32_t AppearanceFlagLight::_internal_brightness() const { return brightness_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagLight::brightness() const { +inline uint32_t AppearanceFlagLight::brightness() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagLight.brightness) return _internal_brightness(); } -inline void AppearanceFlagLight::_internal_set_brightness(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagLight::_internal_set_brightness(uint32_t value) { _has_bits_[0] |= 0x00000001u; brightness_ = value; } -inline void AppearanceFlagLight::set_brightness(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagLight::set_brightness(uint32_t value) { _internal_set_brightness(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagLight.brightness) } @@ -9874,18 +9974,18 @@ inline void AppearanceFlagLight::clear_color() { color_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagLight::_internal_color() const { +inline uint32_t AppearanceFlagLight::_internal_color() const { return color_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagLight::color() const { +inline uint32_t AppearanceFlagLight::color() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagLight.color) return _internal_color(); } -inline void AppearanceFlagLight::_internal_set_color(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagLight::_internal_set_color(uint32_t value) { _has_bits_[0] |= 0x00000002u; color_ = value; } -inline void AppearanceFlagLight::set_color(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagLight::set_color(uint32_t value) { _internal_set_color(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagLight.color) } @@ -9906,18 +10006,18 @@ inline void AppearanceFlagHeight::clear_elevation() { elevation_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagHeight::_internal_elevation() const { +inline uint32_t AppearanceFlagHeight::_internal_elevation() const { return elevation_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagHeight::elevation() const { +inline uint32_t AppearanceFlagHeight::elevation() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagHeight.elevation) return _internal_elevation(); } -inline void AppearanceFlagHeight::_internal_set_elevation(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagHeight::_internal_set_elevation(uint32_t value) { _has_bits_[0] |= 0x00000001u; elevation_ = value; } -inline void AppearanceFlagHeight::set_elevation(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagHeight::set_elevation(uint32_t value) { _internal_set_elevation(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagHeight.elevation) } @@ -9938,18 +10038,18 @@ inline void AppearanceFlagShift::clear_x() { x_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagShift::_internal_x() const { +inline uint32_t AppearanceFlagShift::_internal_x() const { return x_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagShift::x() const { +inline uint32_t AppearanceFlagShift::x() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagShift.x) return _internal_x(); } -inline void AppearanceFlagShift::_internal_set_x(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagShift::_internal_set_x(uint32_t value) { _has_bits_[0] |= 0x00000001u; x_ = value; } -inline void AppearanceFlagShift::set_x(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagShift::set_x(uint32_t value) { _internal_set_x(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagShift.x) } @@ -9966,18 +10066,18 @@ inline void AppearanceFlagShift::clear_y() { y_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagShift::_internal_y() const { +inline uint32_t AppearanceFlagShift::_internal_y() const { return y_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagShift::y() const { +inline uint32_t AppearanceFlagShift::y() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagShift.y) return _internal_y(); } -inline void AppearanceFlagShift::_internal_set_y(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagShift::_internal_set_y(uint32_t value) { _has_bits_[0] |= 0x00000002u; y_ = value; } -inline void AppearanceFlagShift::set_y(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagShift::set_y(uint32_t value) { _internal_set_y(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagShift.y) } @@ -9998,18 +10098,18 @@ inline void AppearanceFlagClothes::clear_slot() { slot_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagClothes::_internal_slot() const { +inline uint32_t AppearanceFlagClothes::_internal_slot() const { return slot_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagClothes::slot() const { +inline uint32_t AppearanceFlagClothes::slot() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagClothes.slot) return _internal_slot(); } -inline void AppearanceFlagClothes::_internal_set_slot(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagClothes::_internal_set_slot(uint32_t value) { _has_bits_[0] |= 0x00000001u; slot_ = value; } -inline void AppearanceFlagClothes::set_slot(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagClothes::set_slot(uint32_t value) { _internal_set_slot(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagClothes.slot) } @@ -10092,18 +10192,18 @@ inline void AppearanceFlagMarket::clear_trade_as_object_id() { trade_as_object_id_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagMarket::_internal_trade_as_object_id() const { +inline uint32_t AppearanceFlagMarket::_internal_trade_as_object_id() const { return trade_as_object_id_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagMarket::trade_as_object_id() const { +inline uint32_t AppearanceFlagMarket::trade_as_object_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagMarket.trade_as_object_id) return _internal_trade_as_object_id(); } -inline void AppearanceFlagMarket::_internal_set_trade_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagMarket::_internal_set_trade_as_object_id(uint32_t value) { _has_bits_[0] |= 0x00000001u; trade_as_object_id_ = value; } -inline void AppearanceFlagMarket::set_trade_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagMarket::set_trade_as_object_id(uint32_t value) { _internal_set_trade_as_object_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagMarket.trade_as_object_id) } @@ -10120,18 +10220,18 @@ inline void AppearanceFlagMarket::clear_show_as_object_id() { show_as_object_id_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagMarket::_internal_show_as_object_id() const { +inline uint32_t AppearanceFlagMarket::_internal_show_as_object_id() const { return show_as_object_id_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagMarket::show_as_object_id() const { +inline uint32_t AppearanceFlagMarket::show_as_object_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagMarket.show_as_object_id) return _internal_show_as_object_id(); } -inline void AppearanceFlagMarket::_internal_set_show_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagMarket::_internal_set_show_as_object_id(uint32_t value) { _has_bits_[0] |= 0x00000002u; show_as_object_id_ = value; } -inline void AppearanceFlagMarket::set_show_as_object_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagMarket::set_show_as_object_id(uint32_t value) { _internal_set_show_as_object_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagMarket.show_as_object_id) } @@ -10193,18 +10293,18 @@ inline void AppearanceFlagMarket::clear_minimum_level() { minimum_level_ = 0u; _has_bits_[0] &= ~0x00000004u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagMarket::_internal_minimum_level() const { +inline uint32_t AppearanceFlagMarket::_internal_minimum_level() const { return minimum_level_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagMarket::minimum_level() const { +inline uint32_t AppearanceFlagMarket::minimum_level() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagMarket.minimum_level) return _internal_minimum_level(); } -inline void AppearanceFlagMarket::_internal_set_minimum_level(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagMarket::_internal_set_minimum_level(uint32_t value) { _has_bits_[0] |= 0x00000004u; minimum_level_ = value; } -inline void AppearanceFlagMarket::set_minimum_level(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagMarket::set_minimum_level(uint32_t value) { _internal_set_minimum_level(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagMarket.minimum_level) } @@ -10258,7 +10358,13 @@ inline std::string* AppearanceFlagNPC::release_name() { return nullptr; } _has_bits_[0] &= ~0x00000001u; - return name_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); + auto* p = name_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { + name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + return p; } inline void AppearanceFlagNPC::set_allocated_name(std::string* name) { if (name != nullptr) { @@ -10268,6 +10374,11 @@ inline void AppearanceFlagNPC::set_allocated_name(std::string* name) { } name_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), name, GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { + name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:Canary.protobuf.appearances.AppearanceFlagNPC.name) } @@ -10316,7 +10427,13 @@ inline std::string* AppearanceFlagNPC::release_location() { return nullptr; } _has_bits_[0] &= ~0x00000002u; - return location_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); + auto* p = location_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (location_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { + location_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + return p; } inline void AppearanceFlagNPC::set_allocated_location(std::string* location) { if (location != nullptr) { @@ -10326,6 +10443,11 @@ inline void AppearanceFlagNPC::set_allocated_location(std::string* location) { } location_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), location, GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (location_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { + location_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:Canary.protobuf.appearances.AppearanceFlagNPC.location) } @@ -10341,18 +10463,18 @@ inline void AppearanceFlagNPC::clear_sale_price() { sale_price_ = 0u; _has_bits_[0] &= ~0x00000008u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagNPC::_internal_sale_price() const { +inline uint32_t AppearanceFlagNPC::_internal_sale_price() const { return sale_price_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagNPC::sale_price() const { +inline uint32_t AppearanceFlagNPC::sale_price() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagNPC.sale_price) return _internal_sale_price(); } -inline void AppearanceFlagNPC::_internal_set_sale_price(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagNPC::_internal_set_sale_price(uint32_t value) { _has_bits_[0] |= 0x00000008u; sale_price_ = value; } -inline void AppearanceFlagNPC::set_sale_price(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagNPC::set_sale_price(uint32_t value) { _internal_set_sale_price(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagNPC.sale_price) } @@ -10369,18 +10491,18 @@ inline void AppearanceFlagNPC::clear_buy_price() { buy_price_ = 0u; _has_bits_[0] &= ~0x00000010u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagNPC::_internal_buy_price() const { +inline uint32_t AppearanceFlagNPC::_internal_buy_price() const { return buy_price_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagNPC::buy_price() const { +inline uint32_t AppearanceFlagNPC::buy_price() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagNPC.buy_price) return _internal_buy_price(); } -inline void AppearanceFlagNPC::_internal_set_buy_price(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagNPC::_internal_set_buy_price(uint32_t value) { _has_bits_[0] |= 0x00000010u; buy_price_ = value; } -inline void AppearanceFlagNPC::set_buy_price(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagNPC::set_buy_price(uint32_t value) { _internal_set_buy_price(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagNPC.buy_price) } @@ -10397,18 +10519,18 @@ inline void AppearanceFlagNPC::clear_currency_object_type_id() { currency_object_type_id_ = 0u; _has_bits_[0] &= ~0x00000020u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagNPC::_internal_currency_object_type_id() const { +inline uint32_t AppearanceFlagNPC::_internal_currency_object_type_id() const { return currency_object_type_id_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagNPC::currency_object_type_id() const { +inline uint32_t AppearanceFlagNPC::currency_object_type_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagNPC.currency_object_type_id) return _internal_currency_object_type_id(); } -inline void AppearanceFlagNPC::_internal_set_currency_object_type_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagNPC::_internal_set_currency_object_type_id(uint32_t value) { _has_bits_[0] |= 0x00000020u; currency_object_type_id_ = value; } -inline void AppearanceFlagNPC::set_currency_object_type_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagNPC::set_currency_object_type_id(uint32_t value) { _internal_set_currency_object_type_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagNPC.currency_object_type_id) } @@ -10458,7 +10580,13 @@ inline std::string* AppearanceFlagNPC::release_currency_quest_flag_display_name( return nullptr; } _has_bits_[0] &= ~0x00000004u; - return currency_quest_flag_display_name_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); + auto* p = currency_quest_flag_display_name_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (currency_quest_flag_display_name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { + currency_quest_flag_display_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + return p; } inline void AppearanceFlagNPC::set_allocated_currency_quest_flag_display_name(std::string* currency_quest_flag_display_name) { if (currency_quest_flag_display_name != nullptr) { @@ -10468,6 +10596,11 @@ inline void AppearanceFlagNPC::set_allocated_currency_quest_flag_display_name(st } currency_quest_flag_display_name_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), currency_quest_flag_display_name, GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (currency_quest_flag_display_name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { + currency_quest_flag_display_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:Canary.protobuf.appearances.AppearanceFlagNPC.currency_quest_flag_display_name) } @@ -10487,18 +10620,18 @@ inline void AppearanceFlagAutomap::clear_color() { color_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagAutomap::_internal_color() const { +inline uint32_t AppearanceFlagAutomap::_internal_color() const { return color_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagAutomap::color() const { +inline uint32_t AppearanceFlagAutomap::color() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagAutomap.color) return _internal_color(); } -inline void AppearanceFlagAutomap::_internal_set_color(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagAutomap::_internal_set_color(uint32_t value) { _has_bits_[0] |= 0x00000001u; color_ = value; } -inline void AppearanceFlagAutomap::set_color(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagAutomap::set_color(uint32_t value) { _internal_set_color(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagAutomap.color) } @@ -10552,18 +10685,18 @@ inline void AppearanceFlagLenshelp::clear_id() { id_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagLenshelp::_internal_id() const { +inline uint32_t AppearanceFlagLenshelp::_internal_id() const { return id_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagLenshelp::id() const { +inline uint32_t AppearanceFlagLenshelp::id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagLenshelp.id) return _internal_id(); } -inline void AppearanceFlagLenshelp::_internal_set_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagLenshelp::_internal_set_id(uint32_t value) { _has_bits_[0] |= 0x00000001u; id_ = value; } -inline void AppearanceFlagLenshelp::set_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagLenshelp::set_id(uint32_t value) { _internal_set_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagLenshelp.id) } @@ -10584,18 +10717,18 @@ inline void AppearanceFlagChangedToExpire::clear_former_object_typeid() { former_object_typeid_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagChangedToExpire::_internal_former_object_typeid() const { +inline uint32_t AppearanceFlagChangedToExpire::_internal_former_object_typeid() const { return former_object_typeid_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagChangedToExpire::former_object_typeid() const { +inline uint32_t AppearanceFlagChangedToExpire::former_object_typeid() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagChangedToExpire.former_object_typeid) return _internal_former_object_typeid(); } -inline void AppearanceFlagChangedToExpire::_internal_set_former_object_typeid(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagChangedToExpire::_internal_set_former_object_typeid(uint32_t value) { _has_bits_[0] |= 0x00000001u; former_object_typeid_ = value; } -inline void AppearanceFlagChangedToExpire::set_former_object_typeid(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagChangedToExpire::set_former_object_typeid(uint32_t value) { _internal_set_former_object_typeid(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagChangedToExpire.former_object_typeid) } @@ -10616,18 +10749,18 @@ inline void AppearanceFlagCyclopedia::clear_cyclopedia_type() { cyclopedia_type_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagCyclopedia::_internal_cyclopedia_type() const { +inline uint32_t AppearanceFlagCyclopedia::_internal_cyclopedia_type() const { return cyclopedia_type_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 AppearanceFlagCyclopedia::cyclopedia_type() const { +inline uint32_t AppearanceFlagCyclopedia::cyclopedia_type() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.AppearanceFlagCyclopedia.cyclopedia_type) return _internal_cyclopedia_type(); } -inline void AppearanceFlagCyclopedia::_internal_set_cyclopedia_type(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagCyclopedia::_internal_set_cyclopedia_type(uint32_t value) { _has_bits_[0] |= 0x00000001u; cyclopedia_type_ = value; } -inline void AppearanceFlagCyclopedia::set_cyclopedia_type(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void AppearanceFlagCyclopedia::set_cyclopedia_type(uint32_t value) { _internal_set_cyclopedia_type(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.AppearanceFlagCyclopedia.cyclopedia_type) } @@ -10648,18 +10781,18 @@ inline void SpecialMeaningAppearanceIds::clear_gold_coin_id() { gold_coin_id_ = 0u; _has_bits_[0] &= ~0x00000001u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::_internal_gold_coin_id() const { +inline uint32_t SpecialMeaningAppearanceIds::_internal_gold_coin_id() const { return gold_coin_id_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::gold_coin_id() const { +inline uint32_t SpecialMeaningAppearanceIds::gold_coin_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.gold_coin_id) return _internal_gold_coin_id(); } -inline void SpecialMeaningAppearanceIds::_internal_set_gold_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpecialMeaningAppearanceIds::_internal_set_gold_coin_id(uint32_t value) { _has_bits_[0] |= 0x00000001u; gold_coin_id_ = value; } -inline void SpecialMeaningAppearanceIds::set_gold_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpecialMeaningAppearanceIds::set_gold_coin_id(uint32_t value) { _internal_set_gold_coin_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.gold_coin_id) } @@ -10676,18 +10809,18 @@ inline void SpecialMeaningAppearanceIds::clear_platinum_coin_id() { platinum_coin_id_ = 0u; _has_bits_[0] &= ~0x00000002u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::_internal_platinum_coin_id() const { +inline uint32_t SpecialMeaningAppearanceIds::_internal_platinum_coin_id() const { return platinum_coin_id_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::platinum_coin_id() const { +inline uint32_t SpecialMeaningAppearanceIds::platinum_coin_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.platinum_coin_id) return _internal_platinum_coin_id(); } -inline void SpecialMeaningAppearanceIds::_internal_set_platinum_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpecialMeaningAppearanceIds::_internal_set_platinum_coin_id(uint32_t value) { _has_bits_[0] |= 0x00000002u; platinum_coin_id_ = value; } -inline void SpecialMeaningAppearanceIds::set_platinum_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpecialMeaningAppearanceIds::set_platinum_coin_id(uint32_t value) { _internal_set_platinum_coin_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.platinum_coin_id) } @@ -10704,18 +10837,18 @@ inline void SpecialMeaningAppearanceIds::clear_crystal_coin_id() { crystal_coin_id_ = 0u; _has_bits_[0] &= ~0x00000004u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::_internal_crystal_coin_id() const { +inline uint32_t SpecialMeaningAppearanceIds::_internal_crystal_coin_id() const { return crystal_coin_id_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::crystal_coin_id() const { +inline uint32_t SpecialMeaningAppearanceIds::crystal_coin_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.crystal_coin_id) return _internal_crystal_coin_id(); } -inline void SpecialMeaningAppearanceIds::_internal_set_crystal_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpecialMeaningAppearanceIds::_internal_set_crystal_coin_id(uint32_t value) { _has_bits_[0] |= 0x00000004u; crystal_coin_id_ = value; } -inline void SpecialMeaningAppearanceIds::set_crystal_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpecialMeaningAppearanceIds::set_crystal_coin_id(uint32_t value) { _internal_set_crystal_coin_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.crystal_coin_id) } @@ -10732,18 +10865,18 @@ inline void SpecialMeaningAppearanceIds::clear_tibia_coin_id() { tibia_coin_id_ = 0u; _has_bits_[0] &= ~0x00000008u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::_internal_tibia_coin_id() const { +inline uint32_t SpecialMeaningAppearanceIds::_internal_tibia_coin_id() const { return tibia_coin_id_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::tibia_coin_id() const { +inline uint32_t SpecialMeaningAppearanceIds::tibia_coin_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.tibia_coin_id) return _internal_tibia_coin_id(); } -inline void SpecialMeaningAppearanceIds::_internal_set_tibia_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpecialMeaningAppearanceIds::_internal_set_tibia_coin_id(uint32_t value) { _has_bits_[0] |= 0x00000008u; tibia_coin_id_ = value; } -inline void SpecialMeaningAppearanceIds::set_tibia_coin_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpecialMeaningAppearanceIds::set_tibia_coin_id(uint32_t value) { _internal_set_tibia_coin_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.tibia_coin_id) } @@ -10760,18 +10893,18 @@ inline void SpecialMeaningAppearanceIds::clear_stamped_letter_id() { stamped_letter_id_ = 0u; _has_bits_[0] &= ~0x00000010u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::_internal_stamped_letter_id() const { +inline uint32_t SpecialMeaningAppearanceIds::_internal_stamped_letter_id() const { return stamped_letter_id_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::stamped_letter_id() const { +inline uint32_t SpecialMeaningAppearanceIds::stamped_letter_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.stamped_letter_id) return _internal_stamped_letter_id(); } -inline void SpecialMeaningAppearanceIds::_internal_set_stamped_letter_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpecialMeaningAppearanceIds::_internal_set_stamped_letter_id(uint32_t value) { _has_bits_[0] |= 0x00000010u; stamped_letter_id_ = value; } -inline void SpecialMeaningAppearanceIds::set_stamped_letter_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpecialMeaningAppearanceIds::set_stamped_letter_id(uint32_t value) { _internal_set_stamped_letter_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.stamped_letter_id) } @@ -10788,18 +10921,18 @@ inline void SpecialMeaningAppearanceIds::clear_supply_stash_id() { supply_stash_id_ = 0u; _has_bits_[0] &= ~0x00000020u; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::_internal_supply_stash_id() const { +inline uint32_t SpecialMeaningAppearanceIds::_internal_supply_stash_id() const { return supply_stash_id_; } -inline ::PROTOBUF_NAMESPACE_ID::uint32 SpecialMeaningAppearanceIds::supply_stash_id() const { +inline uint32_t SpecialMeaningAppearanceIds::supply_stash_id() const { // @@protoc_insertion_point(field_get:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.supply_stash_id) return _internal_supply_stash_id(); } -inline void SpecialMeaningAppearanceIds::_internal_set_supply_stash_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpecialMeaningAppearanceIds::_internal_set_supply_stash_id(uint32_t value) { _has_bits_[0] |= 0x00000020u; supply_stash_id_ = value; } -inline void SpecialMeaningAppearanceIds::set_supply_stash_id(::PROTOBUF_NAMESPACE_ID::uint32 value) { +inline void SpecialMeaningAppearanceIds::set_supply_stash_id(uint32_t value) { _internal_set_supply_stash_id(value); // @@protoc_insertion_point(field_set:Canary.protobuf.appearances.SpecialMeaningAppearanceIds.supply_stash_id) } From a8048344913065280ce67ac6dd5a87b99a920741 Mon Sep 17 00:00:00 2001 From: Marcos <66353315+marcosvf132@users.noreply.github.com> Date: Tue, 31 May 2022 18:22:49 -0300 Subject: [PATCH 4/7] Fix some prey issues - Change 'normal_random' to 'uniform_random', to make it full random. - Change prey selection type when rerolling the slot, since the bonus is maintained. --- src/io/ioprey.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/io/ioprey.cpp b/src/io/ioprey.cpp index 8b80310c7f8..0adf8b944de 100644 --- a/src/io/ioprey.cpp +++ b/src/io/ioprey.cpp @@ -40,12 +40,12 @@ void PreySlot::reloadBonusType() if (bonusRarity == 10) { PreyBonus_t bonus_tmp = bonus; while (bonus_tmp == bonus) { - bonus = static_cast(normal_random(PreyBonus_First, PreyBonus_Last)); + bonus = static_cast(uniform_random(PreyBonus_First, PreyBonus_Last)); } return; } - bonus = static_cast(normal_random(PreyBonus_First, PreyBonus_Last)); + bonus = static_cast(uniform_random(PreyBonus_First, PreyBonus_Last)); } void PreySlot::reloadBonusValue() @@ -56,7 +56,7 @@ void PreySlot::reloadBonusValue() if (bonusRarity >= 9) { bonusRarity = 10; } else { - bonusRarity = static_cast(normal_random(bonusRarity + 1, 10)); + bonusRarity = static_cast(uniform_random(bonusRarity + 1, 10)); } bonusPercentage = stagePercent * bonusRarity; @@ -113,7 +113,7 @@ void PreySlot::reloadMonsterGrid(std::vector blackList, uint32_t level uint8_t tries = 0; auto maxIndex = static_cast(bestiary.size() - 1); while (raceIdList.size() < 9) { - uint16_t raceId = (*(std::next(bestiary.begin(), normal_random(0, maxIndex)))).first; + uint16_t raceId = (*(std::next(bestiary.begin(), uniform_random(0, maxIndex)))).first; tries++; if (std::count(blackList.begin(), blackList.end(), raceId) != 0) { @@ -195,7 +195,7 @@ void TaskHuntingSlot::reloadMonsterGrid(std::vector blackList, uint32_ uint8_t tries = 0; auto maxIndex = static_cast(bestiary.size() - 1); while (raceIdList.size() < 9) { - uint16_t raceId = (*(std::next(bestiary.begin(), normal_random(0, maxIndex)))).first; + uint16_t raceId = (*(std::next(bestiary.begin(), uniform_random(0, maxIndex)))).first; tries++; if (std::count(blackList.begin(), blackList.end(), raceId) != 0) { @@ -238,13 +238,13 @@ void TaskHuntingSlot::reloadReward() int32_t chance; if (rarity == 0) { - chance = normal_random(0, 100); + chance = uniform_random(0, 100); } else if (rarity == 1) { - chance = normal_random(0, 70); + chance = uniform_random(0, 70); } else if (rarity == 2) { - chance = normal_random(0, 45); + chance = uniform_random(0, 45); } else if (rarity == 3) { - chance = normal_random(0, 20); + chance = uniform_random(0, 20); } else { return; } @@ -330,7 +330,7 @@ void IOPrey::ParsePreyAction(Player* player, } slot->eraseBonus(true); - slot->state = PreyDataState_Selection; + slot->state = PreyDataState_SelectionChangeMonster; slot->reloadMonsterGrid(player->getPreyBlackList(), player->getLevel()); } else if (action == PreyAction_ListAll_Cards) { if (!player->usePreyCards(static_cast(g_configManager().getNumber(PREY_SELECTION_LIST_PRICE)))) { @@ -506,7 +506,7 @@ void IOPrey::ParseTaskHuntingAction(Player* player, if (const TaskHuntingOption* option = GetTaskRewardOption(slot)) { uint16_t reward; - int32_t boostChange = normal_random(0, 100); + int32_t boostChange = uniform_random(0, 100); if (slot->rarity >= 4 && boostChange <= 5) { boostChange = 20; } else if (slot->rarity >= 4 && boostChange <= 10) { From 5d4a6ef5f37190adaf231767adcb613de3f7cf74 Mon Sep 17 00:00:00 2001 From: Marcos <66353315+marcosvf132@users.noreply.github.com> Date: Tue, 31 May 2022 23:48:31 -0300 Subject: [PATCH 5/7] Prey 'SelectionChangeMonster' window --- src/io/ioprey.cpp | 4 +++- src/server/network/protocol/protocolgame.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/io/ioprey.cpp b/src/io/ioprey.cpp index 0adf8b944de..79176efce5b 100644 --- a/src/io/ioprey.cpp +++ b/src/io/ioprey.cpp @@ -330,7 +330,9 @@ void IOPrey::ParsePreyAction(Player* player, } slot->eraseBonus(true); - slot->state = PreyDataState_SelectionChangeMonster; + if (slot->bonus != PreyBonus_None) { + slot->state = PreyDataState_SelectionChangeMonster; + } slot->reloadMonsterGrid(player->getPreyBlackList(), player->getLevel()); } else if (action == PreyAction_ListAll_Cards) { if (!player->usePreyCards(static_cast(g_configManager().getNumber(PREY_SELECTION_LIST_PRICE)))) { diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp index da412b81df6..236ce86f42b 100644 --- a/src/server/network/protocol/protocolgame.cpp +++ b/src/server/network/protocol/protocolgame.cpp @@ -6261,7 +6261,7 @@ void ProtocolGame::sendPreyData(const PreySlot* slot) msg.addByte(static_cast(slot->bonus)); msg.add(slot->bonusPercentage); msg.addByte(slot->bonusRarity); - msg.add(static_cast(slot->raceIdList.size())); + msg.addByte(static_cast(slot->raceIdList.size())); std::for_each(slot->raceIdList.begin(), slot->raceIdList.end(), [&msg](uint16_t raceId) { if (const MonsterType* mtype = g_monsters().getMonsterTypeByRaceId(raceId)) { From 2a1f1a5453541067aaebb6e30eca2ad9084462d3 Mon Sep 17 00:00:00 2001 From: Marcos <66353315+marcosvf132@users.noreply.github.com> Date: Wed, 1 Jun 2022 22:03:42 -0300 Subject: [PATCH 6/7] Update ioprey.h --- src/io/ioprey.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/io/ioprey.h b/src/io/ioprey.h index 4e47d58ab0b..0ab646d6331 100644 --- a/src/io/ioprey.h +++ b/src/io/ioprey.h @@ -113,7 +113,7 @@ class PreySlot } bool canSelect() const { - return (state == PreyDataState_Selection || state == PreyDataState_ListSelection || state == PreyDataState_Inactive); + return (state == PreyDataState_Selection || state == PreyDataState_SelectionChangeMonster || state == PreyDataState_ListSelection || state == PreyDataState_Inactive); } void eraseBonus(bool maintainBonus = false) { From e438a6cc3ef870648c437de90f0f1f4e46ddc966 Mon Sep 17 00:00:00 2001 From: Marcos <66353315+marcosvf132@users.noreply.github.com> Date: Mon, 6 Jun 2022 12:28:40 -0300 Subject: [PATCH 7/7] Update ioprey.cpp --- src/io/ioprey.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/io/ioprey.cpp b/src/io/ioprey.cpp index 79176efce5b..df6f2f8ef4a 100644 --- a/src/io/ioprey.cpp +++ b/src/io/ioprey.cpp @@ -298,7 +298,6 @@ void IOPrey::CheckPlayerPreys(Player* player, uint8_t amount) const } slot->eraseBonus(); - slot->state = PreyDataState_Inactive; player->reloadPreySlot(static_cast(slotId)); } else { slot->bonusTimeLeft -= amount;