blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 21:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Parse SCIT display data as packet list

Browse source
This commit is contained in:
Dan Paulat 2024-02-03 23:43:08 -06:00
parent d92c1e50f2
commit 43911c1179
2 changed files with 43 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
wxdata/include/scwx/wsr88d/rpg/scit_data_packet.hpp
View file

@ -24,7 +24,7 @@ public:
ScitDataPacket(ScitDataPacket&&) noexcept; ScitDataPacket(ScitDataPacket&&) noexcept;
ScitDataPacket& operator=(ScitDataPacket&&) noexcept; ScitDataPacket& operator=(ScitDataPacket&&) noexcept;
const std::vector<std::uint8_t>& data() const; std::vector<std::shared_ptr<Packet>> packet_list() const;
std::size_t RecordCount() const override; std::size_t RecordCount() const override;

51
wxdata/source/scwx/wsr88d/rpg/scit_data_packet.cpp
View file

@ -1,4 +1,5 @@
#include <scwx/wsr88d/rpg/scit_data_packet.hpp> #include <scwx/wsr88d/rpg/scit_data_packet.hpp>
#include <scwx/wsr88d/rpg/packet_factory.hpp>
#include <scwx/util/logger.hpp> #include <scwx/util/logger.hpp>
#include <istream> #include <istream>
@ -20,11 +21,10 @@ static const std::set<std::uint16_t> packetCodes_ = {23, 24};
class ScitDataPacket::Impl class ScitDataPacket::Impl
{ {
public: public:
explicit Impl() : data_ {}, recordCount_ {0} {} explicit Impl() {}
~Impl() = default; ~Impl() = default;
std::vector<std::uint8_t> data_; std::vector<std::shared_ptr<Packet>> packetList_ {};
size_t recordCount_;
}; };
ScitDataPacket::ScitDataPacket() : p(std::make_unique<Impl>()) {} ScitDataPacket::ScitDataPacket() : p(std::make_unique<Impl>()) {}
@ -33,14 +33,14 @@ ScitDataPacket::~ScitDataPacket() = default;
ScitDataPacket::ScitDataPacket(ScitDataPacket&&) noexcept = default; ScitDataPacket::ScitDataPacket(ScitDataPacket&&) noexcept = default;
ScitDataPacket& ScitDataPacket::operator=(ScitDataPacket&&) noexcept = default; ScitDataPacket& ScitDataPacket::operator=(ScitDataPacket&&) noexcept = default;
const std::vector<std::uint8_t>& ScitDataPacket::data() const std::vector<std::shared_ptr<Packet>> ScitDataPacket::packet_list() const
{ {
return p->data_; return p->packetList_;
} }
size_t ScitDataPacket::RecordCount() const size_t ScitDataPacket::RecordCount() const
{ {
return p->recordCount_; return p->packetList_.size();
} }
bool ScitDataPacket::ParseData(std::istream& is) bool ScitDataPacket::ParseData(std::istream& is)
@ -55,9 +55,42 @@ bool ScitDataPacket::ParseData(std::istream& is)
if (blockValid) if (blockValid)
{ {
p->recordCount_ = length_of_block(); std::uint32_t bytesRead = 0;
p->data_.resize(p->recordCount_); std::uint32_t lengthOfBlock = length_of_block();
is.read(reinterpret_cast<char*>(p->data_.data()), p->recordCount_); std::streampos dataStart = is.tellg();
std::streampos dataEnd =
dataStart + static_cast<std::streamoff>(lengthOfBlock);
while (bytesRead < lengthOfBlock)
{
std::shared_ptr<Packet> packet = PacketFactory::Create(is);
if (packet != nullptr)
{
p->packetList_.push_back(packet);
bytesRead += static_cast<std::uint32_t>(packet->data_size());
}
else
{
break;
}
}
if (bytesRead < lengthOfBlock)
{
logger_->trace("Block bytes read smaller than size: {} < {} bytes",
bytesRead,
lengthOfBlock);
blockValid = false;
is.seekg(dataEnd, std::ios_base::beg);
}
if (bytesRead > lengthOfBlock)
{
logger_->warn("Block bytes read larger than size: {} > {} bytes",
bytesRead,
lengthOfBlock);
blockValid = false;
is.seekg(dataEnd, std::ios_base::beg);
}
} }
return blockValid; return blockValid;