pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-15 17:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pass through zone code to fix uninitialized pointer declarations

Browse Source
This commit is contained in:
Uleat 2017-03-23 04:35:36 -04:00
parent 8bdefa17b5
commit f77f996c3f
16 changed files with 114 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zone/aggro.cpp
View File

@ -550,8 +550,8 @@ faster, but I'm doing it this way to make it readable and easy to modify
bool Mob::IsAttackAllowed(Mob *target, bool isSpellAttack) bool Mob::IsAttackAllowed(Mob *target, bool isSpellAttack)
{ {
Mob *mob1, *mob2, *tempmob; Mob *mob1 = nullptr, *mob2 = nullptr, *tempmob = nullptr;
Client *c1, *c2, *becomenpc; Client *c1 = nullptr, *c2 = nullptr, *becomenpc = nullptr;
// NPC *npc1, *npc2; // NPC *npc1, *npc2;
int reverse; int reverse;
@ -767,8 +767,8 @@ type', in which case, the answer is yes.
// also goes for their pets // also goes for their pets
bool Mob::IsBeneficialAllowed(Mob *target) bool Mob::IsBeneficialAllowed(Mob *target)
{ {
Mob *mob1, *mob2, *tempmob; Mob *mob1 = nullptr, *mob2 = nullptr, *tempmob = nullptr;
Client *c1, *c2; Client *c1 = nullptr, *c2 = nullptr;
int reverse; int reverse;
if(!target) if(!target)

2
zone/attack.cpp
View File

@ -1268,7 +1268,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b
if (GetFeigned()) if (GetFeigned())
return false; // Rogean: How can you attack while feigned? Moved up from Aggro Code. return false; // Rogean: How can you attack while feigned? Moved up from Aggro Code.
EQEmu::ItemInstance* weapon; EQEmu::ItemInstance* weapon = nullptr;
if (Hand == EQEmu::inventory::slotSecondary){ // Kaiyodo - Pick weapon from the attacking hand if (Hand == EQEmu::inventory::slotSecondary){ // Kaiyodo - Pick weapon from the attacking hand
weapon = GetInv().GetItem(EQEmu::inventory::slotSecondary); weapon = GetInv().GetItem(EQEmu::inventory::slotSecondary);
OffHandAtk(true); OffHandAtk(true);

52
zone/bot.cpp
View File

@ -1896,12 +1896,12 @@ void Bot::BotRangedAttack(Mob* other) {
} }
EQEmu::ItemInstance* rangedItem = GetBotItem(EQEmu::inventory::slotRange); EQEmu::ItemInstance* rangedItem = GetBotItem(EQEmu::inventory::slotRange);
const EQEmu::ItemData* RangeWeapon = 0; const EQEmu::ItemData* RangeWeapon = nullptr;
if(rangedItem) if(rangedItem)
RangeWeapon = rangedItem->GetItem(); RangeWeapon = rangedItem->GetItem();
EQEmu::ItemInstance* ammoItem = GetBotItem(EQEmu::inventory::slotAmmo); EQEmu::ItemInstance* ammoItem = GetBotItem(EQEmu::inventory::slotAmmo);
const EQEmu::ItemData* Ammo = 0; const EQEmu::ItemData* Ammo = nullptr;
if(ammoItem) if(ammoItem)
Ammo = ammoItem->GetItem(); Ammo = ammoItem->GetItem();
@ -2008,7 +2008,7 @@ void Bot::ApplySpecialAttackMod(EQEmu::skills::SkillType skill, int32 &dmg, int3
if (item_slot >= EQEmu::legacy::EQUIPMENT_BEGIN){ if (item_slot >= EQEmu::legacy::EQUIPMENT_BEGIN){
const EQEmu::ItemInstance* inst = GetBotItem(item_slot); const EQEmu::ItemInstance* inst = GetBotItem(item_slot);
const EQEmu::ItemData* botweapon = 0; const EQEmu::ItemData* botweapon = nullptr;
if(inst) if(inst)
botweapon = inst->GetItem(); botweapon = inst->GetItem();
@ -2456,7 +2456,7 @@ void Bot::AI_Process() {
//now off hand //now off hand
if(GetTarget() && attack_dw_timer.Check() && CanThisClassDualWield()) { if(GetTarget() && attack_dw_timer.Check() && CanThisClassDualWield()) {
const EQEmu::ItemInstance* instweapon = GetBotItem(EQEmu::inventory::slotSecondary); const EQEmu::ItemInstance* instweapon = GetBotItem(EQEmu::inventory::slotSecondary);
const EQEmu::ItemData* weapon = 0; const EQEmu::ItemData* weapon = nullptr;
//can only dual wield without a weapon if you're a monk //can only dual wield without a weapon if you're a monk
if(instweapon || (botClass == MONK)) { if(instweapon || (botClass == MONK)) {
if(instweapon) if(instweapon)
@ -2928,8 +2928,8 @@ void Bot::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) {
ns->spawn.light = m_Light.Type[EQEmu::lightsource::LightActive]; ns->spawn.light = m_Light.Type[EQEmu::lightsource::LightActive];
ns->spawn.helm = helmtexture; //(GetShowHelm() ? helmtexture : 0); //0xFF; ns->spawn.helm = helmtexture; //(GetShowHelm() ? helmtexture : 0); //0xFF;
ns->spawn.equip_chest2 = texture; //0xFF; ns->spawn.equip_chest2 = texture; //0xFF;
const EQEmu::ItemData* item = 0; const EQEmu::ItemData* item = nullptr;
const EQEmu::ItemInstance* inst = 0; const EQEmu::ItemInstance* inst = nullptr;
uint32 spawnedbotid = 0; uint32 spawnedbotid = 0;
spawnedbotid = this->GetBotID(); spawnedbotid = this->GetBotID();
for (int i = EQEmu::textures::textureBegin; i < EQEmu::textures::weaponPrimary; i++) { for (int i = EQEmu::textures::textureBegin; i < EQEmu::textures::weaponPrimary; i++) {
@ -4357,9 +4357,9 @@ int32 Bot::GetBotFocusEffect(BotfocusType bottype, uint16 spell_id) {
//Check if item focus effect exists for the client. //Check if item focus effect exists for the client.
if (itembonuses.FocusEffects[bottype]) { if (itembonuses.FocusEffects[bottype]) {
const EQEmu::ItemData* TempItem = 0; const EQEmu::ItemData* TempItem = nullptr;
const EQEmu::ItemData* UsedItem = 0; const EQEmu::ItemData* UsedItem = nullptr;
const EQEmu::ItemInstance* TempInst = 0; const EQEmu::ItemInstance* TempInst = nullptr;
uint16 UsedFocusID = 0; uint16 UsedFocusID = 0;
int32 Total = 0; int32 Total = 0;
int32 focus_max = 0; int32 focus_max = 0;
@ -5031,7 +5031,7 @@ void Bot::DoSpecialAttackDamage(Mob *who, EQEmu::skills::SkillType skill, int32
if (skill == EQEmu::skills::SkillBash) { if (skill == EQEmu::skills::SkillBash) {
const EQEmu::ItemInstance* inst = GetBotItem(EQEmu::inventory::slotSecondary); const EQEmu::ItemInstance* inst = GetBotItem(EQEmu::inventory::slotSecondary);
const EQEmu::ItemData* botweapon = 0; const EQEmu::ItemData* botweapon = nullptr;
if(inst) if(inst)
botweapon = inst->GetItem(); botweapon = inst->GetItem();
@ -5372,7 +5372,7 @@ FACTION_VALUE Bot::GetReverseFactionCon(Mob* iOther) {
} }
Mob* Bot::GetOwnerOrSelf() { Mob* Bot::GetOwnerOrSelf() {
Mob* Result = 0; Mob* Result = nullptr;
if(this->GetBotOwner()) if(this->GetBotOwner())
Result = GetBotOwner(); Result = GetBotOwner();
else else
@ -5382,7 +5382,7 @@ Mob* Bot::GetOwnerOrSelf() {
} }
Mob* Bot::GetOwner() { Mob* Bot::GetOwner() {
Mob* Result = 0; Mob* Result = nullptr;
Result = GetBotOwner(); Result = GetBotOwner();
if(!Result) if(!Result)
this->SetBotOwner(0); this->SetBotOwner(0);
@ -5438,8 +5438,8 @@ bool Bot::IsBotAttackAllowed(Mob* attacker, Mob* target, bool& hasRuleDefined) {
void Bot::EquipBot(std::string* errorMessage) { void Bot::EquipBot(std::string* errorMessage) {
GetBotItems(m_inv, errorMessage); GetBotItems(m_inv, errorMessage);
const EQEmu::ItemInstance* inst = 0; const EQEmu::ItemInstance* inst = nullptr;
const EQEmu::ItemData* item = 0; const EQEmu::ItemData* item = nullptr;
for (int i = EQEmu::legacy::EQUIPMENT_BEGIN; i <= EQEmu::legacy::EQUIPMENT_END; ++i) { for (int i = EQEmu::legacy::EQUIPMENT_BEGIN; i <= EQEmu::legacy::EQUIPMENT_END; ++i) {
inst = GetBotItem(i); inst = GetBotItem(i);
if(inst) { if(inst) {
@ -7235,7 +7235,7 @@ bool Bot::CanHeal() {
} }
Bot* Bot::GetBotByBotClientOwnerAndBotName(Client* c, std::string botName) { Bot* Bot::GetBotByBotClientOwnerAndBotName(Client* c, std::string botName) {
Bot* Result = 0; Bot* Result = nullptr;
if(c) { if(c) {
std::list<Bot*> BotList = entity_list.GetBotsByBotOwnerCharacterID(c->CharacterID()); std::list<Bot*> BotList = entity_list.GetBotsByBotOwnerCharacterID(c->CharacterID());
if(!BotList.empty()) { if(!BotList.empty()) {
@ -7275,7 +7275,7 @@ void Bot::ProcessBotGroupInvite(Client* c, std::string botName) {
// Processes a group disband request from a Client for a Bot. // Processes a group disband request from a Client for a Bot.
void Bot::ProcessBotGroupDisband(Client* c, std::string botName) { void Bot::ProcessBotGroupDisband(Client* c, std::string botName) {
if(c) { if(c) {
Bot* tempBot = 0; Bot* tempBot = nullptr;
if(botName.empty()) if(botName.empty())
tempBot = GetFirstBotInGroup(c->GetGroup()); tempBot = GetFirstBotInGroup(c->GetGroup());
@ -7318,7 +7318,7 @@ void Bot::ProcessClientZoneChange(Client* botOwner) {
// Finds and returns the first Bot object found in specified group // Finds and returns the first Bot object found in specified group
Bot* Bot::GetFirstBotInGroup(Group* group) { Bot* Bot::GetFirstBotInGroup(Group* group) {
Bot* Result = 0; Bot* Result = nullptr;
if(group) { if(group) {
for(int Counter = 0; Counter < MAX_GROUP_MEMBERS; Counter++) { for(int Counter = 0; Counter < MAX_GROUP_MEMBERS; Counter++) {
@ -7344,8 +7344,8 @@ void Bot::ProcessBotInspectionRequest(Bot* inspectedBot, Client* client) {
insr->TargetID = inspectedBot->GetNPCTypeID(); insr->TargetID = inspectedBot->GetNPCTypeID();
insr->playerid = inspectedBot->GetID(); insr->playerid = inspectedBot->GetID();
const EQEmu::ItemData* item = 0; const EQEmu::ItemData* item = nullptr;
const EQEmu::ItemInstance* inst = 0; const EQEmu::ItemInstance* inst = nullptr;
// Modded to display power source items (will only show up on SoF+ client inspect windows though.) // Modded to display power source items (will only show up on SoF+ client inspect windows though.)
// I don't think bots are currently coded to use them..but, you'll have to use '#bot inventory list' // I don't think bots are currently coded to use them..but, you'll have to use '#bot inventory list'
@ -7396,7 +7396,7 @@ void Bot::ProcessBotInspectionRequest(Bot* inspectedBot, Client* client) {
void Bot::CalcItemBonuses(StatBonuses* newbon) void Bot::CalcItemBonuses(StatBonuses* newbon)
{ {
const EQEmu::ItemData* itemtmp = 0; const EQEmu::ItemData* itemtmp = nullptr;
for (int i = EQEmu::legacy::EQUIPMENT_BEGIN; i <= (EQEmu::legacy::EQUIPMENT_END + 1); ++i) { for (int i = EQEmu::legacy::EQUIPMENT_BEGIN; i <= (EQEmu::legacy::EQUIPMENT_END + 1); ++i) {
const EQEmu::ItemInstance* item = GetBotItem((i == 22 ? 9999 : i)); const EQEmu::ItemInstance* item = GetBotItem((i == 22 ? 9999 : i));
@ -7989,7 +7989,7 @@ bool EntityList::Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, fl
Mob* EntityList::GetMobByBotID(uint32 botID) { Mob* EntityList::GetMobByBotID(uint32 botID) {
Mob* Result = 0; Mob* Result = nullptr;
if(botID > 0) { if(botID > 0) {
auto it = mob_list.begin(); auto it = mob_list.begin();
for (auto it = mob_list.begin(); it != mob_list.end(); ++it) { for (auto it = mob_list.begin(); it != mob_list.end(); ++it) {
@ -8006,7 +8006,7 @@ Mob* EntityList::GetMobByBotID(uint32 botID) {
} }
Bot* EntityList::GetBotByBotID(uint32 botID) { Bot* EntityList::GetBotByBotID(uint32 botID) {
Bot* Result = 0; Bot* Result = nullptr;
if(botID > 0) { if(botID > 0) {
for(std::list<Bot*>::iterator botListItr = bot_list.begin(); botListItr != bot_list.end(); ++botListItr) { for(std::list<Bot*>::iterator botListItr = bot_list.begin(); botListItr != bot_list.end(); ++botListItr) {
Bot* tempBot = *botListItr; Bot* tempBot = *botListItr;
@ -8020,7 +8020,7 @@ Bot* EntityList::GetBotByBotID(uint32 botID) {
} }
Bot* EntityList::GetBotByBotName(std::string botName) { Bot* EntityList::GetBotByBotName(std::string botName) {
Bot* Result = 0; Bot* Result = nullptr;
if(!botName.empty()) { if(!botName.empty()) {
for(std::list<Bot*>::iterator botListItr = bot_list.begin(); botListItr != bot_list.end(); ++botListItr) { for(std::list<Bot*>::iterator botListItr = bot_list.begin(); botListItr != bot_list.end(); ++botListItr) {
Bot* tempBot = *botListItr; Bot* tempBot = *botListItr;
@ -8197,7 +8197,7 @@ void EntityList::ShowSpawnWindow(Client* client, int Distance, bool NamedOnly) {
uint8 Bot::GetNumberNeedingHealedInGroup(uint8 hpr, bool includePets) { uint8 Bot::GetNumberNeedingHealedInGroup(uint8 hpr, bool includePets) {
uint8 needHealed = 0; uint8 needHealed = 0;
Group *g; Group *g = nullptr;
if(this->HasGroup()) { if(this->HasGroup()) {
g = this->GetGroup(); g = this->GetGroup();
if(g) { if(g) {
@ -8237,8 +8237,8 @@ int Bot::GetRawACNoShield(int &shield_ac) {
} }
uint32 Bot::CalcCurrentWeight() { uint32 Bot::CalcCurrentWeight() {
const EQEmu::ItemData* TempItem = 0; const EQEmu::ItemData* TempItem = nullptr;
EQEmu::ItemInstance* inst; EQEmu::ItemInstance* inst = nullptr;
uint32 Total = 0; uint32 Total = 0;
for (int i = EQEmu::legacy::EQUIPMENT_BEGIN; i <= EQEmu::legacy::EQUIPMENT_END; ++i) { for (int i = EQEmu::legacy::EQUIPMENT_BEGIN; i <= EQEmu::legacy::EQUIPMENT_END; ++i) {
inst = GetBotItem(i); inst = GetBotItem(i);

20
zone/client.cpp
View File

@ -717,7 +717,7 @@ bool Client::AddPacket(EQApplicationPacket** pApp, bool bAckreq) {
c->ack_req = bAckreq; c->ack_req = bAckreq;
c->app = *pApp; c->app = *pApp;
*pApp = 0; *pApp = nullptr;
clientpackets.Append(c); clientpackets.Append(c);
return true; return true;
@ -726,7 +726,7 @@ bool Client::AddPacket(EQApplicationPacket** pApp, bool bAckreq) {
bool Client::SendAllPackets() { bool Client::SendAllPackets() {
LinkedListIterator<CLIENTPACKET*> iterator(clientpackets); LinkedListIterator<CLIENTPACKET*> iterator(clientpackets);
CLIENTPACKET* cp = 0; CLIENTPACKET* cp = nullptr;
iterator.Reset(); iterator.Reset();
while(iterator.MoreElements()) { while(iterator.MoreElements()) {
cp = iterator.GetData(); cp = iterator.GetData();
@ -772,7 +772,7 @@ void Client::FastQueuePacket(EQApplicationPacket** app, bool ack_req, CLIENT_CON
eqs->FastQueuePacket((EQApplicationPacket **)app, ack_req); eqs->FastQueuePacket((EQApplicationPacket **)app, ack_req);
else if (app && (*app)) else if (app && (*app))
delete *app; delete *app;
*app = 0; *app = nullptr;
} }
return; return;
} }
@ -2038,7 +2038,7 @@ void Client::ReadBook(BookRequest_Struct *book) {
read_from_slot = book->invslot -1; read_from_slot = book->invslot -1;
} }
const EQEmu::ItemInstance *inst = 0; const EQEmu::ItemInstance *inst = nullptr;
if (read_from_slot <= EQEmu::legacy::SLOT_PERSONAL_BAGS_END) if (read_from_slot <= EQEmu::legacy::SLOT_PERSONAL_BAGS_END)
{ {
@ -4046,7 +4046,7 @@ bool Client::KeyRingCheck(uint32 item_id)
void Client::KeyRingList() void Client::KeyRingList()
{ {
Message(4,"Keys on Keyring:"); Message(4,"Keys on Keyring:");
const EQEmu::ItemData *item = 0; const EQEmu::ItemData *item = nullptr;
for (auto iter = keyring.begin(); iter != keyring.end(); ++iter) { for (auto iter = keyring.begin(); iter != keyring.end(); ++iter) {
if ((item = database.GetItem(*iter))!=nullptr) { if ((item = database.GetItem(*iter))!=nullptr) {
Message(4,item->Name); Message(4,item->Name);
@ -4659,7 +4659,7 @@ void Client::SendRespawnBinds()
uint32 PacketLength = 17 + (26 * num_options); //Header size + per-option invariant size uint32 PacketLength = 17 + (26 * num_options); //Header size + per-option invariant size
std::list<RespawnOption>::iterator itr; std::list<RespawnOption>::iterator itr;
RespawnOption* opt; RespawnOption* opt = nullptr;
//Find string size for each option //Find string size for each option
for (itr = respawn_options.begin(); itr != respawn_options.end(); ++itr) for (itr = respawn_options.begin(); itr != respawn_options.end(); ++itr)
@ -8385,7 +8385,7 @@ bool Client::RemoveRespawnOption(std::string option_name)
if (IsHoveringForRespawn() || respawn_options.empty()) { return false; } if (IsHoveringForRespawn() || respawn_options.empty()) { return false; }
bool had = false; bool had = false;
RespawnOption* opt; RespawnOption* opt = nullptr;
std::list<RespawnOption>::iterator itr; std::list<RespawnOption>::iterator itr;
for (itr = respawn_options.begin(); itr != respawn_options.end(); ++itr) for (itr = respawn_options.begin(); itr != respawn_options.end(); ++itr)
{ {
@ -8432,7 +8432,7 @@ bool Client::RemoveRespawnOption(uint8 position)
void Client::SetHunger(int32 in_hunger) void Client::SetHunger(int32 in_hunger)
{ {
EQApplicationPacket *outapp; EQApplicationPacket *outapp = nullptr;
outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct)); outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct));
Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer; Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer;
sta->food = in_hunger; sta->food = in_hunger;
@ -8446,7 +8446,7 @@ void Client::SetHunger(int32 in_hunger)
void Client::SetThirst(int32 in_thirst) void Client::SetThirst(int32 in_thirst)
{ {
EQApplicationPacket *outapp; EQApplicationPacket *outapp = nullptr;
outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct)); outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct));
Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer; Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer;
sta->food = m_pp.hunger_level > 6000 ? 6000 : m_pp.hunger_level; sta->food = m_pp.hunger_level > 6000 ? 6000 : m_pp.hunger_level;
@ -8460,7 +8460,7 @@ void Client::SetThirst(int32 in_thirst)
void Client::SetConsumption(int32 in_hunger, int32 in_thirst) void Client::SetConsumption(int32 in_hunger, int32 in_thirst)
{ {
EQApplicationPacket *outapp; EQApplicationPacket *outapp = nullptr;
outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct)); outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct));
Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer; Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer;
sta->food = in_hunger; sta->food = in_hunger;

4
zone/client_mods.cpp
View File

@ -1211,8 +1211,8 @@ int32 Client::CalcManaRegenCap()
uint32 Client::CalcCurrentWeight() uint32 Client::CalcCurrentWeight()
{ {
const EQEmu::ItemData* TempItem = 0; const EQEmu::ItemData* TempItem = nullptr;
EQEmu::ItemInstance* ins; EQEmu::ItemInstance* ins = nullptr;
uint32 Total = 0; uint32 Total = 0;
int x; int x;
for (x = EQEmu::legacy::EQUIPMENT_BEGIN; x <= EQEmu::inventory::slotCursor; x++) { // include cursor or not? for (x = EQEmu::legacy::EQUIPMENT_BEGIN; x <= EQEmu::inventory::slotCursor; x++) { // include cursor or not?

32
zone/client_packet.cpp
View File

@ -1074,7 +1074,7 @@ void Client::Handle_Connect_OP_ReqNewZone(const EQApplicationPacket *app)
{ {
conn_state = NewZoneRequested; conn_state = NewZoneRequested;
EQApplicationPacket* outapp; EQApplicationPacket* outapp = nullptr;
///////////////////////////////////// /////////////////////////////////////
// New Zone Packet // New Zone Packet
@ -1240,12 +1240,12 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
} }
uint32 pplen = 0; uint32 pplen = 0;
EQApplicationPacket* outapp = 0; EQApplicationPacket* outapp = nullptr;
MYSQL_RES* result = 0; MYSQL_RES* result = nullptr;
bool loaditems = 0; bool loaditems = 0;
uint32 i; uint32 i;
std::string query; std::string query;
unsigned long* lengths; unsigned long* lengths = nullptr;
uint32 cid = CharacterID(); uint32 cid = CharacterID();
character_id = cid; /* Global character_id reference */ character_id = cid; /* Global character_id reference */
@ -2062,7 +2062,7 @@ void Client::Handle_OP_AdventureMerchantRequest(const EQApplicationPacket *app)
merchantid = tmp->CastToNPC()->MerchantType; merchantid = tmp->CastToNPC()->MerchantType;
tmp->CastToNPC()->FaceTarget(this->CastToMob()); tmp->CastToNPC()->FaceTarget(this->CastToMob());
const EQEmu::ItemData *item = 0; const EQEmu::ItemData *item = nullptr;
std::list<MerchantList> merlist = zone->merchanttable[merchantid]; std::list<MerchantList> merlist = zone->merchanttable[merchantid];
std::list<MerchantList>::const_iterator itr; std::list<MerchantList>::const_iterator itr;
for (itr = merlist.begin(); itr != merlist.end() && count<255; ++itr){ for (itr = merlist.begin(); itr != merlist.end() && count<255; ++itr){
@ -4867,7 +4867,7 @@ void Client::Handle_OP_Consume(const EQApplicationPacket *app)
{ {
if (m_pp.hunger_level > 6000) if (m_pp.hunger_level > 6000)
{ {
EQApplicationPacket *outapp; EQApplicationPacket *outapp = nullptr;
outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct)); outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct));
Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer; Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer;
sta->food = m_pp.hunger_level > 6000 ? 6000 : m_pp.hunger_level; sta->food = m_pp.hunger_level > 6000 ? 6000 : m_pp.hunger_level;
@ -4882,7 +4882,7 @@ void Client::Handle_OP_Consume(const EQApplicationPacket *app)
{ {
if (m_pp.thirst_level > 6000) if (m_pp.thirst_level > 6000)
{ {
EQApplicationPacket *outapp; EQApplicationPacket *outapp = nullptr;
outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct)); outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct));
Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer; Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer;
sta->food = m_pp.hunger_level > 6000 ? 6000 : m_pp.hunger_level; sta->food = m_pp.hunger_level > 6000 ? 6000 : m_pp.hunger_level;
@ -4915,7 +4915,7 @@ void Client::Handle_OP_Consume(const EQApplicationPacket *app)
m_pp.hunger_level = 50000; m_pp.hunger_level = 50000;
if (m_pp.thirst_level > 50000) if (m_pp.thirst_level > 50000)
m_pp.thirst_level = 50000; m_pp.thirst_level = 50000;
EQApplicationPacket *outapp; EQApplicationPacket *outapp = nullptr;
outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct)); outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct));
Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer; Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer;
sta->food = m_pp.hunger_level > 6000 ? 6000 : m_pp.hunger_level; sta->food = m_pp.hunger_level > 6000 ? 6000 : m_pp.hunger_level;
@ -5903,7 +5903,7 @@ void Client::Handle_OP_GMEmoteZone(const EQApplicationPacket *app)
return; return;
} }
GMEmoteZone_Struct* gmez = (GMEmoteZone_Struct*)app->pBuffer; GMEmoteZone_Struct* gmez = (GMEmoteZone_Struct*)app->pBuffer;
char* newmessage = 0; char* newmessage = nullptr;
if (strstr(gmez->text, "^") == 0) if (strstr(gmez->text, "^") == 0)
entity_list.Message(0, 15, gmez->text); entity_list.Message(0, 15, gmez->text);
else{ else{
@ -8259,7 +8259,7 @@ void Client::Handle_OP_ItemName(const EQApplicationPacket *app)
return; return;
} }
ItemNamePacket_Struct *p = (ItemNamePacket_Struct*)app->pBuffer; ItemNamePacket_Struct *p = (ItemNamePacket_Struct*)app->pBuffer;
const EQEmu::ItemData *item = 0; const EQEmu::ItemData *item = nullptr;
if ((item = database.GetItem(p->item_id)) != nullptr) { if ((item = database.GetItem(p->item_id)) != nullptr) {
auto outapp = new EQApplicationPacket(OP_ItemName, sizeof(ItemNamePacket_Struct)); auto outapp = new EQApplicationPacket(OP_ItemName, sizeof(ItemNamePacket_Struct));
p = (ItemNamePacket_Struct*)outapp->pBuffer; p = (ItemNamePacket_Struct*)outapp->pBuffer;
@ -8466,7 +8466,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
target_id = request->target; target_id = request->target;
EQApplicationPacket *outapp; EQApplicationPacket *outapp = nullptr;
outapp = new EQApplicationPacket(OP_ItemVerifyReply, sizeof(ItemVerifyReply_Struct)); outapp = new EQApplicationPacket(OP_ItemVerifyReply, sizeof(ItemVerifyReply_Struct));
ItemVerifyReply_Struct* reply = (ItemVerifyReply_Struct*)outapp->pBuffer; ItemVerifyReply_Struct* reply = (ItemVerifyReply_Struct*)outapp->pBuffer;
reply->slot = slot_id; reply->slot = slot_id;
@ -8540,8 +8540,8 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
int r; int r;
bool tryaug = false; bool tryaug = false;
EQEmu::ItemInstance* clickaug = 0; EQEmu::ItemInstance* clickaug = nullptr;
EQEmu::ItemData* augitem = 0; EQEmu::ItemData* augitem = nullptr;
for (r = EQEmu::inventory::socketBegin; r < EQEmu::inventory::SocketCount; r++) { for (r = EQEmu::inventory::socketBegin; r < EQEmu::inventory::SocketCount; r++) {
const EQEmu::ItemInstance* aug_i = inst->GetAugment(r); const EQEmu::ItemInstance* aug_i = inst->GetAugment(r);
@ -8670,7 +8670,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
if (m_pp.thirst_level > 6000) if (m_pp.thirst_level > 6000)
m_pp.thirst_level = 6000; m_pp.thirst_level = 6000;
EQApplicationPacket *outapp2; EQApplicationPacket *outapp2 = nullptr;
outapp2 = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct)); outapp2 = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct));
Stamina_Struct* sta = (Stamina_Struct*)outapp2->pBuffer; Stamina_Struct* sta = (Stamina_Struct*)outapp2->pBuffer;
sta->food = m_pp.hunger_level; sta->food = m_pp.hunger_level;
@ -9195,7 +9195,7 @@ void Client::Handle_OP_LootItem(const EQApplicationPacket *app)
return; return;
} }
EQApplicationPacket* outapp = 0; EQApplicationPacket* outapp = nullptr;
Entity* entity = entity_list.GetID(*((uint16*)app->pBuffer)); Entity* entity = entity_list.GetID(*((uint16*)app->pBuffer));
if (entity == 0) { if (entity == 0) {
Message(13, "Error: OP_LootItem: Corpse not found (ent = 0)"); Message(13, "Error: OP_LootItem: Corpse not found (ent = 0)");
@ -12022,7 +12022,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app)
else else
zoneid = atoi(row[0]); zoneid = atoi(row[0]);
char* name; char* name = nullptr;
database.GetZoneLongName(database.GetZoneName(zoneid), &name); database.GetZoneLongName(database.GetZoneName(zoneid), &name);
Message(15, "%d - %s", zoneid, name); Message(15, "%d - %s", zoneid, name);
} }

4
zone/client_process.cpp
View File

@ -210,7 +210,7 @@ bool Client::Process() {
if (bardsong_timer.Check() && bardsong != 0) { if (bardsong_timer.Check() && bardsong != 0) {
//NOTE: this is kinda a heavy-handed check to make sure the mob still exists before //NOTE: this is kinda a heavy-handed check to make sure the mob still exists before
//doing the next pulse on them... //doing the next pulse on them...
Mob *song_target; Mob *song_target = nullptr;
if(bardsong_target_id == GetID()) { if(bardsong_target_id == GetID()) {
song_target = this; song_target = this;
} else { } else {
@ -838,7 +838,7 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) {
if (m_ClientVersionBit & EQEmu::versions::bit_RoFAndLater) { // RoF+ can send 200 items if (m_ClientVersionBit & EQEmu::versions::bit_RoFAndLater) { // RoF+ can send 200 items
numItemSlots = 200; numItemSlots = 200;
} }
const EQEmu::ItemData *item; const EQEmu::ItemData *item = nullptr;
std::list<MerchantList> merlist = zone->merchanttable[merchant_id]; std::list<MerchantList> merlist = zone->merchanttable[merchant_id];
std::list<MerchantList>::const_iterator itr; std::list<MerchantList>::const_iterator itr;
Mob* merch = entity_list.GetMobByNpcTypeID(npcid); Mob* merch = entity_list.GetMobByNpcTypeID(npcid);

16
zone/corpse.cpp
View File

@ -82,7 +82,7 @@ Corpse* Corpse::LoadCharacterCorpseEntity(uint32 in_dbid, uint32 in_charid, std:
/* Load Items */ /* Load Items */
ItemList itemlist; ItemList itemlist;
ServerLootItem_Struct* tmp = 0; ServerLootItem_Struct* tmp = nullptr;
for (unsigned int i = 0; i < pcs->itemcount; i++) { for (unsigned int i = 0; i < pcs->itemcount; i++) {
tmp = new ServerLootItem_Struct; tmp = new ServerLootItem_Struct;
memcpy(tmp, &pcs->items[i], sizeof(player_lootitem::ServerLootItem_Struct)); memcpy(tmp, &pcs->items[i], sizeof(player_lootitem::ServerLootItem_Struct));
@ -267,7 +267,7 @@ Corpse::Corpse(Client* client, int32 in_rezexp) : Mob (
int i; int i;
PlayerProfile_Struct *pp = &client->GetPP(); PlayerProfile_Struct *pp = &client->GetPP();
EQEmu::ItemInstance *item; EQEmu::ItemInstance *item = nullptr;
/* Check if Zone has Graveyard First */ /* Check if Zone has Graveyard First */
if(!zone->HasGraveyard()) { if(!zone->HasGraveyard()) {
@ -671,7 +671,7 @@ void Corpse::AddItem(uint32 itemnum, uint16 charges, int16 slot, uint32 aug1, ui
} }
ServerLootItem_Struct* Corpse::GetItem(uint16 lootslot, ServerLootItem_Struct** bag_item_data) { ServerLootItem_Struct* Corpse::GetItem(uint16 lootslot, ServerLootItem_Struct** bag_item_data) {
ServerLootItem_Struct *sitem = 0, *sitem2; ServerLootItem_Struct *sitem = nullptr, *sitem2 = nullptr;
ItemList::iterator cur,end; ItemList::iterator cur,end;
cur = itemlist.begin(); cur = itemlist.begin();
@ -993,7 +993,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a
} }
int i = 0; int i = 0;
const EQEmu::ItemData* item = 0; const EQEmu::ItemData* item = nullptr;
ItemList::iterator cur,end; ItemList::iterator cur,end;
cur = itemlist.begin(); cur = itemlist.begin();
end = itemlist.end(); end = itemlist.end();
@ -1116,9 +1116,9 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
return; return;
} }
const EQEmu::ItemData *item = 0; const EQEmu::ItemData *item = nullptr;
EQEmu::ItemInstance *inst = 0; EQEmu::ItemInstance *inst = nullptr;
ServerLootItem_Struct *item_data = nullptr, *bag_item_data[10]; ServerLootItem_Struct *item_data = nullptr, *bag_item_data[10] = {};
memset(bag_item_data, 0, sizeof(bag_item_data)); memset(bag_item_data, 0, sizeof(bag_item_data));
if (GetPlayerKillItem() > 1) { if (GetPlayerKillItem() > 1) {
@ -1437,7 +1437,7 @@ uint32 Corpse::GetEquipment(uint8 material_slot) const {
} }
uint32 Corpse::GetEquipmentColor(uint8 material_slot) const { uint32 Corpse::GetEquipmentColor(uint8 material_slot) const {
const EQEmu::ItemData *item; const EQEmu::ItemData *item = nullptr;
if (material_slot > EQEmu::textures::LastTexture) { if (material_slot > EQEmu::textures::LastTexture) {
return 0; return 0;

8
zone/effects.cpp
View File

@ -747,7 +747,7 @@ void EntityList::AETaunt(Client* taunter, float range, int32 bonus_hate)
// NPC spells will only affect other NPCs with compatible faction // NPC spells will only affect other NPCs with compatible faction
void EntityList::AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster, int16 resist_adjust) void EntityList::AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster, int16 resist_adjust)
{ {
Mob *curmob; Mob *curmob = nullptr;
float dist = caster->GetAOERange(spell_id); float dist = caster->GetAOERange(spell_id);
float dist2 = dist * dist; float dist2 = dist * dist;
@ -847,7 +847,7 @@ void EntityList::AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_
void EntityList::MassGroupBuff(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster) void EntityList::MassGroupBuff(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster)
{ {
Mob *curmob; Mob *curmob = nullptr;
float dist = caster->GetAOERange(spell_id); float dist = caster->GetAOERange(spell_id);
float dist2 = dist * dist; float dist2 = dist * dist;
@ -888,7 +888,7 @@ void EntityList::MassGroupBuff(Mob *caster, Mob *center, uint16 spell_id, bool a
// NPC spells will only affect other NPCs with compatible faction // NPC spells will only affect other NPCs with compatible faction
void EntityList::AEBardPulse(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster) void EntityList::AEBardPulse(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster)
{ {
Mob *curmob; Mob *curmob = nullptr;
float dist = caster->GetAOERange(spell_id); float dist = caster->GetAOERange(spell_id);
float dist2 = dist * dist; float dist2 = dist * dist;
@ -940,7 +940,7 @@ void EntityList::AEBardPulse(Mob *caster, Mob *center, uint16 spell_id, bool aff
//NPCs handle it differently in Mob::Rampage //NPCs handle it differently in Mob::Rampage
void EntityList::AEAttack(Mob *attacker, float dist, int Hand, int count, bool IsFromSpell) { void EntityList::AEAttack(Mob *attacker, float dist, int Hand, int count, bool IsFromSpell) {
//Dook- Will need tweaking, currently no pets or players or horses //Dook- Will need tweaking, currently no pets or players or horses
Mob *curmob; Mob *curmob = nullptr;
float dist2 = dist * dist; float dist2 = dist * dist;

12
zone/merc.cpp
View File

@ -2183,7 +2183,7 @@ bool Merc::AICastSpell(int8 iChance, uint32 iSpellTypes) {
} }
if(castedSpell) { if(castedSpell) {
char* gmsg = 0; char* gmsg = nullptr;
if(tar != this) { if(tar != this) {
//we don't need spam of bots healing themselves //we don't need spam of bots healing themselves
@ -2606,8 +2606,8 @@ int16 Merc::GetFocusEffect(focusType type, uint16 spell_id) {
//Check if item focus effect exists for the client. //Check if item focus effect exists for the client.
if (itembonuses.FocusEffects[type]){ if (itembonuses.FocusEffects[type]){
const EQEmu::ItemData* TempItem = 0; const EQEmu::ItemData* TempItem = nullptr;
const EQEmu::ItemData* UsedItem = 0; const EQEmu::ItemData* UsedItem = nullptr;
uint16 UsedFocusID = 0; uint16 UsedFocusID = 0;
int16 Total = 0; int16 Total = 0;
int16 focus_max = 0; int16 focus_max = 0;
@ -4556,7 +4556,7 @@ void Merc::SetTarget(Mob* mob) {
} }
Mob* Merc::GetOwnerOrSelf() { Mob* Merc::GetOwnerOrSelf() {
Mob* Result = 0; Mob* Result = nullptr;
if(this->GetMercOwner()) if(this->GetMercOwner())
Result = GetMercOwner(); Result = GetMercOwner();
@ -4591,7 +4591,7 @@ bool Merc::Death(Mob* killerMob, int32 damage, uint16 spell, EQEmu::skills::Skil
} }
Client* Merc::GetMercOwner() { Client* Merc::GetMercOwner() {
Client* mercOwner = 0; Client* mercOwner = nullptr;
if(GetOwner()) if(GetOwner())
{ {
@ -4605,7 +4605,7 @@ Client* Merc::GetMercOwner() {
} }
Mob* Merc::GetOwner() { Mob* Merc::GetOwner() {
Mob* Result = 0; Mob* Result = nullptr;
Result = entity_list.GetMob(GetOwnerID()); Result = entity_list.GetMob(GetOwnerID());

12
zone/mob.cpp
View File

@ -1292,7 +1292,7 @@ void Mob::CreateHPPacket(EQApplicationPacket* app)
void Mob::SendHPUpdate(bool skip_self) void Mob::SendHPUpdate(bool skip_self)
{ {
EQApplicationPacket hp_app; EQApplicationPacket hp_app;
Group *group; Group *group = nullptr;
// destructor will free the pBuffer // destructor will free the pBuffer
CreateHPPacket(&hp_app); CreateHPPacket(&hp_app);
@ -2787,7 +2787,7 @@ void Mob::SendArmorAppearance(Client *one_client)
{ {
if (!IsClient()) if (!IsClient())
{ {
const EQEmu::ItemData *item; const EQEmu::ItemData *item = nullptr;
for (int i = 0; i < 7; ++i) for (int i = 0; i < 7; ++i)
{ {
item = database.GetItem(GetEquipment(i)); item = database.GetItem(GetEquipment(i));
@ -2905,7 +2905,7 @@ int32 Mob::GetEquipmentMaterial(uint8 material_slot) const
{ {
uint32 equipmaterial = 0; uint32 equipmaterial = 0;
int32 ornamentationAugtype = RuleI(Character, OrnamentationAugmentType); int32 ornamentationAugtype = RuleI(Character, OrnamentationAugmentType);
const EQEmu::ItemData *item; const EQEmu::ItemData *item = nullptr;
item = database.GetItem(GetEquipment(material_slot)); item = database.GetItem(GetEquipment(material_slot));
if (item != 0) if (item != 0)
@ -2958,7 +2958,7 @@ int32 Mob::GetHerosForgeModel(uint8 material_slot) const
if (material_slot >= 0 && material_slot < EQEmu::textures::weaponPrimary) if (material_slot >= 0 && material_slot < EQEmu::textures::weaponPrimary)
{ {
uint32 ornamentationAugtype = RuleI(Character, OrnamentationAugmentType); uint32 ornamentationAugtype = RuleI(Character, OrnamentationAugmentType);
const EQEmu::ItemData *item; const EQEmu::ItemData *item = nullptr;
item = database.GetItem(GetEquipment(material_slot)); item = database.GetItem(GetEquipment(material_slot));
int16 invslot = EQEmu::InventoryProfile::CalcSlotFromMaterial(material_slot); int16 invslot = EQEmu::InventoryProfile::CalcSlotFromMaterial(material_slot);
@ -3012,7 +3012,7 @@ int32 Mob::GetHerosForgeModel(uint8 material_slot) const
uint32 Mob::GetEquipmentColor(uint8 material_slot) const uint32 Mob::GetEquipmentColor(uint8 material_slot) const
{ {
const EQEmu::ItemData *item; const EQEmu::ItemData *item = nullptr;
if (armor_tint.Slot[material_slot].Color) if (armor_tint.Slot[material_slot].Color)
{ {
@ -3028,7 +3028,7 @@ uint32 Mob::GetEquipmentColor(uint8 material_slot) const
uint32 Mob::IsEliteMaterialItem(uint8 material_slot) const uint32 Mob::IsEliteMaterialItem(uint8 material_slot) const
{ {
const EQEmu::ItemData *item; const EQEmu::ItemData *item = nullptr;
item = database.GetItem(GetEquipment(material_slot)); item = database.GetItem(GetEquipment(material_slot));
if(item != 0) if(item != 0)

2
zone/pets.cpp
View File

@ -425,7 +425,7 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower,
// like the special back items some focused pets may receive. // like the special back items some focused pets may receive.
uint32 petinv[EQEmu::legacy::EQUIPMENT_SIZE]; uint32 petinv[EQEmu::legacy::EQUIPMENT_SIZE];
memset(petinv, 0, sizeof(petinv)); memset(petinv, 0, sizeof(petinv));
const EQEmu::ItemData *item = 0; const EQEmu::ItemData *item = nullptr;
if (database.GetBasePetItems(record.equipmentset, petinv)) { if (database.GetBasePetItems(record.equipmentset, petinv)) {
for (int i = 0; i < EQEmu::legacy::EQUIPMENT_SIZE; i++) for (int i = 0; i < EQEmu::legacy::EQUIPMENT_SIZE; i++)

16
zone/spell_effects.cpp
View File

@ -438,7 +438,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
{ {
float x, y, z, heading; float x, y, z, heading;
const char *target_zone; const char *target_zone = nullptr;
x = static_cast<float>(spell.base[1]); x = static_cast<float>(spell.base[1]);
y = static_cast<float>(spell.base[0]); y = static_cast<float>(spell.base[0]);
@ -510,7 +510,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
case SE_Teleport2: case SE_Teleport2:
{ {
float x, y, z, heading; float x, y, z, heading;
const char *target_zone; const char *target_zone = nullptr;
x = static_cast<float>(spell.base[1]); x = static_cast<float>(spell.base[1]);
y = static_cast<float>(spell.base[0]); y = static_cast<float>(spell.base[0]);
@ -1723,7 +1723,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
#endif #endif
// can only summon corpses of clients // can only summon corpses of clients
if(!IsNPC()) { if(!IsNPC()) {
Client* TargetClient = 0; Client* TargetClient = nullptr;
if(this->GetTarget()) if(this->GetTarget())
TargetClient = this->GetTarget()->CastToClient(); TargetClient = this->GetTarget()->CastToClient();
else else
@ -5177,7 +5177,7 @@ uint16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) {
//item focus //item focus
if (itembonuses.FocusEffects[type]){ if (itembonuses.FocusEffects[type]){
const EQEmu::ItemData* TempItem = 0; const EQEmu::ItemData* TempItem = nullptr;
for (int x = EQEmu::legacy::EQUIPMENT_BEGIN; x <= EQEmu::legacy::EQUIPMENT_END; x++) for (int x = EQEmu::legacy::EQUIPMENT_BEGIN; x <= EQEmu::legacy::EQUIPMENT_END; x++)
{ {
@ -5306,8 +5306,8 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id)
//Check if item focus effect exists for the client. //Check if item focus effect exists for the client.
if (itembonuses.FocusEffects[type]){ if (itembonuses.FocusEffects[type]){
const EQEmu::ItemData* TempItem = 0; const EQEmu::ItemData* TempItem = nullptr;
const EQEmu::ItemData* UsedItem = 0; const EQEmu::ItemData* UsedItem = nullptr;
uint16 UsedFocusID = 0; uint16 UsedFocusID = 0;
int16 Total = 0; int16 Total = 0;
int16 focus_max = 0; int16 focus_max = 0;
@ -5578,8 +5578,8 @@ int16 NPC::GetFocusEffect(focusType type, uint16 spell_id) {
if (RuleB(Spells, NPC_UseFocusFromItems) && itembonuses.FocusEffects[type]){ if (RuleB(Spells, NPC_UseFocusFromItems) && itembonuses.FocusEffects[type]){
const EQEmu::ItemData* TempItem = 0; const EQEmu::ItemData* TempItem = nullptr;
const EQEmu::ItemData* UsedItem = 0; const EQEmu::ItemData* UsedItem = nullptr;
uint16 UsedFocusID = 0; uint16 UsedFocusID = 0;
int16 Total = 0; int16 Total = 0;
int16 focus_max = 0; int16 focus_max = 0;

30
zone/spells.cpp
View File

@ -826,7 +826,7 @@ void Mob::InterruptSpell(uint16 spellid)
// color not used right now // color not used right now
void Mob::InterruptSpell(uint16 message, uint16 color, uint16 spellid) void Mob::InterruptSpell(uint16 message, uint16 color, uint16 spellid)
{ {
EQApplicationPacket *outapp; EQApplicationPacket *outapp = nullptr;
uint16 message_other; uint16 message_other;
bool bard_song_mode = false; //has the bard song gone to auto repeat mode bool bard_song_mode = false; //has the bard song gone to auto repeat mode
if (spellid == SPELL_UNKNOWN) { if (spellid == SPELL_UNKNOWN) {
@ -1267,7 +1267,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
{ {
bool fromaug = false; bool fromaug = false;
const EQEmu::ItemInstance* inst = CastToClient()->GetInv()[inventory_slot]; const EQEmu::ItemInstance* inst = CastToClient()->GetInv()[inventory_slot];
EQEmu::ItemData* augitem = 0; EQEmu::ItemData* augitem = nullptr;
uint32 recastdelay = 0; uint32 recastdelay = 0;
uint32 recasttype = 0; uint32 recasttype = 0;
@ -3428,7 +3428,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
} }
} }
EQApplicationPacket *action_packet, *message_packet; EQApplicationPacket *action_packet = nullptr, *message_packet = nullptr;
float spell_effectiveness; float spell_effectiveness;
if(!IsValidSpell(spell_id)) if(!IsValidSpell(spell_id))
@ -3621,19 +3621,19 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
spelltar != this) spelltar != this)
{ {
Client* pClient = 0; Client* pClient = nullptr;
Raid* pRaid = 0; Raid* pRaid = nullptr;
Group* pBasicGroup = 0; Group* pBasicGroup = nullptr;
uint32 nGroup = 0; //raid group uint32 nGroup = 0; //raid group
Client* pClientTarget = 0; Client* pClientTarget = nullptr;
Raid* pRaidTarget = 0; Raid* pRaidTarget = nullptr;
Group* pBasicGroupTarget = 0; Group* pBasicGroupTarget = nullptr;
uint32 nGroupTarget = 0; //raid group uint32 nGroupTarget = 0; //raid group
Client* pClientTargetPet = 0; Client* pClientTargetPet = nullptr;
Raid* pRaidTargetPet = 0; Raid* pRaidTargetPet = nullptr;
Group* pBasicGroupTargetPet = 0; Group* pBasicGroupTargetPet = nullptr;
uint32 nGroupTargetPet = 0; //raid group uint32 nGroupTargetPet = 0; //raid group
const uint32 cnWTF = 0xFFFFFFFF + 1; //this should be zero unless on 64bit? forced uint64? const uint32 cnWTF = 0xFFFFFFFF + 1; //this should be zero unless on 64bit? forced uint64?
@ -4936,7 +4936,7 @@ void Mob::Mesmerize()
void Client::MakeBuffFadePacket(uint16 spell_id, int slot_id, bool send_message) void Client::MakeBuffFadePacket(uint16 spell_id, int slot_id, bool send_message)
{ {
EQApplicationPacket* outapp; EQApplicationPacket* outapp = nullptr;
outapp = new EQApplicationPacket(OP_Buff, sizeof(SpellBuffPacket_Struct)); outapp = new EQApplicationPacket(OP_Buff, sizeof(SpellBuffPacket_Struct));
SpellBuffPacket_Struct* sbf = (SpellBuffPacket_Struct*) outapp->pBuffer; SpellBuffPacket_Struct* sbf = (SpellBuffPacket_Struct*) outapp->pBuffer;
@ -5416,7 +5416,7 @@ void Mob::_StopSong()
//be used for other things as well //be used for other things as well
void Client::SendBuffDurationPacket(Buffs_Struct &buff, int slot) void Client::SendBuffDurationPacket(Buffs_Struct &buff, int slot)
{ {
EQApplicationPacket* outapp; EQApplicationPacket* outapp = nullptr;
outapp = new EQApplicationPacket(OP_Buff, sizeof(SpellBuffPacket_Struct)); outapp = new EQApplicationPacket(OP_Buff, sizeof(SpellBuffPacket_Struct));
SpellBuffPacket_Struct* sbf = (SpellBuffPacket_Struct*) outapp->pBuffer; SpellBuffPacket_Struct* sbf = (SpellBuffPacket_Struct*) outapp->pBuffer;
@ -5452,7 +5452,7 @@ void Client::SendBuffNumHitPacket(Buffs_Struct &buff, int slot)
// UF+ use this packet // UF+ use this packet
if (ClientVersion() < EQEmu::versions::ClientVersion::UF) if (ClientVersion() < EQEmu::versions::ClientVersion::UF)
return; return;
EQApplicationPacket *outapp; EQApplicationPacket *outapp = nullptr;
outapp = new EQApplicationPacket(OP_BuffCreate, sizeof(BuffIcon_Struct) + sizeof(BuffIconEntry_Struct)); outapp = new EQApplicationPacket(OP_BuffCreate, sizeof(BuffIcon_Struct) + sizeof(BuffIconEntry_Struct));
BuffIcon_Struct *bi = (BuffIcon_Struct *)outapp->pBuffer; BuffIcon_Struct *bi = (BuffIcon_Struct *)outapp->pBuffer;
bi->entity_id = GetID(); bi->entity_id = GetID();

6
zone/zone.cpp
View File

@ -290,7 +290,7 @@ bool Zone::LoadGroundSpawns() {
Log.Out(Logs::General, Logs::Status, "Loading Ground Spawns from DB..."); Log.Out(Logs::General, Logs::Status, "Loading Ground Spawns from DB...");
database.LoadGroundSpawns(zoneid, GetInstanceVersion(), &groundspawn); database.LoadGroundSpawns(zoneid, GetInstanceVersion(), &groundspawn);
uint32 ix=0; uint32 ix=0;
char* name=0; char* name = nullptr;
uint32 gsnumber=0; uint32 gsnumber=0;
for(gsindex=0;gsindex<50;gsindex++){ for(gsindex=0;gsindex<50;gsindex++){
if(groundspawn.spawn[gsindex].item>0 && groundspawn.spawn[gsindex].item<SAYLINK_ITEM_ID){ if(groundspawn.spawn[gsindex].item>0 && groundspawn.spawn[gsindex].item<SAYLINK_ITEM_ID){
@ -1569,7 +1569,7 @@ void Zone::SetTime(uint8 hour, uint8 minute, bool update_world /*= true*/)
ZonePoint* Zone::GetClosestZonePoint(const glm::vec3& location, uint32 to, Client* client, float max_distance) { ZonePoint* Zone::GetClosestZonePoint(const glm::vec3& location, uint32 to, Client* client, float max_distance) {
LinkedListIterator<ZonePoint*> iterator(zone_point_list); LinkedListIterator<ZonePoint*> iterator(zone_point_list);
ZonePoint* closest_zp = 0; ZonePoint* closest_zp = nullptr;
float closest_dist = FLT_MAX; float closest_dist = FLT_MAX;
float max_distance2 = max_distance * max_distance; float max_distance2 = max_distance * max_distance;
iterator.Reset(); iterator.Reset();
@ -1625,7 +1625,7 @@ ZonePoint* Zone::GetClosestZonePoint(const glm::vec3& location, const char* to_n
ZonePoint* Zone::GetClosestZonePointWithoutZone(float x, float y, float z, Client* client, float max_distance) { ZonePoint* Zone::GetClosestZonePointWithoutZone(float x, float y, float z, Client* client, float max_distance) {
LinkedListIterator<ZonePoint*> iterator(zone_point_list); LinkedListIterator<ZonePoint*> iterator(zone_point_list);
ZonePoint* closest_zp = 0; ZonePoint* closest_zp = nullptr;
float closest_dist = FLT_MAX; float closest_dist = FLT_MAX;
float max_distance2 = max_distance*max_distance; float max_distance2 = max_distance*max_distance;
iterator.Reset(); iterator.Reset();

4
zone/zoning.cpp
View File

@ -297,7 +297,7 @@ void Client::SendZoneCancel(ZoneChange_Struct *zc) {
//effectively zone them right back to where they were //effectively zone them right back to where they were
//unless we find a better way to stop the zoning process. //unless we find a better way to stop the zoning process.
SetPortExemption(true); SetPortExemption(true);
EQApplicationPacket *outapp; EQApplicationPacket *outapp = nullptr;
outapp = new EQApplicationPacket(OP_ZoneChange, sizeof(ZoneChange_Struct)); outapp = new EQApplicationPacket(OP_ZoneChange, sizeof(ZoneChange_Struct));
ZoneChange_Struct *zc2 = (ZoneChange_Struct*)outapp->pBuffer; ZoneChange_Struct *zc2 = (ZoneChange_Struct*)outapp->pBuffer;
strcpy(zc2->char_name, zc->char_name); strcpy(zc2->char_name, zc->char_name);
@ -316,7 +316,7 @@ void Client::SendZoneError(ZoneChange_Struct *zc, int8 err)
SetPortExemption(true); SetPortExemption(true);
EQApplicationPacket *outapp; EQApplicationPacket *outapp = nullptr;
outapp = new EQApplicationPacket(OP_ZoneChange, sizeof(ZoneChange_Struct)); outapp = new EQApplicationPacket(OP_ZoneChange, sizeof(ZoneChange_Struct));
ZoneChange_Struct *zc2 = (ZoneChange_Struct*)outapp->pBuffer; ZoneChange_Struct *zc2 = (ZoneChange_Struct*)outapp->pBuffer;
strcpy(zc2->char_name, zc->char_name); strcpy(zc2->char_name, zc->char_name);