Post merge Log.Out converts and header/linker fixes

This commit is contained in:
Akkadius
2015-02-03 00:10:49 -06:00
parent dd6d1d5511
commit 3448dd1a9e
14 changed files with 67 additions and 40 deletions
+1 -1
View File
@@ -4362,7 +4362,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app)
params.push_back(std::to_string(ppu->x_pos));
params.push_back(std::to_string(ppu->y_pos));
params.push_back(std::to_string(ppu->z_pos));
params.push_back(std::to_string(heading));
params.push_back(std::to_string(m_Position.w));
params.push_back(std::to_string(GetClass()));
params.push_back(std::to_string(GetRace()));
RemoteCallSubscriptionHandler::Instance()->OnEvent("Client.Position", params);
+4 -4
View File
@@ -1233,10 +1233,10 @@ void Mob::MakeSpawnUpdateNoDelta(PlayerPositionUpdateServer_Struct *spu){
std::vector<std::string> params;
params.push_back(std::to_string((long)GetID()));
params.push_back(GetCleanName());
params.push_back(std::to_string((double)x_pos));
params.push_back(std::to_string((double)y_pos));
params.push_back(std::to_string((double)z_pos));
params.push_back(std::to_string((double)heading));
params.push_back(std::to_string((double)m_Position.x));
params.push_back(std::to_string((double)m_Position.y));
params.push_back(std::to_string((double)m_Position.z));
params.push_back(std::to_string((double)m_Position.w));
params.push_back(std::to_string((double)GetClass()));
params.push_back(std::to_string((double)GetRace()));
RemoteCallSubscriptionHandler::Instance()->OnEvent("NPC.Position", params);
+6 -7
View File
@@ -1,7 +1,6 @@
#include "../common/debug.h"
#include "../common/global_define.h"
#include "../common/emu_tcp_connection.h"
#include "../common/logsys.h"
#include "../common/logtypes.h"
#include "../common/eqemu_logsys.h"
#include "../common/md5.h"
#include "../common/packet_dump.h"
#include "../common/packet_functions.h"
@@ -184,10 +183,10 @@ void handle_rc_get_initial_entity_positions(const std::string &method, const std
res["ent_id"] = itoa(c->GetEntityID());
res["type"] = "Door";
res["name"] = c->GetDoorName();
res["x"] = itoa(c->GetX());
res["y"] = itoa(c->GetY());
res["z"] = itoa(c->GetZ());
res["h"] = itoa(c->GetHeading());
res["x"] = itoa(c->GetPosition().x);
res["y"] = itoa(c->GetPosition().y);
res["z"] = itoa(c->GetPosition().z);
res["h"] = itoa(c->GetPosition().w);
RemoteCallResponse(connection_id, request_id, res, error);
}
std::list<Object*> object_list;
+2 -3
View File
@@ -1,6 +1,5 @@
#include "../common/debug.h"
#include "../common/logsys.h"
#include "../common/logtypes.h"
#include "../common/global_define.h"
#include "../common/eqemu_logsys.h"
#include "../common/md5.h"
#include "../common/emu_tcp_connection.h"
#include "../common/packet_functions.h"