pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-09 22:20:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove 'using namespaces std' fixes #61

Browse Source
This commit is contained in:
Michael Cook
2013-05-22 16:17:19 -04:00
parent 312100e1c6
commit 0fdfe025cb
190 changed files with 1801 additions and 2004 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client_process.cpp
+12 -15
View File
@@ -67,9 +67,6 @@
#include <string>
#include "QuestParserCollection.h"
using namespace std;
extern Zone* zone;
extern volatile bool ZoneLoaded;
extern WorldServer worldserver;
@@ -656,26 +653,26 @@ bool Client::Process() {
if (client_state == CLIENT_KICKED) {
Save();
OnDisconnect(true);
cout << "Client disconnected (cs=k): " << GetName() << endl;
std::cout << "Client disconnected (cs=k): " << GetName() << std::endl;
return false;
}
if (client_state == DISCONNECTED) {
OnDisconnect(true);
cout << "Client disconnected (cs=d): " << GetName() << endl;
std::cout << "Client disconnected (cs=d): " << GetName() << std::endl;
database.SetMQDetectionFlag(this->AccountName(), GetName(), "/MQInstantCamp: Possible instant camp disconnect.", zone->GetShortName());
return false;
}
if (client_state == CLIENT_ERROR) {
OnDisconnect(true);
cout << "Client disconnected (cs=e): " << GetName() << endl;
std::cout << "Client disconnected (cs=e): " << GetName() << std::endl;
return false;
}
if (client_state != CLIENT_LINKDEAD && !eqs->CheckState(ESTABLISHED)) {
OnDisconnect(true);
cout << "Client linkdead: " << name << endl;
std::cout << "Client linkdead: " << name << std::endl;
if (GetGM()) {
if (GetMerc())
@@ -879,14 +876,14 @@ void Client::BulkSendInventoryItems() {
uint32 size = 0;
uint16 i = 0;
map<uint16, string> ser_items;
map<uint16, string>::iterator itr;
std::map<uint16, std::string> ser_items;
std::map<uint16, std::string>::iterator itr;
//Inventory items
for(slot_id = 0; slot_id <= 30; slot_id++) {
const ItemInst* inst = m_inv[slot_id];
if(inst) {
string packet = inst->Serialize(slot_id);
std::string packet = inst->Serialize(slot_id);
ser_items[i++] = packet;
size += packet.length();
}
@@ -896,7 +893,7 @@ void Client::BulkSendInventoryItems() {
if(GetClientVersion() >= EQClientSoF) {
const ItemInst* inst = m_inv[9999];
if(inst) {
string packet = inst->Serialize(9999);
std::string packet = inst->Serialize(9999);
ser_items[i++] = packet;
size += packet.length();
}
@@ -906,7 +903,7 @@ void Client::BulkSendInventoryItems() {
for(slot_id = 2000; slot_id <= 2023; slot_id++) {
const ItemInst* inst = m_inv[slot_id];
if(inst) {
string packet = inst->Serialize(slot_id);
std::string packet = inst->Serialize(slot_id);
ser_items[i++] = packet;
size += packet.length();
}
@@ -916,7 +913,7 @@ void Client::BulkSendInventoryItems() {
for(slot_id = 2500; slot_id <= 2501; slot_id++) {
const ItemInst* inst = m_inv[slot_id];
if(inst) {
string packet = inst->Serialize(slot_id);
std::string packet = inst->Serialize(slot_id);
ser_items[i++] = packet;
size += packet.length();
}
@@ -1693,7 +1690,7 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app)
// languages go here
if (gmskill->skill_id > 25)
{
cout << "Wrong Training Skill (languages)" << endl;
std::cout << "Wrong Training Skill (languages)" << std::endl;
DumpPacket(app);
return;
}
@@ -1708,7 +1705,7 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app)
// normal skills go here
if (gmskill->skill_id > HIGHEST_SKILL)
{
cout << "Wrong Training Skill (abilities)" << endl;
std::cout << "Wrong Training Skill (abilities)" << std::endl;
DumpPacket(app);
return;
}