From fd6d1d17d86759f10563dddc4873bac99d9340c2 Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 4 Feb 2009 11:53:02 -0600 Subject: [PATCH 1/4] *Remove two files for renaming. --HG-- branch : trunk --- src/game/debugcmds.cpp | 572 ----------------------------------------- src/game/tools.cpp | 116 --------- 2 files changed, 688 deletions(-) delete mode 100644 src/game/debugcmds.cpp delete mode 100644 src/game/tools.cpp diff --git a/src/game/debugcmds.cpp b/src/game/debugcmds.cpp deleted file mode 100644 index daa8a2f8fa3..00000000000 --- a/src/game/debugcmds.cpp +++ /dev/null @@ -1,572 +0,0 @@ -/* - * Copyright (C) 2005-2008 MaNGOS - * - * Copyright (C) 2008 Trinity - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "Common.h" -#include "Database/DatabaseEnv.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "World.h" -#include "Player.h" -#include "Opcodes.h" -#include "Chat.h" -#include "Log.h" -#include "Unit.h" -#include "ObjectAccessor.h" -#include "GossipDef.h" -#include "Language.h" -#include "MapManager.h" -#include "BattleGroundMgr.h" -#include -#include "ObjectMgr.h" - -bool ChatHandler::HandleDebugInArcCommand(const char* /*args*/) -{ - Object *obj = getSelectedUnit(); - - if(!obj) - { - SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); - return true; - } - - SendSysMessage(LANG_NOT_IMPLEMENTED); - - return true; -} - -bool ChatHandler::HandleDebugSpellFailCommand(const char* args) -{ - if(!args) - return false; - - char* px = strtok((char*)args, " "); - if(!px) - return false; - - uint8 failnum = (uint8)atoi(px); - - WorldPacket data(SMSG_CAST_FAILED, 5); - data << uint32(133); - data << uint8(failnum); - m_session->SendPacket(&data); - - return true; -} - -bool ChatHandler::HandleSetPoiCommand(const char* args) -{ - Player *pPlayer = m_session->GetPlayer(); - Unit* target = getSelectedUnit(); - if(!target) - { - SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); - return true; - } - - if(!args) - return false; - - char* icon_text = strtok((char*)args, " "); - char* flags_text = strtok(NULL, " "); - if(!icon_text || !flags_text) - return false; - - uint32 icon = atol(icon_text); - if ( icon < 0 ) - icon = 0; - - uint32 flags = atol(flags_text); - - sLog.outDetail("Command : POI, NPC = %u, icon = %u flags = %u", target->GetGUIDLow(), icon,flags); - pPlayer->PlayerTalkClass->SendPointOfInterest(target->GetPositionX(), target->GetPositionY(), Poi_Icon(icon), flags, 30, "Test POI"); - return true; -} - -bool ChatHandler::HandleEquipErrorCommand(const char* args) -{ - if(!args) - return false; - - uint8 msg = atoi(args); - m_session->GetPlayer()->SendEquipError(msg, 0, 0); - return true; -} - -bool ChatHandler::HandleSellErrorCommand(const char* args) -{ - if(!args) - return false; - - uint8 msg = atoi(args); - m_session->GetPlayer()->SendSellError(msg, 0, 0, 0); - return true; -} - -bool ChatHandler::HandleBuyErrorCommand(const char* args) -{ - if(!args) - return false; - - uint8 msg = atoi(args); - m_session->GetPlayer()->SendBuyError(msg, 0, 0, 0); - return true; -} - -bool ChatHandler::HandleSendOpcodeCommand(const char* /*args*/) -{ - Unit *unit = getSelectedUnit(); - if (!unit || (unit->GetTypeId() != TYPEID_PLAYER)) - unit = m_session->GetPlayer(); - - std::ifstream ifs("opcode.txt"); - if(ifs.bad()) - return false; - - uint32 opcode; - ifs >> opcode; - - WorldPacket data(opcode, 0); - - while(!ifs.eof()) - { - std::string type; - ifs >> type; - - if(type == "") - break; - - if(type == "uint8") - { - uint16 val1; - ifs >> val1; - data << uint8(val1); - } - else if(type == "uint16") - { - uint16 val2; - ifs >> val2; - data << val2; - } - else if(type == "uint32") - { - uint32 val3; - ifs >> val3; - data << val3; - } - else if(type == "uint64") - { - uint64 val4; - ifs >> val4; - data << val4; - } - else if(type == "float") - { - float val5; - ifs >> val5; - data << val5; - } - else if(type == "string") - { - std::string val6; - ifs >> val6; - data << val6; - } - else if(type == "pguid") - { - data.append(unit->GetPackGUID()); - } - else - { - sLog.outDebug("Sending opcode: unknown type '%s'", type.c_str()); - break; - } - } - ifs.close(); - sLog.outDebug("Sending opcode %u", data.GetOpcode()); - data.hexlike(); - ((Player*)unit)->GetSession()->SendPacket(&data); - PSendSysMessage(LANG_COMMAND_OPCODESENT, data.GetOpcode(), unit->GetName()); - return true; -} - -bool ChatHandler::HandleUpdateWorldStateCommand(const char* args) -{ - char* w = strtok((char*)args, " "); - char* s = strtok(NULL, " "); - - if (!w || !s) - return false; - - uint32 world = (uint32)atoi(w); - uint32 state = (uint32)atoi(s); - m_session->GetPlayer()->SendUpdateWorldState(world, state); - return true; -} - -bool ChatHandler::HandlePlaySound2Command(const char* args) -{ - if(!args) - return false; - - uint32 soundid = atoi(args); - m_session->GetPlayer()->PlaySound(soundid, false); - return true; -} - -//Send notification in channel -bool ChatHandler::HandleSendChannelNotifyCommand(const char* args) -{ - if(!args) - return false; - - const char *name = "test"; - uint8 code = atoi(args); - - WorldPacket data(SMSG_CHANNEL_NOTIFY, (1+10)); - data << code; // notify type - data << name; // channel name - data << uint32(0); - data << uint32(0); - m_session->SendPacket(&data); - return true; -} - -//Send notification in chat -bool ChatHandler::HandleSendChatMsgCommand(const char* args) -{ - if(!args) - return false; - - const char *msg = "testtest"; - uint8 type = atoi(args); - WorldPacket data; - ChatHandler::FillMessageData(&data, m_session, type, 0, "chan", m_session->GetPlayer()->GetGUID(), msg, m_session->GetPlayer()); - m_session->SendPacket(&data); - return true; -} - -bool ChatHandler::HandleSendQuestPartyMsgCommand(const char* args) -{ - uint32 msg = atol((char*)args); - if (msg >= 0) - m_session->GetPlayer()->SendPushToPartyResponse(m_session->GetPlayer(), msg); - return true; -} - -bool ChatHandler::HandleGetLootRecipient(const char* /*args*/) -{ - Creature* target = getSelectedCreature(); - if(!target) - return false; - - PSendSysMessage("loot recipient: %s", target->hasLootRecipient()?(target->GetLootRecipient()?target->GetLootRecipient()->GetName():"offline"):"no loot recipient"); - return true; -} - -bool ChatHandler::HandleSendQuestInvalidMsgCommand(const char* args) -{ - uint32 msg = atol((char*)args); - if (msg >= 0) - m_session->GetPlayer()->SendCanTakeQuestResponse(msg); - return true; -} - -bool ChatHandler::HandleGetItemState(const char* args) -{ - if (!args) - return false; - - std::string state_str = args; - - ItemUpdateState state = ITEM_UNCHANGED; - bool list_queue = false, check_all = false; - if (state_str == "unchanged") state = ITEM_UNCHANGED; - else if (state_str == "changed") state = ITEM_CHANGED; - else if (state_str == "new") state = ITEM_NEW; - else if (state_str == "removed") state = ITEM_REMOVED; - else if (state_str == "queue") list_queue = true; - else if (state_str == "check_all") check_all = true; - else return false; - - Player* player = getSelectedPlayer(); - if (!player) player = m_session->GetPlayer(); - - if (!list_queue && !check_all) - { - state_str = "The player has the following " + state_str + " items: "; - SendSysMessage(state_str.c_str()); - for (uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; i++) - { - if(i >= BUYBACK_SLOT_START && i < BUYBACK_SLOT_END) - continue; - - Item *item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i); - if (!item) continue; - if (!item->IsBag()) - { - if (item->GetState() == state) - PSendSysMessage("bag: 255 slot: %d guid: %d owner: %d", item->GetSlot(), item->GetGUIDLow(), GUID_LOPART(item->GetOwnerGUID())); - } - else - { - Bag *bag = (Bag*)item; - for (uint8 j = 0; j < bag->GetBagSize(); ++j) - { - Item* item = bag->GetItemByPos(j); - if (item && item->GetState() == state) - PSendSysMessage("bag: 255 slot: %d guid: %d owner: %d", item->GetSlot(), item->GetGUIDLow(), GUID_LOPART(item->GetOwnerGUID())); - } - } - } - } - - if (list_queue) - { - std::vector &updateQueue = player->GetItemUpdateQueue(); - for(size_t i = 0; i < updateQueue.size(); i++) - { - Item *item = updateQueue[i]; - if(!item) continue; - - Bag *container = item->GetContainer(); - uint8 bag_slot = container ? container->GetSlot() : uint8(INVENTORY_SLOT_BAG_0); - - std::string st; - switch(item->GetState()) - { - case ITEM_UNCHANGED: st = "unchanged"; break; - case ITEM_CHANGED: st = "changed"; break; - case ITEM_NEW: st = "new"; break; - case ITEM_REMOVED: st = "removed"; break; - } - - PSendSysMessage("bag: %d slot: %d guid: %d - state: %s", bag_slot, item->GetSlot(), item->GetGUIDLow(), st.c_str()); - } - if (updateQueue.empty()) - PSendSysMessage("updatequeue empty"); - } - - if (check_all) - { - bool error = false; - std::vector &updateQueue = player->GetItemUpdateQueue(); - for (uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; i++) - { - if(i >= BUYBACK_SLOT_START && i < BUYBACK_SLOT_END) - continue; - - Item *item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i); - if (!item) continue; - - if (item->GetSlot() != i) - { - PSendSysMessage("item at slot %d, guid %d has an incorrect slot value: %d", i, item->GetGUIDLow(), item->GetSlot()); - error = true; continue; - } - - if (item->GetOwnerGUID() != player->GetGUID()) - { - PSendSysMessage("for the item at slot %d and itemguid %d, owner's guid (%d) and player's guid (%d) don't match!", item->GetSlot(), item->GetGUIDLow(), GUID_LOPART(item->GetOwnerGUID()), player->GetGUIDLow()); - error = true; continue; - } - - if (Bag *container = item->GetContainer()) - { - PSendSysMessage("item at slot: %d guid: %d has a container (slot: %d, guid: %d) but shouldnt!", item->GetSlot(), item->GetGUIDLow(), container->GetSlot(), container->GetGUIDLow()); - error = true; continue; - } - - if (item->IsInUpdateQueue()) - { - uint16 qp = item->GetQueuePos(); - if (qp > updateQueue.size()) - { - PSendSysMessage("item at slot: %d guid: %d has a queuepos (%d) larger than the update queue size! ", item->GetSlot(), item->GetGUIDLow(), qp); - error = true; continue; - } - - if (updateQueue[qp] == NULL) - { - PSendSysMessage("item at slot: %d guid: %d has a queuepos (%d) that points to NULL in the queue!", item->GetSlot(), item->GetGUIDLow(), qp); - error = true; continue; - } - - if (updateQueue[qp] != item) - { - PSendSysMessage("item at slot: %d guid: %d has has a queuepos (%d) that points to another item in the queue (bag: %d, slot: %d, guid: %d)", item->GetSlot(), item->GetGUIDLow(), qp, updateQueue[qp]->GetBagSlot(), updateQueue[qp]->GetSlot(), updateQueue[qp]->GetGUIDLow()); - error = true; continue; - } - } - else if (item->GetState() != ITEM_UNCHANGED) - { - PSendSysMessage("item at slot: %d guid: %d is not in queue but should be (state: %d)!", item->GetSlot(), item->GetGUIDLow(), item->GetState()); - error = true; continue; - } - - if(item->IsBag()) - { - Bag *bag = (Bag*)item; - for (uint8 j = 0; j < bag->GetBagSize(); ++j) - { - Item* item = bag->GetItemByPos(j); - if (!item) continue; - - if (item->GetSlot() != j) - { - PSendSysMessage("the item in bag %d slot %d, guid %d has an incorrect slot value: %d", bag->GetSlot(), j, item->GetGUIDLow(), item->GetSlot()); - error = true; continue; - } - - if (item->GetOwnerGUID() != player->GetGUID()) - { - PSendSysMessage("for the item in bag %d at slot %d and itemguid %d, owner's guid (%d) and player's guid (%d) don't match!", bag->GetSlot(), item->GetSlot(), item->GetGUIDLow(), GUID_LOPART(item->GetOwnerGUID()), player->GetGUIDLow()); - error = true; continue; - } - - Bag *container = item->GetContainer(); - if (!container) - { - PSendSysMessage("the item in bag %d at slot %d with guid %d has no container!", bag->GetSlot(), item->GetSlot(), item->GetGUIDLow()); - error = true; continue; - } - - if (container != bag) - { - PSendSysMessage("the item in bag %d at slot %d with guid %d has a different container(slot %d guid %d)!", bag->GetSlot(), item->GetSlot(), item->GetGUIDLow(), container->GetSlot(), container->GetGUIDLow()); - error = true; continue; - } - - if (item->IsInUpdateQueue()) - { - uint16 qp = item->GetQueuePos(); - if (qp > updateQueue.size()) - { - PSendSysMessage("item in bag: %d at slot: %d guid: %d has a queuepos (%d) larger than the update queue size! ", bag->GetSlot(), item->GetSlot(), item->GetGUIDLow(), qp); - error = true; continue; - } - - if (updateQueue[qp] == NULL) - { - PSendSysMessage("item in bag: %d at slot: %d guid: %d has a queuepos (%d) that points to NULL in the queue!", bag->GetSlot(), item->GetSlot(), item->GetGUIDLow(), qp); - error = true; continue; - } - - if (updateQueue[qp] != item) - { - PSendSysMessage("item in bag: %d at slot: %d guid: %d has has a queuepos (%d) that points to another item in the queue (bag: %d, slot: %d, guid: %d)", bag->GetSlot(), item->GetSlot(), item->GetGUIDLow(), qp, updateQueue[qp]->GetBagSlot(), updateQueue[qp]->GetSlot(), updateQueue[qp]->GetGUIDLow()); - error = true; continue; - } - } - else if (item->GetState() != ITEM_UNCHANGED) - { - PSendSysMessage("item in bag: %d at slot: %d guid: %d is not in queue but should be (state: %d)!", bag->GetSlot(), item->GetSlot(), item->GetGUIDLow(), item->GetState()); - error = true; continue; - } - } - } - } - - for(size_t i = 0; i < updateQueue.size(); i++) - { - Item *item = updateQueue[i]; - if(!item) continue; - - if (item->GetOwnerGUID() != player->GetGUID()) - { - PSendSysMessage("queue(%d): for the an item (guid %d), the owner's guid (%d) and player's guid (%d) don't match!", i, item->GetGUIDLow(), GUID_LOPART(item->GetOwnerGUID()), player->GetGUIDLow()); - error = true; continue; - } - - if (item->GetQueuePos() != i) - { - PSendSysMessage("queue(%d): for the an item (guid %d), the queuepos doesn't match it's position in the queue!", i, item->GetGUIDLow()); - error = true; continue; - } - - if (item->GetState() == ITEM_REMOVED) continue; - Item *test = player->GetItemByPos( item->GetBagSlot(), item->GetSlot()); - - if (test == NULL) - { - PSendSysMessage("queue(%d): the bag(%d) and slot(%d) values for the item with guid %d are incorrect, the player doesn't have an item at that position!", i, item->GetBagSlot(), item->GetSlot(), item->GetGUIDLow()); - error = true; continue; - } - - if (test != item) - { - PSendSysMessage("queue(%d): the bag(%d) and slot(%d) values for the item with guid %d are incorrect, the item with guid %d is there instead!", i, item->GetBagSlot(), item->GetSlot(), item->GetGUIDLow(), test->GetGUIDLow()); - error = true; continue; - } - } - if (!error) - SendSysMessage("All OK!"); - } - - return true; -} - -bool ChatHandler::HandleDebugArenaCommand(const char * /*args*/) -{ - sBattleGroundMgr.ToggleArenaTesting(); - return true; -} - -bool ChatHandler::HandleDebugThreatList(const char * /*args*/) -{ - Creature* target = getSelectedCreature(); - if(!target || target->isTotem() || target->isPet()) - return false; - - std::list& tlist = target->getThreatManager().getThreatList(); - std::list::iterator itr; - uint32 cnt = 0; - PSendSysMessage("Threat list of %s (guid %u)",target->GetName(), target->GetGUIDLow()); - for(itr = tlist.begin(); itr != tlist.end(); ++itr) - { - Unit* unit = (*itr)->getTarget(); - if(!unit) - continue; - ++cnt; - PSendSysMessage(" %u. %s (guid %u) - threat %f",cnt,unit->GetName(), unit->GetGUIDLow(), (*itr)->getThreat()); - } - SendSysMessage("End of threat list."); - return true; -} - -bool ChatHandler::HandleDebugHostilRefList(const char * /*args*/) -{ - Unit* target = getSelectedUnit(); - if(!target) - target = m_session->GetPlayer(); - HostilReference* ref = target->getHostilRefManager().getFirst(); - uint32 cnt = 0; - PSendSysMessage("Hostil reference list of %s (guid %u)",target->GetName(), target->GetGUIDLow()); - while(ref) - { - if(Unit * unit = ref->getSource()->getOwner()) - { - ++cnt; - PSendSysMessage(" %u. %s (guid %u) - threat %f",cnt,unit->GetName(), unit->GetGUIDLow(), ref->getThreat()); - } - ref = ref->next(); - } - SendSysMessage("End of hostil reference list."); - return true; -} diff --git a/src/game/tools.cpp b/src/game/tools.cpp deleted file mode 100644 index 7abc016df48..00000000000 --- a/src/game/tools.cpp +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (C) 2005-2008 MaNGOS - * - * Copyright (C) 2008 Trinity - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "Tools.h" - -// THIS CAN BE A LOT FASTER -bool readGUID(WorldPacket & data, uint64& guid) -{ - if(data.rpos()+1 > data.size()) - return false; - - uint8 guidmark=0; - uint8 bit; - uint8 shiftdata=0x1; - uint64 Temp=0; - - guid = 0; - - data >> guidmark; - for(int i=0;i<8;i++) - { - if(guidmark & shiftdata) - { - Temp = 0; - - if(data.rpos()+1 > data.size()) - return false; - - data >> bit; - Temp = bit; - Temp <<= i*8; - guid |= Temp; - } - shiftdata=shiftdata<<1; - } - - return true; -} - -void writeGUID(WorldPacket & data, uint64 & guid) -{ - uint8 RAWmask = 0; - uint8 PackedGuid[8] = {0,0,0,0,0,0,0,0}; - - int j = 1; - uint8 * test = (uint8*)&guid; - - if (*test) - { - PackedGuid[j] = *test; - RAWmask |= 1; - ++j; - } - if (*(test+1)) - { - PackedGuid[j] = *(test+1); - RAWmask |= 2; - ++j; - } - if (*(test+2)) - { - PackedGuid[j] = *(test+2); - RAWmask |= 4; - ++j; - } - if (*(test+3)) - { - PackedGuid[j] = *(test+3); - RAWmask |= 8; - ++j; - } - if (*(test+4)) - { - PackedGuid[j] = *(test+4); - RAWmask |= 16; - ++j; - } - if (*(test+5)) - { - PackedGuid[j] = *(test+5); - RAWmask |= 32; - ++j; - } - if (*(test+6)) - { - PackedGuid[j] = *(test+6); - RAWmask |= 64; - ++j; - } - if (*(test+7)) - { - PackedGuid[j] = *(test+7); - RAWmask |= 128; - ++j; - } - PackedGuid[0] = RAWmask; - - data.append(PackedGuid,j); -} From b709f846a42f038efddddfe8085310de4ef382cc Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 4 Feb 2009 11:53:32 -0600 Subject: [PATCH 2/4] *Add removed files back. --HG-- branch : trunk --- src/game/Debugcmds.cpp | 572 +++++++++++++++++++++++++++++++++++++++++ src/game/Tools.cpp | 116 +++++++++ 2 files changed, 688 insertions(+) create mode 100644 src/game/Debugcmds.cpp create mode 100644 src/game/Tools.cpp diff --git a/src/game/Debugcmds.cpp b/src/game/Debugcmds.cpp new file mode 100644 index 00000000000..daa8a2f8fa3 --- /dev/null +++ b/src/game/Debugcmds.cpp @@ -0,0 +1,572 @@ +/* + * Copyright (C) 2005-2008 MaNGOS + * + * Copyright (C) 2008 Trinity + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "Common.h" +#include "Database/DatabaseEnv.h" +#include "WorldPacket.h" +#include "WorldSession.h" +#include "World.h" +#include "Player.h" +#include "Opcodes.h" +#include "Chat.h" +#include "Log.h" +#include "Unit.h" +#include "ObjectAccessor.h" +#include "GossipDef.h" +#include "Language.h" +#include "MapManager.h" +#include "BattleGroundMgr.h" +#include +#include "ObjectMgr.h" + +bool ChatHandler::HandleDebugInArcCommand(const char* /*args*/) +{ + Object *obj = getSelectedUnit(); + + if(!obj) + { + SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); + return true; + } + + SendSysMessage(LANG_NOT_IMPLEMENTED); + + return true; +} + +bool ChatHandler::HandleDebugSpellFailCommand(const char* args) +{ + if(!args) + return false; + + char* px = strtok((char*)args, " "); + if(!px) + return false; + + uint8 failnum = (uint8)atoi(px); + + WorldPacket data(SMSG_CAST_FAILED, 5); + data << uint32(133); + data << uint8(failnum); + m_session->SendPacket(&data); + + return true; +} + +bool ChatHandler::HandleSetPoiCommand(const char* args) +{ + Player *pPlayer = m_session->GetPlayer(); + Unit* target = getSelectedUnit(); + if(!target) + { + SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); + return true; + } + + if(!args) + return false; + + char* icon_text = strtok((char*)args, " "); + char* flags_text = strtok(NULL, " "); + if(!icon_text || !flags_text) + return false; + + uint32 icon = atol(icon_text); + if ( icon < 0 ) + icon = 0; + + uint32 flags = atol(flags_text); + + sLog.outDetail("Command : POI, NPC = %u, icon = %u flags = %u", target->GetGUIDLow(), icon,flags); + pPlayer->PlayerTalkClass->SendPointOfInterest(target->GetPositionX(), target->GetPositionY(), Poi_Icon(icon), flags, 30, "Test POI"); + return true; +} + +bool ChatHandler::HandleEquipErrorCommand(const char* args) +{ + if(!args) + return false; + + uint8 msg = atoi(args); + m_session->GetPlayer()->SendEquipError(msg, 0, 0); + return true; +} + +bool ChatHandler::HandleSellErrorCommand(const char* args) +{ + if(!args) + return false; + + uint8 msg = atoi(args); + m_session->GetPlayer()->SendSellError(msg, 0, 0, 0); + return true; +} + +bool ChatHandler::HandleBuyErrorCommand(const char* args) +{ + if(!args) + return false; + + uint8 msg = atoi(args); + m_session->GetPlayer()->SendBuyError(msg, 0, 0, 0); + return true; +} + +bool ChatHandler::HandleSendOpcodeCommand(const char* /*args*/) +{ + Unit *unit = getSelectedUnit(); + if (!unit || (unit->GetTypeId() != TYPEID_PLAYER)) + unit = m_session->GetPlayer(); + + std::ifstream ifs("opcode.txt"); + if(ifs.bad()) + return false; + + uint32 opcode; + ifs >> opcode; + + WorldPacket data(opcode, 0); + + while(!ifs.eof()) + { + std::string type; + ifs >> type; + + if(type == "") + break; + + if(type == "uint8") + { + uint16 val1; + ifs >> val1; + data << uint8(val1); + } + else if(type == "uint16") + { + uint16 val2; + ifs >> val2; + data << val2; + } + else if(type == "uint32") + { + uint32 val3; + ifs >> val3; + data << val3; + } + else if(type == "uint64") + { + uint64 val4; + ifs >> val4; + data << val4; + } + else if(type == "float") + { + float val5; + ifs >> val5; + data << val5; + } + else if(type == "string") + { + std::string val6; + ifs >> val6; + data << val6; + } + else if(type == "pguid") + { + data.append(unit->GetPackGUID()); + } + else + { + sLog.outDebug("Sending opcode: unknown type '%s'", type.c_str()); + break; + } + } + ifs.close(); + sLog.outDebug("Sending opcode %u", data.GetOpcode()); + data.hexlike(); + ((Player*)unit)->GetSession()->SendPacket(&data); + PSendSysMessage(LANG_COMMAND_OPCODESENT, data.GetOpcode(), unit->GetName()); + return true; +} + +bool ChatHandler::HandleUpdateWorldStateCommand(const char* args) +{ + char* w = strtok((char*)args, " "); + char* s = strtok(NULL, " "); + + if (!w || !s) + return false; + + uint32 world = (uint32)atoi(w); + uint32 state = (uint32)atoi(s); + m_session->GetPlayer()->SendUpdateWorldState(world, state); + return true; +} + +bool ChatHandler::HandlePlaySound2Command(const char* args) +{ + if(!args) + return false; + + uint32 soundid = atoi(args); + m_session->GetPlayer()->PlaySound(soundid, false); + return true; +} + +//Send notification in channel +bool ChatHandler::HandleSendChannelNotifyCommand(const char* args) +{ + if(!args) + return false; + + const char *name = "test"; + uint8 code = atoi(args); + + WorldPacket data(SMSG_CHANNEL_NOTIFY, (1+10)); + data << code; // notify type + data << name; // channel name + data << uint32(0); + data << uint32(0); + m_session->SendPacket(&data); + return true; +} + +//Send notification in chat +bool ChatHandler::HandleSendChatMsgCommand(const char* args) +{ + if(!args) + return false; + + const char *msg = "testtest"; + uint8 type = atoi(args); + WorldPacket data; + ChatHandler::FillMessageData(&data, m_session, type, 0, "chan", m_session->GetPlayer()->GetGUID(), msg, m_session->GetPlayer()); + m_session->SendPacket(&data); + return true; +} + +bool ChatHandler::HandleSendQuestPartyMsgCommand(const char* args) +{ + uint32 msg = atol((char*)args); + if (msg >= 0) + m_session->GetPlayer()->SendPushToPartyResponse(m_session->GetPlayer(), msg); + return true; +} + +bool ChatHandler::HandleGetLootRecipient(const char* /*args*/) +{ + Creature* target = getSelectedCreature(); + if(!target) + return false; + + PSendSysMessage("loot recipient: %s", target->hasLootRecipient()?(target->GetLootRecipient()?target->GetLootRecipient()->GetName():"offline"):"no loot recipient"); + return true; +} + +bool ChatHandler::HandleSendQuestInvalidMsgCommand(const char* args) +{ + uint32 msg = atol((char*)args); + if (msg >= 0) + m_session->GetPlayer()->SendCanTakeQuestResponse(msg); + return true; +} + +bool ChatHandler::HandleGetItemState(const char* args) +{ + if (!args) + return false; + + std::string state_str = args; + + ItemUpdateState state = ITEM_UNCHANGED; + bool list_queue = false, check_all = false; + if (state_str == "unchanged") state = ITEM_UNCHANGED; + else if (state_str == "changed") state = ITEM_CHANGED; + else if (state_str == "new") state = ITEM_NEW; + else if (state_str == "removed") state = ITEM_REMOVED; + else if (state_str == "queue") list_queue = true; + else if (state_str == "check_all") check_all = true; + else return false; + + Player* player = getSelectedPlayer(); + if (!player) player = m_session->GetPlayer(); + + if (!list_queue && !check_all) + { + state_str = "The player has the following " + state_str + " items: "; + SendSysMessage(state_str.c_str()); + for (uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; i++) + { + if(i >= BUYBACK_SLOT_START && i < BUYBACK_SLOT_END) + continue; + + Item *item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i); + if (!item) continue; + if (!item->IsBag()) + { + if (item->GetState() == state) + PSendSysMessage("bag: 255 slot: %d guid: %d owner: %d", item->GetSlot(), item->GetGUIDLow(), GUID_LOPART(item->GetOwnerGUID())); + } + else + { + Bag *bag = (Bag*)item; + for (uint8 j = 0; j < bag->GetBagSize(); ++j) + { + Item* item = bag->GetItemByPos(j); + if (item && item->GetState() == state) + PSendSysMessage("bag: 255 slot: %d guid: %d owner: %d", item->GetSlot(), item->GetGUIDLow(), GUID_LOPART(item->GetOwnerGUID())); + } + } + } + } + + if (list_queue) + { + std::vector &updateQueue = player->GetItemUpdateQueue(); + for(size_t i = 0; i < updateQueue.size(); i++) + { + Item *item = updateQueue[i]; + if(!item) continue; + + Bag *container = item->GetContainer(); + uint8 bag_slot = container ? container->GetSlot() : uint8(INVENTORY_SLOT_BAG_0); + + std::string st; + switch(item->GetState()) + { + case ITEM_UNCHANGED: st = "unchanged"; break; + case ITEM_CHANGED: st = "changed"; break; + case ITEM_NEW: st = "new"; break; + case ITEM_REMOVED: st = "removed"; break; + } + + PSendSysMessage("bag: %d slot: %d guid: %d - state: %s", bag_slot, item->GetSlot(), item->GetGUIDLow(), st.c_str()); + } + if (updateQueue.empty()) + PSendSysMessage("updatequeue empty"); + } + + if (check_all) + { + bool error = false; + std::vector &updateQueue = player->GetItemUpdateQueue(); + for (uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; i++) + { + if(i >= BUYBACK_SLOT_START && i < BUYBACK_SLOT_END) + continue; + + Item *item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i); + if (!item) continue; + + if (item->GetSlot() != i) + { + PSendSysMessage("item at slot %d, guid %d has an incorrect slot value: %d", i, item->GetGUIDLow(), item->GetSlot()); + error = true; continue; + } + + if (item->GetOwnerGUID() != player->GetGUID()) + { + PSendSysMessage("for the item at slot %d and itemguid %d, owner's guid (%d) and player's guid (%d) don't match!", item->GetSlot(), item->GetGUIDLow(), GUID_LOPART(item->GetOwnerGUID()), player->GetGUIDLow()); + error = true; continue; + } + + if (Bag *container = item->GetContainer()) + { + PSendSysMessage("item at slot: %d guid: %d has a container (slot: %d, guid: %d) but shouldnt!", item->GetSlot(), item->GetGUIDLow(), container->GetSlot(), container->GetGUIDLow()); + error = true; continue; + } + + if (item->IsInUpdateQueue()) + { + uint16 qp = item->GetQueuePos(); + if (qp > updateQueue.size()) + { + PSendSysMessage("item at slot: %d guid: %d has a queuepos (%d) larger than the update queue size! ", item->GetSlot(), item->GetGUIDLow(), qp); + error = true; continue; + } + + if (updateQueue[qp] == NULL) + { + PSendSysMessage("item at slot: %d guid: %d has a queuepos (%d) that points to NULL in the queue!", item->GetSlot(), item->GetGUIDLow(), qp); + error = true; continue; + } + + if (updateQueue[qp] != item) + { + PSendSysMessage("item at slot: %d guid: %d has has a queuepos (%d) that points to another item in the queue (bag: %d, slot: %d, guid: %d)", item->GetSlot(), item->GetGUIDLow(), qp, updateQueue[qp]->GetBagSlot(), updateQueue[qp]->GetSlot(), updateQueue[qp]->GetGUIDLow()); + error = true; continue; + } + } + else if (item->GetState() != ITEM_UNCHANGED) + { + PSendSysMessage("item at slot: %d guid: %d is not in queue but should be (state: %d)!", item->GetSlot(), item->GetGUIDLow(), item->GetState()); + error = true; continue; + } + + if(item->IsBag()) + { + Bag *bag = (Bag*)item; + for (uint8 j = 0; j < bag->GetBagSize(); ++j) + { + Item* item = bag->GetItemByPos(j); + if (!item) continue; + + if (item->GetSlot() != j) + { + PSendSysMessage("the item in bag %d slot %d, guid %d has an incorrect slot value: %d", bag->GetSlot(), j, item->GetGUIDLow(), item->GetSlot()); + error = true; continue; + } + + if (item->GetOwnerGUID() != player->GetGUID()) + { + PSendSysMessage("for the item in bag %d at slot %d and itemguid %d, owner's guid (%d) and player's guid (%d) don't match!", bag->GetSlot(), item->GetSlot(), item->GetGUIDLow(), GUID_LOPART(item->GetOwnerGUID()), player->GetGUIDLow()); + error = true; continue; + } + + Bag *container = item->GetContainer(); + if (!container) + { + PSendSysMessage("the item in bag %d at slot %d with guid %d has no container!", bag->GetSlot(), item->GetSlot(), item->GetGUIDLow()); + error = true; continue; + } + + if (container != bag) + { + PSendSysMessage("the item in bag %d at slot %d with guid %d has a different container(slot %d guid %d)!", bag->GetSlot(), item->GetSlot(), item->GetGUIDLow(), container->GetSlot(), container->GetGUIDLow()); + error = true; continue; + } + + if (item->IsInUpdateQueue()) + { + uint16 qp = item->GetQueuePos(); + if (qp > updateQueue.size()) + { + PSendSysMessage("item in bag: %d at slot: %d guid: %d has a queuepos (%d) larger than the update queue size! ", bag->GetSlot(), item->GetSlot(), item->GetGUIDLow(), qp); + error = true; continue; + } + + if (updateQueue[qp] == NULL) + { + PSendSysMessage("item in bag: %d at slot: %d guid: %d has a queuepos (%d) that points to NULL in the queue!", bag->GetSlot(), item->GetSlot(), item->GetGUIDLow(), qp); + error = true; continue; + } + + if (updateQueue[qp] != item) + { + PSendSysMessage("item in bag: %d at slot: %d guid: %d has has a queuepos (%d) that points to another item in the queue (bag: %d, slot: %d, guid: %d)", bag->GetSlot(), item->GetSlot(), item->GetGUIDLow(), qp, updateQueue[qp]->GetBagSlot(), updateQueue[qp]->GetSlot(), updateQueue[qp]->GetGUIDLow()); + error = true; continue; + } + } + else if (item->GetState() != ITEM_UNCHANGED) + { + PSendSysMessage("item in bag: %d at slot: %d guid: %d is not in queue but should be (state: %d)!", bag->GetSlot(), item->GetSlot(), item->GetGUIDLow(), item->GetState()); + error = true; continue; + } + } + } + } + + for(size_t i = 0; i < updateQueue.size(); i++) + { + Item *item = updateQueue[i]; + if(!item) continue; + + if (item->GetOwnerGUID() != player->GetGUID()) + { + PSendSysMessage("queue(%d): for the an item (guid %d), the owner's guid (%d) and player's guid (%d) don't match!", i, item->GetGUIDLow(), GUID_LOPART(item->GetOwnerGUID()), player->GetGUIDLow()); + error = true; continue; + } + + if (item->GetQueuePos() != i) + { + PSendSysMessage("queue(%d): for the an item (guid %d), the queuepos doesn't match it's position in the queue!", i, item->GetGUIDLow()); + error = true; continue; + } + + if (item->GetState() == ITEM_REMOVED) continue; + Item *test = player->GetItemByPos( item->GetBagSlot(), item->GetSlot()); + + if (test == NULL) + { + PSendSysMessage("queue(%d): the bag(%d) and slot(%d) values for the item with guid %d are incorrect, the player doesn't have an item at that position!", i, item->GetBagSlot(), item->GetSlot(), item->GetGUIDLow()); + error = true; continue; + } + + if (test != item) + { + PSendSysMessage("queue(%d): the bag(%d) and slot(%d) values for the item with guid %d are incorrect, the item with guid %d is there instead!", i, item->GetBagSlot(), item->GetSlot(), item->GetGUIDLow(), test->GetGUIDLow()); + error = true; continue; + } + } + if (!error) + SendSysMessage("All OK!"); + } + + return true; +} + +bool ChatHandler::HandleDebugArenaCommand(const char * /*args*/) +{ + sBattleGroundMgr.ToggleArenaTesting(); + return true; +} + +bool ChatHandler::HandleDebugThreatList(const char * /*args*/) +{ + Creature* target = getSelectedCreature(); + if(!target || target->isTotem() || target->isPet()) + return false; + + std::list& tlist = target->getThreatManager().getThreatList(); + std::list::iterator itr; + uint32 cnt = 0; + PSendSysMessage("Threat list of %s (guid %u)",target->GetName(), target->GetGUIDLow()); + for(itr = tlist.begin(); itr != tlist.end(); ++itr) + { + Unit* unit = (*itr)->getTarget(); + if(!unit) + continue; + ++cnt; + PSendSysMessage(" %u. %s (guid %u) - threat %f",cnt,unit->GetName(), unit->GetGUIDLow(), (*itr)->getThreat()); + } + SendSysMessage("End of threat list."); + return true; +} + +bool ChatHandler::HandleDebugHostilRefList(const char * /*args*/) +{ + Unit* target = getSelectedUnit(); + if(!target) + target = m_session->GetPlayer(); + HostilReference* ref = target->getHostilRefManager().getFirst(); + uint32 cnt = 0; + PSendSysMessage("Hostil reference list of %s (guid %u)",target->GetName(), target->GetGUIDLow()); + while(ref) + { + if(Unit * unit = ref->getSource()->getOwner()) + { + ++cnt; + PSendSysMessage(" %u. %s (guid %u) - threat %f",cnt,unit->GetName(), unit->GetGUIDLow(), ref->getThreat()); + } + ref = ref->next(); + } + SendSysMessage("End of hostil reference list."); + return true; +} diff --git a/src/game/Tools.cpp b/src/game/Tools.cpp new file mode 100644 index 00000000000..7abc016df48 --- /dev/null +++ b/src/game/Tools.cpp @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2005-2008 MaNGOS + * + * Copyright (C) 2008 Trinity + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "Tools.h" + +// THIS CAN BE A LOT FASTER +bool readGUID(WorldPacket & data, uint64& guid) +{ + if(data.rpos()+1 > data.size()) + return false; + + uint8 guidmark=0; + uint8 bit; + uint8 shiftdata=0x1; + uint64 Temp=0; + + guid = 0; + + data >> guidmark; + for(int i=0;i<8;i++) + { + if(guidmark & shiftdata) + { + Temp = 0; + + if(data.rpos()+1 > data.size()) + return false; + + data >> bit; + Temp = bit; + Temp <<= i*8; + guid |= Temp; + } + shiftdata=shiftdata<<1; + } + + return true; +} + +void writeGUID(WorldPacket & data, uint64 & guid) +{ + uint8 RAWmask = 0; + uint8 PackedGuid[8] = {0,0,0,0,0,0,0,0}; + + int j = 1; + uint8 * test = (uint8*)&guid; + + if (*test) + { + PackedGuid[j] = *test; + RAWmask |= 1; + ++j; + } + if (*(test+1)) + { + PackedGuid[j] = *(test+1); + RAWmask |= 2; + ++j; + } + if (*(test+2)) + { + PackedGuid[j] = *(test+2); + RAWmask |= 4; + ++j; + } + if (*(test+3)) + { + PackedGuid[j] = *(test+3); + RAWmask |= 8; + ++j; + } + if (*(test+4)) + { + PackedGuid[j] = *(test+4); + RAWmask |= 16; + ++j; + } + if (*(test+5)) + { + PackedGuid[j] = *(test+5); + RAWmask |= 32; + ++j; + } + if (*(test+6)) + { + PackedGuid[j] = *(test+6); + RAWmask |= 64; + ++j; + } + if (*(test+7)) + { + PackedGuid[j] = *(test+7); + RAWmask |= 128; + ++j; + } + PackedGuid[0] = RAWmask; + + data.append(PackedGuid,j); +} From ee65a34544a62c19a62b75822672ea88788a8afc Mon Sep 17 00:00:00 2001 From: QAston Date: Wed, 4 Feb 2009 19:43:00 +0100 Subject: [PATCH 3/4] *Implement stealth detection for traps. --HG-- branch : trunk --- src/game/GameObject.cpp | 26 +++++++++++++++++++++++--- src/game/GameObject.h | 1 + 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index ade00dd4d8f..6b7b2046adf 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -718,12 +718,11 @@ bool GameObject::isVisibleForInState(Player const* u, bool inVisibleList) const return false; // special invisibility cases - /* TODO: implement trap stealth, take look at spell 2836 if(GetGOInfo()->type == GAMEOBJECT_TYPE_TRAP && GetGOInfo()->trap.stealthed && u->IsHostileTo(GetOwner())) { - if(check stuff here) + if(!canDetectTrap(u, GetDistance(u))) return false; - }*/ + } // Smuggled Mana Cell required 10 invisibility type detection/state if(GetEntry()==187039 && ((u->m_detectInvisibilityMask | u->m_invisibilityMask) & (1<<10))==0) @@ -735,6 +734,27 @@ bool GameObject::isVisibleForInState(Player const* u, bool inVisibleList) const (inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false); } +bool GameObject::canDetectTrap(Player const* u, float distance) const +{ + if(u->hasUnitState(UNIT_STAT_STUNNED)) + return false; + if(distance < GetGOInfo()->size) //collision + return true; + if(!u->HasInArc(M_PI, this)) //behind + return false; + if(u->HasAuraType(SPELL_AURA_DETECT_STEALTH)) + return true; + + //Visible distance is modified by -Level Diff (every level diff = 0.25f in visible distance) + float visibleDistance = (int32(u->getLevel()) - int32(GetOwner()->getLevel()))* 0.25f; + //GetModifier for trap (miscvalue 1) + //35y for aura 2836 + //WARNING: these values are guessed, may be not blizzlike + visibleDistance += u->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DETECT, 1)* 0.5f; + + return distance < visibleDistance; +} + void GameObject::Respawn() { if(m_spawnedByDefault && m_respawnTime > 0) diff --git a/src/game/GameObject.h b/src/game/GameObject.h index afeaba98cc9..3b837a0550c 100644 --- a/src/game/GameObject.h +++ b/src/game/GameObject.h @@ -571,6 +571,7 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject void TriggeringLinkedGameObject( uint32 trapEntry, Unit* target); bool isVisibleForInState(Player const* u, bool inVisibleList) const; + bool canDetectTrap(Player const* u, float distance) const; GameObject* LookupFishingHoleAround(float range); From ae5e608c00bde11f8c1178b3f1f07bab4f855272 Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 4 Feb 2009 16:30:20 -0600 Subject: [PATCH 4/4] *Fix a crash bug in the previous rev. --HG-- branch : trunk --- src/game/GameObject.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 6b7b2046adf..b7487568e62 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -718,9 +718,10 @@ bool GameObject::isVisibleForInState(Player const* u, bool inVisibleList) const return false; // special invisibility cases - if(GetGOInfo()->type == GAMEOBJECT_TYPE_TRAP && GetGOInfo()->trap.stealthed && u->IsHostileTo(GetOwner())) + if(GetGOInfo()->type == GAMEOBJECT_TYPE_TRAP && GetGOInfo()->trap.stealthed) { - if(!canDetectTrap(u, GetDistance(u))) + Unit *owner = GetOwner(); + if(owner && u->IsHostileTo(owner) && !canDetectTrap(u, GetDistance(u))) return false; }