pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 01:11:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Post merge manual fixes

Browse Source
This commit is contained in:
Akkadius 2015-01-21 16:49:25 -06:00
parent 3d74035e24
commit 1e59416f33
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/command.cpp
View File

@ -425,7 +425,7 @@ int command_init(void) {
command_add("open_shop", nullptr, 100, command_merchantopenshop) || command_add("open_shop", nullptr, 100, command_merchantopenshop) ||
command_add("merchant_close_shop", "Closes a merchant shop", 100, command_merchantcloseshop) || command_add("merchant_close_shop", "Closes a merchant shop", 100, command_merchantcloseshop) ||
command_add("close_shop", nullptr, 100, command_merchantcloseshop) || command_add("close_shop", nullptr, 100, command_merchantcloseshop) ||
command_add("tune", "Calculate ideal statical values related to combat.", 100, command_tune) command_add("tune", "Calculate ideal statical values related to combat.", 100, command_tune) ||
command_add("crashtest", "- Crash the zoneserver", 255, command_crashtest) || command_add("crashtest", "- Crash the zoneserver", 255, command_crashtest) ||
command_add("logtest", "Performs log performance testing.", 250, command_logtest) || command_add("logtest", "Performs log performance testing.", 250, command_logtest) ||
command_add("logs", "Manage anything to do with logs", 250, command_logs) command_add("logs", "Manage anything to do with logs", 250, command_logs)

12
zone/inventory.cpp
View File

@ -2188,7 +2188,7 @@ void Client::RemoveDuplicateLore(bool client_update)
auto inst = m_inv.PopItem(MainPowerSource); auto inst = m_inv.PopItem(MainPowerSource);
if (inst) { if (inst) {
if (CheckLoreConflict(inst->GetItem())) { if (CheckLoreConflict(inst->GetItem())) {
Log.Out(Logs::Detail, Logs::Inventory, "Lore Duplication Error: Deleting %s from slot %i", inst->GetItem()->Name, slot_id); Log.Out(Logs::Detail, Logs::Inventory, "Lore Duplication Error: Deleting %s from slot %i", inst->GetItem()->Name, MainPowerSource);
database.SaveInventory(character_id, nullptr, MainPowerSource); database.SaveInventory(character_id, nullptr, MainPowerSource);
} }
else { else {
@ -2301,7 +2301,7 @@ void Client::MoveSlotNotAllowed(bool client_update)
auto inst = m_inv.PopItem(MainPowerSource); auto inst = m_inv.PopItem(MainPowerSource);
bool is_arrow = (inst->GetItem()->ItemType == ItemTypeArrow) ? true : false; bool is_arrow = (inst->GetItem()->ItemType == ItemTypeArrow) ? true : false;
int16 free_slot_id = m_inv.FindFreeSlot(inst->IsType(ItemClassContainer), true, inst->GetItem()->Size, is_arrow); int16 free_slot_id = m_inv.FindFreeSlot(inst->IsType(ItemClassContainer), true, inst->GetItem()->Size, is_arrow);
Log.Out(Logs::Detail, Logs::Inventory, "Slot Assignment Error: Moving %s from slot %i to %i", inst->GetItem()->Name, slot_id, free_slot_id); Log.Out(Logs::Detail, Logs::Inventory, "Slot Assignment Error: Moving %s from slot %i to %i", inst->GetItem()->Name, MainPowerSource, free_slot_id);
PutItemInInventory(free_slot_id, *inst, (GetClientVersion() >= EQClientSoF) ? client_update : false); PutItemInInventory(free_slot_id, *inst, (GetClientVersion() >= EQClientSoF) ? client_update : false);
database.SaveInventory(character_id, nullptr, MainPowerSource); database.SaveInventory(character_id, nullptr, MainPowerSource);
safe_delete(inst); safe_delete(inst);
@ -2552,13 +2552,13 @@ void Client::SetBandolier(const EQApplicationPacket *app) {
// If there was an item in that weapon slot, put it in the inventory // If there was an item in that weapon slot, put it in the inventory
Log.Out(Logs::Detail, Logs::Inventory, "returning item %s in weapon slot %i to inventory", Log.Out(Logs::Detail, Logs::Inventory, "returning item %s in weapon slot %i to inventory",
InvItem->GetItem()->Name, WeaponSlot); InvItem->GetItem()->Name, WeaponSlot);
_log(INVENTORY__BANDOLIER, "returning item %s in weapon slot %i to inventory", InvItem->GetItem()->Name, WeaponSlot); Log.Out(Logs::Detail, Logs::Inventory, "returning item %s in weapon slot %i to inventory", InvItem->GetItem()->Name, WeaponSlot);
if (MoveItemToInventory(InvItem)) { if (MoveItemToInventory(InvItem)) {
database.SaveInventory(character_id, 0, WeaponSlot); database.SaveInventory(character_id, 0, WeaponSlot);
Log.Out(Logs::General, Logs::Error, "Char: %s, ERROR returning %s to inventory", GetName(), Log.Out(Logs::General, Logs::Error, "returning item %s in weapon slot %i to inventory", InvItem->GetItem()->Name, WeaponSlot);
} }
else { else {
_log(INVENTORY__BANDOLIER, "Char: %s, ERROR returning %s to inventory", GetName(), InvItem->GetItem()->Name); Log.Out(Logs::General, Logs::Error, "Char: %s, ERROR returning %s to inventory", GetName(), InvItem->GetItem()->Name);
} }
safe_delete(InvItem); safe_delete(InvItem);
} }
@ -2826,7 +2826,7 @@ bool Client::InterrogateInventory(Client* requester, bool log, bool silent, bool
log = true; log = true;
if (log) { if (log) {
_Log.Out(Logs::General, Logs::Error, "Client::InterrogateInventory() called for %s by %s with an error state of %s", GetName(), requester->GetName(), (error ? "TRUE" : "FALSE")); Log.Out(Logs::General, Logs::Error, "Client::InterrogateInventory() called for %s by %s with an error state of %s", GetName(), requester->GetName(), (error ? "TRUE" : "FALSE"));
} }
if (!silent) { if (!silent) {
requester->Message(1, "--- Inventory Interrogation Report for %s (requested by: %s, error state: %s) ---", GetName(), requester->GetName(), (error ? "TRUE" : "FALSE")); requester->Message(1, "--- Inventory Interrogation Report for %s (requested by: %s, error state: %s) ---", GetName(), requester->GetName(), (error ? "TRUE" : "FALSE"));

2
zone/tune.cpp
View File

@ -20,7 +20,7 @@
//#define TUNE_DEBUG 20 //#define TUNE_DEBUG 20
#endif #endif
#include "../common/debug.h" #include "../common/global_define.h"
#include "../common/eq_constants.h" #include "../common/eq_constants.h"
#include "../common/eq_packet_structs.h" #include "../common/eq_packet_structs.h"
#include "../common/rulesys.h" #include "../common/rulesys.h"