From ead781a9ab3f08abd3b245e00992e057847e26b5 Mon Sep 17 00:00:00 2001 From: Tim Leonard Date: Wed, 3 Jan 2024 21:15:09 +0000 Subject: [PATCH] Fixed compile error. --- Protobuf/DarkSouls2/DS2_Frpg2PlayerData.proto | 2 +- .../Generated/DS2_Frpg2PlayerData.pb.cc | 34 +++++------ .../Generated/DS2_Frpg2PlayerData.pb.h | 60 +++++++++---------- .../PlayerData/DS2_PlayerDataManager.cpp | 4 +- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Protobuf/DarkSouls2/DS2_Frpg2PlayerData.proto b/Protobuf/DarkSouls2/DS2_Frpg2PlayerData.proto index 87325033..ed4596cb 100644 --- a/Protobuf/DarkSouls2/DS2_Frpg2PlayerData.proto +++ b/Protobuf/DarkSouls2/DS2_Frpg2PlayerData.proto @@ -133,7 +133,7 @@ message PlayerStatus { optional uint32 disable_cross_region_play = 9; optional uint32 character_id = 10; optional uint32 human_effigy_burnt = 11; - repeated uint32 played_online_areas = 12; + repeated uint32 played_areas = 12; optional uint32 unknown_13 = 13; optional uint32 unknown_14 = 14; optional uint32 soul_level = 15; diff --git a/Source/Server.DarkSouls2/Protobuf/Generated/DS2_Frpg2PlayerData.pb.cc b/Source/Server.DarkSouls2/Protobuf/Generated/DS2_Frpg2PlayerData.pb.cc index 36d5834b..791d0ff8 100644 --- a/Source/Server.DarkSouls2/Protobuf/Generated/DS2_Frpg2PlayerData.pb.cc +++ b/Source/Server.DarkSouls2/Protobuf/Generated/DS2_Frpg2PlayerData.pb.cc @@ -4500,7 +4500,7 @@ const int PlayerStatus::kPhantomLeaveAtFieldNumber; const int PlayerStatus::kDisableCrossRegionPlayFieldNumber; const int PlayerStatus::kCharacterIdFieldNumber; const int PlayerStatus::kHumanEffigyBurntFieldNumber; -const int PlayerStatus::kPlayedOnlineAreasFieldNumber; +const int PlayerStatus::kPlayedAreasFieldNumber; const int PlayerStatus::kUnknown13FieldNumber; const int PlayerStatus::kUnknown14FieldNumber; const int PlayerStatus::kSoulLevelFieldNumber; @@ -4640,7 +4640,7 @@ void PlayerStatus::Clear() { #undef OFFSET_OF_FIELD_ #undef ZR_ - played_online_areas_.Clear(); + played_areas_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); mutable_unknown_fields()->clear(); } @@ -4815,25 +4815,25 @@ bool PlayerStatus::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(96)) goto parse_played_online_areas; + if (input->ExpectTag(96)) goto parse_played_areas; break; } - // repeated uint32 played_online_areas = 12; + // repeated uint32 played_areas = 12; case 12: { if (tag == 96) { - parse_played_online_areas: + parse_played_areas: DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive< ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - 1, 96, input, this->mutable_played_online_areas()))); + 1, 96, input, this->mutable_played_areas()))); } else if (tag == 98) { DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline< ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - input, this->mutable_played_online_areas()))); + input, this->mutable_played_areas()))); } else { goto handle_unusual; } - if (input->ExpectTag(96)) goto parse_played_online_areas; + if (input->ExpectTag(96)) goto parse_played_areas; if (input->ExpectTag(104)) goto parse_unknown_13; break; } @@ -5053,10 +5053,10 @@ void PlayerStatus::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteUInt32(11, this->human_effigy_burnt(), output); } - // repeated uint32 played_online_areas = 12; - for (int i = 0; i < this->played_online_areas_size(); i++) { + // repeated uint32 played_areas = 12; + for (int i = 0; i < this->played_areas_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteUInt32( - 12, this->played_online_areas(i), output); + 12, this->played_areas(i), output); } // optional uint32 unknown_13 = 13; @@ -5259,14 +5259,14 @@ int PlayerStatus::ByteSize() const { } } - // repeated uint32 played_online_areas = 12; + // repeated uint32 played_areas = 12; { int data_size = 0; - for (int i = 0; i < this->played_online_areas_size(); i++) { + for (int i = 0; i < this->played_areas_size(); i++) { data_size += ::google::protobuf::internal::WireFormatLite:: - UInt32Size(this->played_online_areas(i)); + UInt32Size(this->played_areas(i)); } - total_size += 1 * this->played_online_areas_size() + data_size; + total_size += 1 * this->played_areas_size() + data_size; } total_size += unknown_fields().size(); @@ -5284,7 +5284,7 @@ void PlayerStatus::CheckTypeAndMergeFrom( void PlayerStatus::MergeFrom(const PlayerStatus& from) { GOOGLE_CHECK_NE(&from, this); - played_online_areas_.MergeFrom(from.played_online_areas_); + played_areas_.MergeFrom(from.played_areas_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_name()) { set_name(from.name()); @@ -5381,7 +5381,7 @@ void PlayerStatus::Swap(PlayerStatus* other) { std::swap(disable_cross_region_play_, other->disable_cross_region_play_); std::swap(character_id_, other->character_id_); std::swap(human_effigy_burnt_, other->human_effigy_burnt_); - played_online_areas_.Swap(&other->played_online_areas_); + played_areas_.Swap(&other->played_areas_); std::swap(unknown_13_, other->unknown_13_); std::swap(unknown_14_, other->unknown_14_); std::swap(soul_level_, other->soul_level_); diff --git a/Source/Server.DarkSouls2/Protobuf/Generated/DS2_Frpg2PlayerData.pb.h b/Source/Server.DarkSouls2/Protobuf/Generated/DS2_Frpg2PlayerData.pb.h index 858388d5..ed1320fd 100644 --- a/Source/Server.DarkSouls2/Protobuf/Generated/DS2_Frpg2PlayerData.pb.h +++ b/Source/Server.DarkSouls2/Protobuf/Generated/DS2_Frpg2PlayerData.pb.h @@ -1800,17 +1800,17 @@ class PlayerStatus : public ::google::protobuf::MessageLite { inline ::google::protobuf::uint32 human_effigy_burnt() const; inline void set_human_effigy_burnt(::google::protobuf::uint32 value); - // repeated uint32 played_online_areas = 12; - inline int played_online_areas_size() const; - inline void clear_played_online_areas(); - static const int kPlayedOnlineAreasFieldNumber = 12; - inline ::google::protobuf::uint32 played_online_areas(int index) const; - inline void set_played_online_areas(int index, ::google::protobuf::uint32 value); - inline void add_played_online_areas(::google::protobuf::uint32 value); + // repeated uint32 played_areas = 12; + inline int played_areas_size() const; + inline void clear_played_areas(); + static const int kPlayedAreasFieldNumber = 12; + inline ::google::protobuf::uint32 played_areas(int index) const; + inline void set_played_areas(int index, ::google::protobuf::uint32 value); + inline void add_played_areas(::google::protobuf::uint32 value); inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >& - played_online_areas() const; + played_areas() const; inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >* - mutable_played_online_areas(); + mutable_played_areas(); // optional uint32 unknown_13 = 13; inline bool has_unknown_13() const; @@ -1937,7 +1937,7 @@ class PlayerStatus : public ::google::protobuf::MessageLite { ::DS2_Frpg2PlayerData::PlayerStatus_Phantom_leave_at* phantom_leave_at_; ::google::protobuf::uint32 disable_cross_region_play_; ::google::protobuf::uint32 character_id_; - ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > played_online_areas_; + ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > played_areas_; ::google::protobuf::uint32 human_effigy_burnt_; ::google::protobuf::uint32 unknown_13_; ::google::protobuf::uint32 unknown_14_; @@ -5204,34 +5204,34 @@ inline void PlayerStatus::set_human_effigy_burnt(::google::protobuf::uint32 valu // @@protoc_insertion_point(field_set:DS2_Frpg2PlayerData.PlayerStatus.human_effigy_burnt) } -// repeated uint32 played_online_areas = 12; -inline int PlayerStatus::played_online_areas_size() const { - return played_online_areas_.size(); +// repeated uint32 played_areas = 12; +inline int PlayerStatus::played_areas_size() const { + return played_areas_.size(); } -inline void PlayerStatus::clear_played_online_areas() { - played_online_areas_.Clear(); +inline void PlayerStatus::clear_played_areas() { + played_areas_.Clear(); } -inline ::google::protobuf::uint32 PlayerStatus::played_online_areas(int index) const { - // @@protoc_insertion_point(field_get:DS2_Frpg2PlayerData.PlayerStatus.played_online_areas) - return played_online_areas_.Get(index); +inline ::google::protobuf::uint32 PlayerStatus::played_areas(int index) const { + // @@protoc_insertion_point(field_get:DS2_Frpg2PlayerData.PlayerStatus.played_areas) + return played_areas_.Get(index); } -inline void PlayerStatus::set_played_online_areas(int index, ::google::protobuf::uint32 value) { - played_online_areas_.Set(index, value); - // @@protoc_insertion_point(field_set:DS2_Frpg2PlayerData.PlayerStatus.played_online_areas) +inline void PlayerStatus::set_played_areas(int index, ::google::protobuf::uint32 value) { + played_areas_.Set(index, value); + // @@protoc_insertion_point(field_set:DS2_Frpg2PlayerData.PlayerStatus.played_areas) } -inline void PlayerStatus::add_played_online_areas(::google::protobuf::uint32 value) { - played_online_areas_.Add(value); - // @@protoc_insertion_point(field_add:DS2_Frpg2PlayerData.PlayerStatus.played_online_areas) +inline void PlayerStatus::add_played_areas(::google::protobuf::uint32 value) { + played_areas_.Add(value); + // @@protoc_insertion_point(field_add:DS2_Frpg2PlayerData.PlayerStatus.played_areas) } inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >& -PlayerStatus::played_online_areas() const { - // @@protoc_insertion_point(field_list:DS2_Frpg2PlayerData.PlayerStatus.played_online_areas) - return played_online_areas_; +PlayerStatus::played_areas() const { + // @@protoc_insertion_point(field_list:DS2_Frpg2PlayerData.PlayerStatus.played_areas) + return played_areas_; } inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >* -PlayerStatus::mutable_played_online_areas() { - // @@protoc_insertion_point(field_mutable_list:DS2_Frpg2PlayerData.PlayerStatus.played_online_areas) - return &played_online_areas_; +PlayerStatus::mutable_played_areas() { + // @@protoc_insertion_point(field_mutable_list:DS2_Frpg2PlayerData.PlayerStatus.played_areas) + return &played_areas_; } // optional uint32 unknown_13 = 13; diff --git a/Source/Server.DarkSouls2/Server/GameService/GameManagers/PlayerData/DS2_PlayerDataManager.cpp b/Source/Server.DarkSouls2/Server/GameService/GameManagers/PlayerData/DS2_PlayerDataManager.cpp index 680c0bec..0fa2aba2 100644 --- a/Source/Server.DarkSouls2/Server/GameService/GameManagers/PlayerData/DS2_PlayerDataManager.cpp +++ b/Source/Server.DarkSouls2/Server/GameService/GameManagers/PlayerData/DS2_PlayerDataManager.cpp @@ -142,9 +142,9 @@ MessageHandleResult DS2_PlayerDataManager::Handle_RequestUpdatePlayerStatus(Game // MergeFrom combines arrays, so we need to do some fuckyness here to handle this. // TODO - if (status.has_player_status() && status.player_status().unknown_12_size() > 0) + if (status.has_player_status() && status.player_status().played_areas_size() > 0) { - State.GetPlayerStatus_Mutable().mutable_player_status()->clear_unknown_12(); + State.GetPlayerStatus_Mutable().mutable_player_status()->clear_played_areas(); } /* if (status.has_player_status() && status.player_status().played_areas_size() > 0)