Began reworking the network code
This commit devides SerialPacket into a series of different structures, all decended from a common base class. Using a union was not a good idea.
This commit is contained in:
@@ -103,8 +103,8 @@ void serializeCombat(SerialPacket* packet, char* buffer) {
|
||||
SERIALIZE(buffer, &packet->combatInfo.terrainType, sizeof(CombatData::Terrain));
|
||||
|
||||
//arrays
|
||||
SERIALIZE(buffer, &packet->combatInfo.characterArray, COMBAT_MAX_CHARACTER_COUNT);
|
||||
SERIALIZE(buffer, &packet->combatInfo.enemyArray, COMBAT_MAX_ENEMY_COUNT);
|
||||
SERIALIZE(buffer, &packet->combatInfo.characterArray, COMBAT_MAX_CHARACTERS);
|
||||
SERIALIZE(buffer, &packet->combatInfo.enemyArray, COMBAT_MAX_ENEMIES);
|
||||
|
||||
//position
|
||||
SERIALIZE(buffer, &packet->combatInfo.mapIndex, sizeof(int));
|
||||
@@ -247,8 +247,8 @@ void deserializeCombat(SerialPacket* packet, char* buffer) {
|
||||
DESERIALIZE(buffer, &packet->combatInfo.terrainType, sizeof(CombatData::Terrain));
|
||||
|
||||
//arrays
|
||||
DESERIALIZE(buffer, &packet->combatInfo.characterArray, COMBAT_MAX_CHARACTER_COUNT);
|
||||
DESERIALIZE(buffer, &packet->combatInfo.enemyArray, COMBAT_MAX_ENEMY_COUNT);
|
||||
DESERIALIZE(buffer, &packet->combatInfo.characterArray, COMBAT_MAX_CHARACTERS);
|
||||
DESERIALIZE(buffer, &packet->combatInfo.enemyArray, COMBAT_MAX_ENEMIES);
|
||||
|
||||
//position
|
||||
DESERIALIZE(buffer, &packet->combatInfo.mapIndex, sizeof(int));
|
||||
|
||||
Reference in New Issue
Block a user