Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed BBox, renamed position to origin

Browse Source 
I've replaced the BBox class with a pair of inline functions in
check_bounds.hpp. I've also renamed the 'position' variable to 'origin' in
several locations.

These changes are mostly to alleviate ambiguity.
This commit is contained in:
Kayne Ruse
2014-06-02 21:05:49 +10:00
parent d2f03b98dc
commit fb6fba9564
14 changed files with 107 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/network/serial.cpp
+8 -8
View File
@@ -108,8 +108,8 @@ void serializeCombat(SerialPacket* packet, char* buffer) {
//position
SERIALIZE(buffer, &packet->combatInfo.mapIndex, sizeof(int));
SERIALIZE(buffer, &packet->combatInfo.position.x, sizeof(double));
SERIALIZE(buffer, &packet->combatInfo.position.y, sizeof(double));
SERIALIZE(buffer, &packet->combatInfo.origin.x, sizeof(double));
SERIALIZE(buffer, &packet->combatInfo.origin.y, sizeof(double));
//TODO: rewards
}
@@ -147,8 +147,8 @@ void serializeCharacter(SerialPacket* packet, char* buffer) {
SERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
//vectors
SERIALIZE(buffer, &packet->characterInfo.position.x, sizeof(double));
SERIALIZE(buffer, &packet->characterInfo.position.y, sizeof(double));
SERIALIZE(buffer, &packet->characterInfo.origin.x, sizeof(double));
SERIALIZE(buffer, &packet->characterInfo.origin.y, sizeof(double));
SERIALIZE(buffer, &packet->characterInfo.motion.x, sizeof(double));
SERIALIZE(buffer, &packet->characterInfo.motion.y, sizeof(double));
@@ -252,8 +252,8 @@ void deserializeCombat(SerialPacket* packet, char* buffer) {
//position
DESERIALIZE(buffer, &packet->combatInfo.mapIndex, sizeof(int));
DESERIALIZE(buffer, &packet->combatInfo.position.x, sizeof(double));
DESERIALIZE(buffer, &packet->combatInfo.position.y, sizeof(double));
DESERIALIZE(buffer, &packet->combatInfo.origin.x, sizeof(double));
DESERIALIZE(buffer, &packet->combatInfo.origin.y, sizeof(double));
//TODO: rewards
}
@@ -292,8 +292,8 @@ void deserializeCharacter(SerialPacket* packet, char* buffer) {
DESERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
//vectors
DESERIALIZE(buffer, &packet->characterInfo.position.x, sizeof(double));
DESERIALIZE(buffer, &packet->characterInfo.position.y, sizeof(double));
DESERIALIZE(buffer, &packet->characterInfo.origin.x, sizeof(double));
DESERIALIZE(buffer, &packet->characterInfo.origin.y, sizeof(double));
DESERIALIZE(buffer, &packet->characterInfo.motion.x, sizeof(double));
DESERIALIZE(buffer, &packet->characterInfo.motion.y, sizeof(double));
common/network/serial_packet.hpp
+2 -2
View File
@@ -150,7 +150,7 @@ union SerialPacket {
int characterArray[COMBAT_MAX_CHARACTER_COUNT];
int enemyArray[COMBAT_MAX_ENEMY_COUNT];
int mapIndex;
Vector2 position;
Vector2 origin;
//TODO: rewards
}combatInfo;
@@ -163,7 +163,7 @@ union SerialPacket {
char handle[PACKET_STRING_SIZE];
char avatar[PACKET_STRING_SIZE];
int mapIndex;
Vector2 position;
Vector2 origin;
Vector2 motion;
Statistics stats;
}characterInfo;