weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

More work on client conversion to binary data

Browse Source
This commit is contained in:
Pax1601
2023-06-23 17:32:38 +02:00
parent 916752301a
commit dd2e858db4
15 changed files with 597 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/include/unit.h
View File

@@ -59,7 +59,7 @@ namespace Options {
namespace DataTypes {
struct Ammo {
unsigned short quantity = 0;
string name;
char name[32];
unsigned char guidance = 0;
unsigned char category = 0;
unsigned char missileCategory = 0;
@@ -88,6 +88,8 @@ namespace DataTypes {
Options::TACAN TACAN;
Options::Radio Radio;
unsigned short pathLength;
unsigned short ammoLength;
unsigned short contactsLength;
unsigned char nameLength;
unsigned char unitNameLength;
unsigned char groupNameLength;

20
src/core/src/unit.cpp
View File

@@ -180,8 +180,13 @@ unsigned int Unit::getUpdateData(char* &data)
/* Reserve data for:
1) DataPacket;
2) Active path;
3) Ammo vector;
4) Contacts vector;
*/
data = (char*)malloc(sizeof(DataTypes::DataPacket) + activePath.size() * sizeof(Coords));
data = (char*)malloc(sizeof(DataTypes::DataPacket) +
activePath.size() * sizeof(Coords) +
ammo.size() * sizeof(Coords) +
contacts.size() * sizeof(Coords));
unsigned int offset = 0;
/* Prepare the data packet and copy it to memory */
@@ -221,6 +226,8 @@ unsigned int Unit::getUpdateData(char* &data)
TACAN,
radio,
activePath.size(),
ammo.size(),
contacts.size(),
name.size(),
unitName.size(),
groupName.size(),
@@ -231,14 +238,21 @@ unsigned int Unit::getUpdateData(char* &data)
memcpy(data + offset, &dataPacket, sizeof(dataPacket));
offset += sizeof(dataPacket);
/* Prepare the path memory and copy it to memory */
/* Prepare the path vector and copy it to memory */
std::vector<Coords> path;
for (const Coords& c : activePath)
path.push_back(c);
memcpy(data + offset, &path, activePath.size() * sizeof(Coords));
offset += activePath.size() * sizeof(Coords);
/* Copy the ammo vector to memory */
memcpy(data + offset, &ammo, ammo.size() * sizeof(DataTypes::Ammo));
offset += ammo.size() * sizeof(DataTypes::Ammo);
/* Copy the contacts vector to memory */
memcpy(data + offset, &contacts, contacts.size() * sizeof(DataTypes::Contact));
offset += contacts.size() * sizeof(DataTypes::Contact);
return offset;
}