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

Deconflicting internal level 3 struct names

Browse source
This commit is contained in:
Dan Paulat 2022-01-08 01:35:05 -06:00
parent 0487a40f67
commit 62429bdea7
3 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

42
wxdata/source/scwx/wsr88d/rpg/radial_data_packet.cpp
View file

@ -15,30 +15,30 @@ namespace rpg
static const std::string logPrefix_ =
"[scwx::wsr88d::rpg::radial_data_packet] ";
struct Radial
{
uint16_t numberOfRleHalfwords_;
uint16_t startAngle_;
uint16_t angleDelta_;
std::vector<uint8_t> data_;
Radial() :
numberOfRleHalfwords_ {0}, startAngle_ {0}, angleDelta_ {0}, data_ {}
{
}
};
class RadialDataPacketImpl
{
public:
struct Radial
{
uint16_t numberOfRleHalfwords_;
uint16_t startAngle_;
uint16_t angleDelta_;
std::vector<uint8_t> data_;
Radial() :
numberOfRleHalfwords_ {0}, startAngle_ {0}, angleDelta_ {0}, data_ {}
{
}
};
explicit RadialDataPacketImpl() :
packetCode_ {},
indexOfFirstRangeBin_ {},
numberOfRangeBins_ {},
iCenterOfSweep_ {},
jCenterOfSweep_ {},
scaleFactor_ {},
dataSize_ {} {};
packetCode_ {0},
indexOfFirstRangeBin_ {0},
numberOfRangeBins_ {0},
iCenterOfSweep_ {0},
jCenterOfSweep_ {0},
scaleFactor_ {0},
dataSize_ {0} {};
~RadialDataPacketImpl() = default;
uint16_t packetCode_;
@ -162,7 +162,7 @@ bool RadialDataPacket::Parse(std::istream& is)
for (uint16_t r = 0; r < p->numberOfRadials_; r++)
{
Radial& radial = p->radial_[r];
auto& radial = p->radial_[r];
is.read(reinterpret_cast<char*>(&radial.numberOfRleHalfwords_), 2);
is.read(reinterpret_cast<char*>(&radial.startAngle_), 2);