Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 04:39:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #104 from birarda/master

Browse source 
fix incorrect number of bytes per avatar
This commit is contained in:
birarda 2013-04-22 16:22:53 -07:00
commit 0670facdd7
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/avatars/src/AvatarData.h
View file

@ -13,7 +13,7 @@
#include <AgentData.h> #include <AgentData.h>
const int BYTES_PER_AVATAR = 30; const int BYTES_PER_AVATAR = 94;
class AvatarData : public AgentData { class AvatarData : public AgentData {
public: public:

11
libraries/shared/src/Agent.cpp
View file

@ -249,9 +249,14 @@ void Agent::printLog(Agent const& agent) {
sockaddr_in *agentPublicSocket = (sockaddr_in *) agent.publicSocket; sockaddr_in *agentPublicSocket = (sockaddr_in *) agent.publicSocket;
sockaddr_in *agentLocalSocket = (sockaddr_in *) agent.localSocket; sockaddr_in *agentLocalSocket = (sockaddr_in *) agent.localSocket;
::printLog("T: %s (%c) PA: %s:%d LA: %s:%d\n", agent.getTypeName(), agent.type, ::printLog("ID: %d T: %s (%c) PA: %s:%d LA: %s:%d\n",
inet_ntoa(agentPublicSocket->sin_addr), ntohs(agentPublicSocket->sin_port), agent.agentId,
inet_ntoa(agentLocalSocket->sin_addr), ntohs(agentLocalSocket->sin_port)); agent.getTypeName(),
agent.type,
inet_ntoa(agentPublicSocket->sin_addr),
ntohs(agentPublicSocket->sin_port),
inet_ntoa(agentLocalSocket->sin_addr),
ntohs(agentLocalSocket->sin_port));
} }
std::ostream& operator<<(std::ostream& os, const Agent* agent) { std::ostream& operator<<(std::ostream& os, const Agent* agent) {