pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

High level debug (12) compile failure fix - I searched for as many as I could find with GrepWin, so there may be a few out there still

Browse Source
This commit is contained in:
Uleat
2013-10-27 03:13:10 -04:00
parent b4068823ed
commit cab77e83da
22 changed files with 67 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bonuses.cpp
+2 -1
View File
@@ -29,6 +29,7 @@
#include "QuestParserCollection.h"
#include <math.h>
#include <assert.h>
#include <iostream>
#ifndef WIN32
#include <stdlib.h>
#include "../common/unix.h"
@@ -531,7 +532,7 @@ void Client::AddItemBonuses(const ItemInst *inst, StatBonuses* newbon, bool isAu
void Client::CalcEdibleBonuses(StatBonuses* newbon) {
#if EQDEBUG >= 11
cout<<"Client::CalcEdibleBonuses(StatBonuses* newbon)"<<endl;
std::cout<<"Client::CalcEdibleBonuses(StatBonuses* newbon)"<<std::endl;
#endif
// Search player slots for skill=14(food) and skill=15(drink)
uint32 i;
zone/botspellsai.cpp
+1 -1
View File
@@ -978,7 +978,7 @@ bool Bot::AI_IdleCastCheck() {
if (AIautocastspell_timer->Check(false)) {
#if MobAI_DEBUG_Spells >= 25
cout << "Non-Engaged autocast check triggered: " << this->GetCleanName() << endl;
std::cout << "Non-Engaged autocast check triggered: " << this->GetCleanName() << std::endl; // cout undefine [CODEBUG]
#endif
AIautocastspell_timer->Disable(); //prevent the timer from going off AGAIN while we are casting.
zone/client.cpp
+2 -2
View File
@@ -721,7 +721,7 @@ void Client::QueuePacket(const EQApplicationPacket* app, bool ack_req, CLIENT_CO
void Client::FastQueuePacket(EQApplicationPacket** app, bool ack_req, CLIENT_CONN_STATUS required_state) {
//cout << "Sending: 0x" << hex << setw(4) << setfill('0') << (*app)->GetOpcode() << dec << ", size=" << (*app)->size << endl;
//std::cout << "Sending: 0x" << std::hex << std::setw(4) << std::setfill('0') << (*app)->GetOpcode() << std::dec << ", size=" << (*app)->size << std::endl;
// if the program doesnt care about the status or if the status isnt what we requested
if (required_state != CLIENT_CONNECTINGALL && client_state != required_state) {
@@ -1745,7 +1745,7 @@ void Client::SendManaUpdatePacket() {
SendEnduranceUpdate();
}
//cout << "Sending mana update: " << (cur_mana - last_reported_mana) << endl;
//std::cout << "Sending mana update: " << (cur_mana - last_reported_mana) << std::endl;
if (last_reported_mana != cur_mana || last_reported_endur != cur_end) {
zone/client_packet.cpp
+4 -4
View File
@@ -414,14 +414,14 @@ int Client::HandlePacket(const EQApplicationPacket *app)
}
#if EQDEBUG >= 9
std::cout << "Received 0x" << hex << setw(4) << setfill('0') << opcode << ", size=" << dec << app->size << std::endl;
std::cout << "Received 0x" << std::hex << std::setw(4) << std::setfill('0') << opcode << ", size=" << std::dec << app->size << std::endl;
#endif
#ifdef SOLAR
if(0 && opcode != OP_ClientUpdate)
{
LogFile->write(EQEMuLog::Debug,"HandlePacket() OPCODE debug enabled client %s", GetName());
std::cerr << "OPCODE: " << hex << setw(4) << setfill('0') << opcode << dec << ", size: " << app->size << std::endl;
std::cerr << "OPCODE: " << std::hex << std::setw(4) << std::setfill('0') << opcode << std::dec << ", size: " << app->size << std::endl;
DumpPacket(app);
}
#endif
@@ -2973,7 +2973,7 @@ void Client::Handle_OP_SpawnAppearance(const EQApplicationPacket *app)
/*
else if (sa->parameter == 0x05) {
// Illusion
cout << "Illusion packet recv'd:" << endl;
std::cout << "Illusion packet recv'd:" << std::endl;
DumpPacket(app);
}
*/
@@ -8708,7 +8708,7 @@ bool Client::FinishConnState2(DBAsyncWork* dbaw) {
//uint32 aalen = database.GetPlayerAlternateAdv(account_id, name, &aa);
//if (aalen == 0) {
// cout << "Client dropped: !GetPlayerAlternateAdv, name=" << name << endl;
// std::cout << "Client dropped: !GetPlayerAlternateAdv, name=" << name << std::endl;
// return false;
//}
zone/entity.cpp
+3 -3
View File
@@ -130,7 +130,7 @@ Trap* Entity::CastToTrap()
#ifdef DEBUG
if(!IsTrap())
{
//cout << "CastToTrap error" << endl;
//std::cout << "CastToTrap error" << std::endl;
return 0;
}
#endif
@@ -161,7 +161,7 @@ Object* Entity::CastToObject() {
/*Group* Entity::CastToGroup() {
#ifdef _EQDEBUG
if(!IsGroup()) {
cout << "CastToGroup error" << endl;
std::cout << "CastToGroup error" << std::endl;
DebugBreak();
return 0;
}
@@ -230,7 +230,7 @@ const Trap* Entity::CastToTrap() const {
#ifdef DEBUG
if(!IsTrap())
{
//cout << "CastToTrap error" << endl;
//std::cout << "CastToTrap error" << std::endl;
return 0;
}
#endif
zone/maxskill.h
+8 -6
View File
@@ -1,3 +1,5 @@
// This file needs more than just 'std' updates
uint16 Mob::MaxSkill_weapon(uint16 skillid, uint16 class_, uint16 level) const{
if (skillid > HIGHEST_SKILL)
return 0;
@@ -273,7 +275,7 @@ uint16 Mob::MaxSkill_weapon(uint16 skillid, uint16 class_, uint16 level) const{
}
default:
#if EQDEBUG
cout<<"MaxSkill_Weapon() Unknown class: "<<class_<<endl;
std::cout<<"MaxSkill_Weapon() Unknown class: "<<class_<<std::endl;
#endif
break;
}
@@ -281,7 +283,7 @@ uint16 Mob::MaxSkill_weapon(uint16 skillid, uint16 class_, uint16 level) const{
}
default:
#if EQDEBUG
cout<<"Unknown weapon skill: "<<skillid<<endl;
std::cout<<"Unknown weapon skill: "<<skillid<<std::endl;
#endif
break;
}// Switch skill
@@ -812,7 +814,7 @@ uint16 Mob::MaxSkill_offensive(uint16 skillid, uint16 class_, uint16 level) cons
////////////////////////////////////////////////////////
default:
#if EQDEBUG >= 1
cout<<"Unknown Offensive skill: "<<skillid<<endl;
std::cout<<"Unknown Offensive skill: "<<skillid<<std::endl;
#endif
break;
}// Switch skill
@@ -1351,7 +1353,7 @@ uint16 Mob::MaxSkill_defensive(uint16 skillid, uint16 class_, uint16 level) cons
default:
#if EQDEBUG
cout<<"Unknown Defensive skill: "<<skillid<<endl;
std::cout<<"Unknown Defensive skill: "<<skillid<<std::endl;
#endif
break;
}// Switch skill
@@ -1613,7 +1615,7 @@ uint16 Mob::MaxSkill_arcane(uint16 skillid, uint16 class_, uint16 level) const{
////////////////////////////////////////////////////////
default:
#if EQDEBUG
cout<<"Unknown arcane skill: "<<skillid<<endl;
std::cout<<"Unknown arcane skill: "<<skillid<<std::endl;
#endif
break;
}// Switch skill
@@ -2069,7 +2071,7 @@ uint16 Mob::MaxSkill_class(uint16 skillid, uint16 class_, uint16 level) const{
////////////////////////////////////////////////////////
default:
#if EQDEBUG
cout<<"Unknown class skill: "<<skillid<<endl;
std::cout<<"Unknown class skill: "<<skillid<<std::endl;
#endif
break;
}// Switch skill
zone/mob.cpp
+2 -2
View File
@@ -1546,7 +1546,7 @@ void Mob::SendIllusionPacket(uint16 in_race, uint8 in_gender, uint8 in_texture,
}
uint8 Mob::GetDefaultGender(uint16 in_race, uint8 in_gender) {
//cout << "Gender in: " << (int)in_gender << endl;
//std::cout << "Gender in: " << (int)in_gender << std::endl; // undefined cout [CODEBUG]
if ((in_race > 0 && in_race <= GNOME )
|| in_race == IKSAR || in_race == VAHSHIR || in_race == FROGLOK || in_race == DRAKKIN
|| in_race == 15 || in_race == 50 || in_race == 57 || in_race == 70 || in_race == 98 || in_race == 118) {
@@ -2775,7 +2775,7 @@ int16 Mob::GetResist(uint8 type) const
uint32 Mob::GetLevelHP(uint8 tlevel)
{
//cout<<"Tlevel: "<<(int)tlevel<<endl;
//std::cout<<"Tlevel: "<<(int)tlevel<<std::endl; // cout undefined [CODEBUG]
int multiplier = 0;
if (tlevel < 10)
{
zone/npc.cpp
+1 -1
View File
@@ -444,7 +444,7 @@ void NPC::RemoveItem(uint32 item_id, uint16 quantity, uint16 slot) {
return;
}
else if (item->item_id == item_id && item->equipSlot == slot && quantity >= 1) {
//cout<<"NPC::RemoveItem"<<" equipSlot:"<<iterator.GetData()->equipSlot<<" quantity:"<< quantity<<endl;
//std::cout<<"NPC::RemoveItem"<<" equipSlot:"<<iterator.GetData()->equipSlot<<" quantity:"<< quantity<<std::endl; // iterator undefined [CODEBUG]
if (item->charges <= quantity)
itemlist.erase(cur);
else
zone/zonedbasync.cpp
+3 -3
View File
@@ -21,11 +21,11 @@ void DispatchFinishedDBAsync(DBAsyncWork* dbaw) {
if (dbaq->GetAnswer(errbuf, result))
database.LoadVariables_result(result);
else
cout << "Async DB.LoadVariables() failed: '" << errbuf << "'" << endl;
std::cout << "Async DB.LoadVariables() failed: '" << errbuf << "'" << std::endl;
break;
}
default: {
cout << "Error: DispatchFinishedDBAsync(): Unknown workpt.b4" << endl;
std::cout << "Error: DispatchFinishedDBAsync(): Unknown workpt.b4" << std::endl;
break;
}
}
@@ -119,7 +119,7 @@ bool DBAsyncCB_CharacterBackup(DBAsyncWork* iWork) { // return true means delete
}
}
else {
// cout << "Error in DBAsyncCB_CharacterBackup query1 '" << query << "' " << errbuf << endl;
// std::cout << "Error in DBAsyncCB_CharacterBackup query1 '" << query << "' " << errbuf << std::endl;
safe_delete_array(query);
return true;
}