Changeset 207 for trunk

Timestamp:

11/19/08 13:46:22 (17 years ago)

Author:

yumileroy

Message:

[svn] * Improve some arena team related DB access
* Cache GM tickets on server startup.
* Remove unused src/game/HateMatrix.h and references.
* Better check client inventory pos data received in some client packets to
skip invalid cases

Original author: KingPin?
Date: 2008-11-10 09:04:23-06:00

Location:

trunk

Files:

• src/framework/Dynamic/ObjectRegistry.h (modified) (1 diff)
• src/game/ArenaTeam.cpp (modified) (2 diffs)
• src/game/Chat.h (modified) (1 diff)
• src/game/CreatureAI.cpp (modified) (1 diff)
• src/game/GMTicketHandler.cpp (added)
• src/game/GMTicketMgr.cpp (added)
• src/game/GMTicketMgr.h (added)
• src/game/HateMatrix.h (deleted)
• src/game/ItemHandler.cpp (modified) (4 diffs)
• src/game/Level2.cpp (modified) (11 diffs)
• src/game/Makefile.am (modified) (2 diffs)
• src/game/MiscHandler.cpp (modified) (1 diff)
• src/game/Object.h (modified) (1 diff)
• src/game/ObjectMgr.cpp (modified) (4 diffs)
• src/game/Pet.cpp (modified) (1 diff)
• src/game/PetitionsHandler.cpp (modified) (1 diff)
• src/game/Player.cpp (modified) (3 diffs)
• src/game/Player.h (modified) (1 diff)
• src/game/QueryHandler.cpp (modified) (2 diffs)
• src/game/QuestHandler.cpp (modified) (1 diff)
• src/game/SpellAuras.cpp (modified) (2 diffs)
• src/game/SpellEffects.cpp (modified) (5 diffs)
• src/game/SpellHandler.cpp (modified) (1 diff)
• src/game/Transports.cpp (modified) (1 diff)
• src/game/WaypointManager.cpp (modified) (1 diff)
• src/game/World.cpp (modified) (4 diffs)
• win/VC71/game.vcproj (modified) (1 diff)
• win/VC80/game.vcproj (modified) (1 diff)
• win/VC90/game.vcproj (modified) (1 diff)

trunk/src/framework/Dynamic/ObjectRegistry.h

@@ -27 +27 @@
 
 #include <string>
+#include <vector>
 #include <map>
 

trunk/src/game/ArenaTeam.cpp

@@ -91 +91 @@
     uint8 plClass;
 
+    // arena team is full (can't have more than type * 2 players!)
     if(GetMembersSize() >= GetType() * 2)
-    {
-        // arena team is full (can't have more than type * 2 players!)
-        // return false
         return false;
-    }
-
-    if(!objmgr.GetPlayerNameByGUID(PlayerGuid, plName))     // player doesnt exist
-        return false;
-                                                            // player already in arenateam of that size
-    if(Player::GetArenaTeamIdFromDB(PlayerGuid, GetType()) != 0)
-    {
-        sLog.outError("Arena::AddMember() : player already in this sized team");
-        return false;
+
+    Player *pl = objmgr.GetPlayer(PlayerGuid);
+    if(pl)
+    {
+        if(pl->GetArenaTeamId(GetType()))
+        {
+            sLog.outError("Arena::AddMember() : player already in this sized team");
+            return false;
+        }
+
+        plClass = (uint8)pl->getClass();
+        plName = pl->GetName();
+    }
+    else
+    {
+        //                                                     0     1
+        QueryResult *result = CharacterDatabase.PQuery("SELECT name, class FROM characters WHERE guid='%u'", GUID_LOPART(PlayerGuid));
+        if(!result)
+            return false;
+
+        plName = (*result)[0].GetCppString();
+        plClass = (*result)[1].GetUInt8();
+        delete result;
+
+        // check if player already in arenateam of that size
+        if(Player::GetArenaTeamIdFromDB(PlayerGuid, GetType()) != 0)
+        {
+            sLog.outError("Arena::AddMember() : player already in this sized team");
+            return false;
+        }
     }
 
@@ -110 +129 @@
     // this will be prevent attempt joining player to many arenateams and corrupt arena team data integrity
     Player::RemovePetitionsAndSigns(PlayerGuid, GetType());
-
-    Player *pl = objmgr.GetPlayer(PlayerGuid);
-    if(pl)
-    {
-        plClass = (uint8)pl->getClass();
-    }
-    else
-    {
-        QueryResult *result = CharacterDatabase.PQuery("SELECT class FROM characters WHERE guid='%u'", GUID_LOPART(PlayerGuid));
-        if(!result)
-            return false;
-        plClass = (*result)[0].GetUInt8();
-        delete result;
-    }
 
     ArenaTeamMember newmember;

trunk/src/game/Chat.h

@@ -466 +466 @@
         // Utility methods for commands
         void ShowTicket(uint64 guid, char const* text, char const* time);
-        uint32 GetTicketIDByNum(uint32 num);
         bool LookupPlayerSearchCommand(QueryResult* result, int32 limit);
                 bool HandleBanListHelper(QueryResult* result);

trunk/src/game/CreatureAI.cpp

@@ -20 +20 @@
 
 #include "CreatureAI.h"
-#include "HateMatrix.h"
 
 CreatureAI::~CreatureAI()
 {
 }
-
-uint32 HateBinder::si_noHateValue=0;

trunk/src/game/ItemHandler.cpp

@@ -50 +50 @@
         return;                                             //check count - if zero it's fake packet
 
+    if(!_player->IsValidPos(srcbag,srcslot))
+    {
+        _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
+        return;
+    }
+
+    if(!_player->IsValidPos(dstbag,dstslot))
+    {
+        _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
+        return;
+    }
+
     _player->SplitItem( src, dst, count );
 }
@@ -66 +78 @@
     if(srcslot==dstslot)
         return;
+
+    if(!_player->IsValidPos(INVENTORY_SLOT_BAG_0,srcslot))
+    {
+        _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
+        return;
+    }
+
+    if(!_player->IsValidPos(INVENTORY_SLOT_BAG_0,dstslot))
+    {
+        _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
+        return;
+    }
 
     uint16 src = ( (INVENTORY_SLOT_BAG_0 << 8) | srcslot );
@@ -109 +133 @@
     if(src==dst)
         return;
+
+    if(!_player->IsValidPos(srcbag,srcslot))
+    {
+        _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
+        return;
+    }
+
+    if(!_player->IsValidPos(dstbag,dstslot))
+    {
+        _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
+        return;
+    }
 
     _player->SwapItem( src, dst );
@@ -747 +783 @@
         return;
 
+    if(!_player->IsValidPos(dstbag,NULL_SLOT))
+    {
+        _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
+        return;
+    }
+
     uint16 src = pItem->GetPos();
 

trunk/src/game/Level2.cpp

@@ -37 +37 @@
 #include "SpellMgr.h"
 #include "AccountMgr.h"
+#include "GMTicketMgr.h"
 #include "WaypointManager.h"
 #include "Util.h"
@@ -863 +864 @@
     if(srcslot==dstslot)
         return true;
-        
+
+    if(!m_session->GetPlayer()->IsValidPos(INVENTORY_SLOT_BAG_0,srcslot))
+        return false;
+
+    if(!m_session->GetPlayer()->IsValidPos(INVENTORY_SLOT_BAG_0,dstslot))
+        return false;
+
     uint16 src = ((INVENTORY_SLOT_BAG_0 << 8) | srcslot);
     uint16 dst = ((INVENTORY_SLOT_BAG_0 << 8) | dstslot);
@@ -1796 +1803 @@
     else
     {
-        QueryResult *result = CharacterDatabase.PQuery("SELECT totaltime FROM characters WHERE guid = '%u'", targetGUID);
+        QueryResult *result = CharacterDatabase.PQuery("SELECT totaltime FROM characters WHERE guid = '%u'", GUID_LOPART(targetGUID));
         if (!result)
         {
@@ -1921 +1928 @@
                 }
 
-        size_t count;
-        QueryResult *result = CharacterDatabase.Query("SELECT COUNT(ticket_id) FROM character_ticket");
-        if(result)
-        {
-            count = (*result)[0].GetUInt32();
-            delete result;
-        }
-        else
-            count = 0;
+        size_t count = ticketmgr.GetTicketCount();
 
         bool accept = m_session->GetPlayer()->isAcceptTickets();
@@ -1976 +1975 @@
         {
             PSendSysMessage(LANG_COMMAND_TICKENOTEXIST, num);
-            delete result;
             SetSentErrorMessage(true);
             return false;
@@ -1983 +1981 @@
         Field* fields = result->Fetch();
 
-        uint64 guid = fields[0].GetUInt64();
+        uint32 guid = fields[0].GetUInt32();
         char const* text = fields[1].GetString();
         char const* time = fields[2].GetString();
 
-        ShowTicket(guid,text,time);
+        ShowTicket(MAKE_NEW_GUID(guid, 0, HIGHGUID_PLAYER),text,time);
         delete result;
         return true;
@@ -2007 +2005 @@
 
     // ticket $char_name
-    QueryResult *result = CharacterDatabase.PQuery("SELECT ticket_text,ticket_lastchange FROM character_ticket WHERE guid = '%u' ORDER BY ticket_id ASC",GUID_LOPART(guid));
-
-    if(!result)
-        return false;
-
-    Field* fields = result->Fetch();
-
-    char const* text = fields[0].GetString();
-    char const* time = fields[1].GetString();
-
-    ShowTicket(guid,text,time);
-    delete result;
-
-    return true;
-}
-
-uint32 ChatHandler::GetTicketIDByNum(uint32 num)
-{
-    QueryResult *result = CharacterDatabase.Query("SELECT ticket_id FROM character_ticket");
-
-    if(!result || num > result->GetRowCount())
-    {
-        PSendSysMessage(LANG_COMMAND_TICKENOTEXIST, num);
-        delete result;
-        return 0;
-    }
-
-    for(uint32 i = 1; i < num; ++i)
-        result->NextRow();
-
-    Field* fields = result->Fetch();
-
-    uint32 id = fields[0].GetUInt32();
-    delete result;
-    return id;
+    GMTicket* ticket = ticketmgr.GetGMTicket(GUID_LOPART(guid));
+    if(!ticket)
+        return false;
+
+    std::string time = TimeToTimestampStr(ticket->GetLastUpdate());
+
+    ShowTicket(guid, ticket->GetText(), time.c_str());
+
+    return true;
 }
 
@@ -2054 +2026 @@
     if(strncmp(px,"all",4) == 0)
     {
-        QueryResult *result = CharacterDatabase.Query("SELECT guid FROM character_ticket");
-
-        if(!result)
-            return true;
-
-        // notify players about ticket deleting
-        do
-        {
-            Field* fields = result->Fetch();
-
-            uint64 guid = fields[0].GetUInt64();
-
-            if(Player* sender = objmgr.GetPlayer(guid))
-                sender->GetSession()->SendGMTicketGetTicket(0x0A,0);
-
-        }while(result->NextRow());
-
-        delete result;
-
-        CharacterDatabase.PExecute("DELETE FROM character_ticket");
+        ticketmgr.DeleteAll();
         SendSysMessage(LANG_COMMAND_ALLTICKETDELETED);
         return true;
@@ -2083 +2036 @@
     if(num > 0)
     {
-        QueryResult *result = CharacterDatabase.PQuery("SELECT ticket_id,guid FROM character_ticket ORDER BY ticket_id ASC "_OFFSET_,num-1);
-
+        QueryResult* result = CharacterDatabase.PQuery("SELECT guid FROM character_ticket ORDER BY ticket_id ASC "_OFFSET_,num-1);
         if(!result)
         {
             PSendSysMessage(LANG_COMMAND_TICKENOTEXIST, num);
-            delete result;
             SetSentErrorMessage(true);
             return false;
@@ -2095 +2046 @@
         Field* fields = result->Fetch();
 
-        uint32 id   = fields[0].GetUInt32();
-        uint64 guid = fields[1].GetUInt64();
+        uint32 guid = fields[0].GetUInt32();
         delete result;
 
-        CharacterDatabase.PExecute("DELETE FROM character_ticket WHERE ticket_id = '%u'", id);
-
-        // notify players about ticket deleting
-        if(Player* sender = objmgr.GetPlayer(guid))
-        {
-            sender->GetSession()->SendGMTicketGetTicket(0x0A,0);
-            PSendSysMessage(LANG_COMMAND_TICKETPLAYERDEL,sender->GetName());
+        ticketmgr.Delete(guid);
+
+        //notify player
+        if(Player* pl = objmgr.GetPlayer(MAKE_NEW_GUID(guid, 0, HIGHGUID_PLAYER)))
+        {
+            pl->GetSession()->SendGMTicketGetTicket(0x0A, 0);
+            PSendSysMessage(LANG_COMMAND_TICKETPLAYERDEL, pl->GetName());
         }
         else
-            SendSysMessage(LANG_COMMAND_TICKETDEL);
+            PSendSysMessage(LANG_COMMAND_TICKETDEL);
 
         return true;
@@ -2128 +2078 @@
 
     // delticket $char_name
-    CharacterDatabase.PExecute("DELETE FROM character_ticket WHERE guid = '%u'",GUID_LOPART(guid));
+    ticketmgr.Delete(GUID_LOPART(guid));
 
     // notify players about ticket deleting

trunk/src/game/Makefile.am

@@ -115 +115 @@
 $(srcdir)/GlobalEvents.cpp \
 $(srcdir)/GlobalEvents.h \
+$(srcdir)/GMTicketHandler.cpp \
+$(srcdir)/GMTicketMgr.cpp \
+$(srcdir)/GMTicketMgr.h \
 $(srcdir)/GossipDef.cpp \
 $(srcdir)/GossipDef.h \
@@ -131 +134 @@
 $(srcdir)/Guild.h \
 $(srcdir)/GuildHandler.cpp \
-$(srcdir)/HateMatrix.h \
 $(srcdir)/HomeMovementGenerator.cpp \
 $(srcdir)/HomeMovementGenerator.h \

trunk/src/game/MiscHandler.cpp

@@ -361 +361 @@
 }
 
-void WorldSession::SendGMTicketGetTicket(uint32 status, char const* text)
-{
-    int len = text ? strlen(text) : 0;
-    WorldPacket data( SMSG_GMTICKET_GETTICKET, (4+len+1+4+2+4+4) );
-    data << uint32(status);                                 // standard 0x0A, 0x06 if text present
-    if(status == 6)
-    {
-        data << text;                                       // ticket text
-        data << uint8(0x7);                                 // ticket category
-        data << float(0);                                   // time from ticket creation?
-        data << float(0);                                   // const
-        data << float(0);                                   // const
-        data << uint8(0);                                   // const
-        data << uint8(0);                                   // const
-    }
-    SendPacket( &data );
-}
-
-void WorldSession::HandleGMTicketGetTicketOpcode( WorldPacket & /*recv_data*/ )
-{
-    WorldPacket data( SMSG_QUERY_TIME_RESPONSE, 4+4 );
-    data << (uint32)time(NULL);
-    data << (uint32)0;
-    SendPacket( &data );
-
-    uint64 guid;
-    Field *fields;
-    guid = GetPlayer()->GetGUID();
-
-    QueryResult *result = CharacterDatabase.PQuery("SELECT COUNT(ticket_id) FROM character_ticket WHERE guid = '%u'", GUID_LOPART(guid));
-
-    if (result)
-    {
-        int cnt;
-        fields = result->Fetch();
-        cnt = fields[0].GetUInt32();
-        delete result;
-
-        if ( cnt > 0 )
-        {
-            QueryResult *result2 = CharacterDatabase.PQuery("SELECT ticket_text FROM character_ticket WHERE guid = '%u'", GUID_LOPART(guid));
-            if(result2)
-            {
-                Field *fields2 = result2->Fetch();
-                SendGMTicketGetTicket(0x06,fields2[0].GetString());
-                delete result2;
-            }
-        }
-        else
-            SendGMTicketGetTicket(0x0A,0);
-    }
-}
-
-void WorldSession::HandleGMTicketUpdateTextOpcode( WorldPacket & recv_data )
-{
-    CHECK_PACKET_SIZE(recv_data,1);
-
-    std::string ticketText;
-    recv_data >> ticketText;
-
-    CharacterDatabase.escape_string(ticketText);
-    CharacterDatabase.PExecute("UPDATE character_ticket SET ticket_text = '%s' WHERE guid = '%u'", ticketText.c_str(), _player->GetGUIDLow());
-}
-
-void WorldSession::HandleGMTicketDeleteOpcode( WorldPacket & /*recv_data*/ )
-{
-    uint32 guid = GetPlayer()->GetGUIDLow();
-
-    CharacterDatabase.PExecute("DELETE FROM character_ticket WHERE guid = '%u' LIMIT 1",guid);
-
-    WorldPacket data( SMSG_GMTICKET_DELETETICKET, 4 );
-    data << uint32(9);
-    SendPacket( &data );
-
-    SendGMTicketGetTicket(0x0A, 0);
-}
-
-void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data )
-{
-    CHECK_PACKET_SIZE(recv_data, 4*4+1+2*4);
-
-    uint32 map;
-    float x, y, z;
-    std::string ticketText = "";
-    uint32 unk1, unk2;
-
-    recv_data >> map >> x >> y >> z;                        // last check 2.4.3
-    recv_data >> ticketText;
-
-    // recheck
-    CHECK_PACKET_SIZE(recv_data,4*4+(ticketText.size()+1)+2*4);
-
-    recv_data >> unk1 >> unk2;
-    // note: the packet might contain more data, but the exact structure of that is unknown
-
-    sLog.outDebug("TicketCreate: map %u, x %f, y %f, z %f, text %s, unk1 %u, unk2 %u", map, x, y, z, ticketText.c_str(), unk1, unk2);
-
-    CharacterDatabase.escape_string(ticketText);
-
-    QueryResult *result = CharacterDatabase.PQuery("SELECT COUNT(*) FROM character_ticket WHERE guid = '%u'", _player->GetGUIDLow());
-
-    if (result)
-    {
-        int cnt;
-        Field *fields = result->Fetch();
-        cnt = fields[0].GetUInt32();
-        delete result;
-
-        if ( cnt > 0 )
-        {
-            WorldPacket data( SMSG_GMTICKET_CREATE, 4 );
-            data << uint32(1);
-            SendPacket( &data );
-        }
-        else
-        {
-            CharacterDatabase.PExecute("INSERT INTO character_ticket (guid,ticket_text) VALUES ('%u', '%s')", _player->GetGUIDLow(), ticketText.c_str());
-
-            WorldPacket data( SMSG_QUERY_TIME_RESPONSE, 4+4 );
-            data << (uint32)time(NULL);
-            data << (uint32)0;
-            SendPacket( &data );
-
-            data.Initialize( SMSG_GMTICKET_CREATE, 4 );
-            data << uint32(2);
-            SendPacket( &data );
-            DEBUG_LOG("update the ticket\n");
-
-            //TODO: Guard player map
-            HashMapHolder<Player>::MapType &m = ObjectAccessor::Instance().GetPlayers();
-            for(HashMapHolder<Player>::MapType::iterator itr = m.begin(); itr != m.end(); ++itr)
-            {
-                if(itr->second->GetSession()->GetSecurity() >= SEC_GAMEMASTER && itr->second->isAcceptTickets())
-                    ChatHandler(itr->second).PSendSysMessage(LANG_COMMAND_TICKETNEW,GetPlayer()->GetName());
-            }
-        }
-    }
-}
-
-void WorldSession::HandleGMTicketSystemStatusOpcode( WorldPacket & /*recv_data*/ )
-{
-    WorldPacket data( SMSG_GMTICKET_SYSTEMSTATUS,4 );
-    data << uint32(1);                                      // we can also disable ticket system by sending 0 value
-
-    SendPacket( &data );
-}
-
-void WorldSession::HandleGMSurveySubmit( WorldPacket & recv_data)
-{
-    // GM survey is shown after SMSG_GM_TICKET_STATUS_UPDATE with status = 3
-    CHECK_PACKET_SIZE(recv_data,4+4);
-    uint32 x;
-    recv_data >> x;                                         // answer range? (6 = 0-5?)
-    sLog.outDebug("SURVEY: X = %u", x);
-
-    uint8 result[10];
-    memset(result, 0, sizeof(result));
-    for( int i = 0; i < 10; ++i)
-    {
-        CHECK_PACKET_SIZE(recv_data,recv_data.rpos()+4);
-        uint32 questionID;
-        recv_data >> questionID;                            // GMSurveyQuestions.dbc
-        if (!questionID)
-            break;
-
-        CHECK_PACKET_SIZE(recv_data,recv_data.rpos()+1+1);
-        uint8 value;
-        std::string unk_text;
-        recv_data >> value;                                 // answer
-        recv_data >> unk_text;                              // always empty?
-
-        result[i] = value;
-        sLog.outDebug("SURVEY: ID %u, value %u, text %s", questionID, value, unk_text.c_str());
-    }
-
-    CHECK_PACKET_SIZE(recv_data,recv_data.rpos()+1);
-    std::string comment;
-    recv_data >> comment;                                   // addional comment
-    sLog.outDebug("SURVEY: comment %s", comment.c_str());
-
-    // TODO: chart this data in some way
-}
-
 void WorldSession::HandleTogglePvP( WorldPacket & recv_data )
 {

trunk/src/game/Object.h

@@ -34 +34 @@
 
 #define CONTACT_DISTANCE            0.5f
-#define INTERACTION_DISTANCE        5
-#define ATTACK_DISTANCE             5
-#define DETECT_DISTANCE             20                      // max distance to successful detect stealthed unit
+#define INTERACTION_DISTANCE        5.0f
+#define ATTACK_DISTANCE             5.0f
 #define MAX_VISIBILITY_DISTANCE  (5*SIZE_OF_GRID_CELL/2.0f) // max distance for visible object show, limited by active zone for player based at cell size (active zone = 5x5 cells)
 #define DEFAULT_VISIBILITY_DISTANCE (SIZE_OF_GRID_CELL)     // default visible distance

trunk/src/game/ObjectMgr.cpp

@@ -3901 +3901 @@
                 if(float(tmp.datalong2) > DEFAULT_VISIBILITY_DISTANCE)
                 {
-                    sLog.outErrorDb("Table `%s` has too large distance (%u) for exploring objective complete in `datalong2` in SCRIPT_COMMAND_QUEST_EXPLORED in `datalong` for script id %u",tablename,tmp.datalong2,tmp.id);
+                    sLog.outErrorDb("Table `%s` has too large distance (%u) for exploring objective complete in `datalong2` in SCRIPT_COMMAND_QUEST_EXPLORED in `datalong` for script id %u",
+                        tablename,tmp.datalong2,tmp.id);
                     continue;
                 }
@@ -3907 +3908 @@
                 if(tmp.datalong2 && float(tmp.datalong2) > DEFAULT_VISIBILITY_DISTANCE)
                 {
-                    sLog.outErrorDb("Table `%s` has too large distance (%u) for exploring objective complete in `datalong2` in SCRIPT_COMMAND_QUEST_EXPLORED in `datalong` for script id %u, max distance is %u or 0 for disable distance check",tablename,tmp.datalong2,tmp.id,uint32(DEFAULT_VISIBILITY_DISTANCE));
+                    sLog.outErrorDb("Table `%s` has too large distance (%u) for exploring objective complete in `datalong2` in SCRIPT_COMMAND_QUEST_EXPLORED in `datalong` for script id %u, max distance is %f or 0 for disable distance check",
+                        tablename,tmp.datalong2,tmp.id,DEFAULT_VISIBILITY_DISTANCE);
                     continue;
                 }
@@ -3913 +3915 @@
                 if(tmp.datalong2 && float(tmp.datalong2) < INTERACTION_DISTANCE)
                 {
-                    sLog.outErrorDb("Table `%s` has too small distance (%u) for exploring objective complete in `datalong2` in SCRIPT_COMMAND_QUEST_EXPLORED in `datalong` for script id %u, min distance is %u or 0 for disable distance check",tablename,tmp.datalong2,tmp.id,uint32(INTERACTION_DISTANCE));
+                    sLog.outErrorDb("Table `%s` has too small distance (%u) for exploring objective complete in `datalong2` in SCRIPT_COMMAND_QUEST_EXPLORED in `datalong` for script id %u, min distance is %f or 0 for disable distance check",
+                        tablename,tmp.datalong2,tmp.id,INTERACTION_DISTANCE);
                     continue;
                 }
@@ -3925 +3928 @@
                 if(!sSpellStore.LookupEntry(tmp.datalong))
                 {
-                    sLog.outErrorDb("Table `%s` using non-existent spell (id: %u) in SCRIPT_COMMAND_REMOVE_AURA or SCRIPT_COMMAND_CAST_SPELL for script id %u",tablename,tmp.datalong,tmp.id);
+                    sLog.outErrorDb("Table `%s` using non-existent spell (id: %u) in SCRIPT_COMMAND_REMOVE_AURA or SCRIPT_COMMAND_CAST_SPELL for script id %u",
+                        tablename,tmp.datalong,tmp.id);
                     continue;
                 }

trunk/src/game/Pet.cpp

@@ -936 +936 @@
     if(!IsPositionValid())
     {
-        sLog.outError("ERROR: Pet (guidlow %d, entry %d) not created base at creature. Suggested coordinates isn't valid (X: %d Y: ^%d)", GetGUIDLow(), GetEntry(), GetPositionX(), GetPositionY());
+        sLog.outError("ERROR: Pet (guidlow %d, entry %d) not created base at creature. Suggested coordinates isn't valid (X: %f Y: %f)",
+            GetGUIDLow(), GetEntry(), GetPositionX(), GetPositionY());
         return false;
     }

trunk/src/game/PetitionsHandler.cpp

@@ -836 +836 @@
         {
             Field* fields = result->Fetch();
-            sLog.outDebug("PetitionsHandler: adding arena member %u", fields[0].GetUInt64());
-            at->AddMember(fields[0].GetUInt64());
+            uint64 memberGUID = fields[0].GetUInt64();
+            sLog.outDebug("PetitionsHandler: adding arena member %u", GUID_LOPART(memberGUID));
+            at->AddMember(memberGUID);
             result->NextRow();
         }

trunk/src/game/Player.cpp

@@ -4044 +4044 @@
         if(LostDurability>0)
         {
-            ItemPrototype const *ditemProto = sItemStorage.LookupEntry<ItemPrototype>(item->GetEntry());
-            if(!ditemProto)
-            {
-                sLog.outError("ERROR: RepairDurability: Unknown item id %u", ditemProto);
-                return TotalCost;
-            }
+            ItemPrototype const *ditemProto = item->GetProto();
 
             DurabilityCostsEntry const *dcost = sDurabilityCostsStore.LookupEntry(ditemProto->ItemLevel);
             if(!dcost)
             {
-                sLog.outError("ERROR: RepairDurability: Wrong item lvl %u", dcost);
+                sLog.outError("ERROR: RepairDurability: Wrong item lvl %u", ditemProto->ItemLevel);
                 return TotalCost;
             }
 
-            DurabilityQualityEntry const *dQualitymodEntry = sDurabilityQualityStore.LookupEntry((ditemProto->Quality+1)*2);
+            uint32 dQualitymodEntryId = (ditemProto->Quality+1)*2;
+            DurabilityQualityEntry const *dQualitymodEntry = sDurabilityQualityStore.LookupEntry(dQualitymodEntryId);
             if(!dQualitymodEntry)
             {
-                sLog.outError("ERROR: RepairDurability: Wrong dQualityModEntry %u", dQualitymodEntry);
+                sLog.outError("ERROR: RepairDurability: Wrong dQualityModEntry %u", dQualitymodEntryId);
                 return TotalCost;
             }
@@ -6157 +6153 @@
 uint32 Player::GetArenaTeamIdFromDB(uint64 guid, uint8 type)
 {
-    QueryResult *result = CharacterDatabase.PQuery("SELECT arenateamid FROM arena_team_member WHERE guid='%u'", GUID_LOPART(guid));
-    if(result)
-    {
-        bool found = false;
-        // init id to find the type of the arenateam
-        uint32 id = (*result)[0].GetUInt32();
-        do
-        {
-            QueryResult *result2 = CharacterDatabase.PQuery("SELECT type FROM arena_team WHERE arenateamid='%u'", id);
-            if(result2)
-            {
-                uint8 dbtype = (*result2)[0].GetUInt32();
-                delete result2;
-                if(dbtype == type)
-                {
-                    // if the type matches, we've found the id
-                    found = true;
-                    break;
-                }
-            }
-        } while(result->NextRow());
-        delete result;
-        if(found) return id;
-    }
-    // no arenateam for the specified guid, return 0
-    return 0;
+    QueryResult *result = CharacterDatabase.PQuery("SELECT arena_team_member.arenateamid FROM arena_team_member JOIN arena_team ON arena_team_member.arenateamid = arena_team.arenateamid WHERE guid='%u' AND type='%u' LIMIT 1", GUID_LOPART(guid), type);
+    if(!result)
+        return 0;
+
+    return (*result)[0].GetUInt32();
 }
 
@@ -8573 +8548 @@
     if( bag == INVENTORY_SLOT_BAG_0 && ( slot >= BANK_SLOT_BAG_START && slot < BANK_SLOT_BAG_END ) )
         return true;
+    return false;
+}
+
+bool Player::IsValidPos( uint8 bag, uint8 slot )
+{
+    // post selected
+    if(bag == NULL_BAG)
+        return true;
+
+    if (bag == INVENTORY_SLOT_BAG_0)
+    {
+        // any post selected
+        if (slot == NULL_SLOT)
+            return true;
+
+        // equipment
+        if (slot < EQUIPMENT_SLOT_END)
+            return true;
+
+        // bag equip slots
+        if (slot >= INVENTORY_SLOT_BAG_START && slot < INVENTORY_SLOT_BAG_END)
+            return true;
+
+        // backpack slots
+        if (slot >= INVENTORY_SLOT_ITEM_START && slot < INVENTORY_SLOT_ITEM_END)
+            return true;
+
+        // keyring slots
+        if (slot >= KEYRING_SLOT_START && slot < KEYRING_SLOT_END)
+            return true;
+
+        // bank main slots
+        if (slot >= BANK_SLOT_ITEM_START && slot < BANK_SLOT_ITEM_END)
+            return true;
+
+        // bank bag slots
+        if (slot >= BANK_SLOT_BAG_START && slot < BANK_SLOT_BAG_END)
+            return true;
+
+        return false;
+    }
+
+    // bag content slots
+    if (bag >= INVENTORY_SLOT_BAG_START && bag < INVENTORY_SLOT_BAG_END)
+    {
+        Bag* pBag = (Bag*)GetItemByPos (INVENTORY_SLOT_BAG_0, bag);
+        if(!pBag)
+            return false;
+
+        // any post selected
+        if (slot == NULL_SLOT)
+            return true;
+
+        return slot < pBag->GetBagSize();
+    }
+
+    // bank bag content slots
+    if( bag >= BANK_SLOT_BAG_START && bag < BANK_SLOT_BAG_END )
+    {
+        Bag* pBag = (Bag*)GetItemByPos (INVENTORY_SLOT_BAG_0, bag);
+        if(!pBag)
+            return false;
+
+        // any post selected
+        if (slot == NULL_SLOT)
+            return true;
+
+        return slot < pBag->GetBagSize();
+    }
+
+    // where this?
     return false;
 }

trunk/src/game/Player.h

@@ -1047 +1047 @@
         static bool IsBankPos( uint16 pos ) { return IsBankPos(pos >> 8,pos & 255); }
         static bool IsBankPos( uint8 bag, uint8 slot );
+        bool IsValidPos( uint16 pos ) { return IsBankPos(pos >> 8,pos & 255); }
+        bool IsValidPos( uint8 bag, uint8 slot );
         bool HasBankBagSlot( uint8 slot ) const;
         bool HasItemCount( uint32 item, uint32 count, bool inBankAlso = false ) const;

trunk/src/game/QueryHandler.cpp

@@ -203 +203 @@
         recv_data >> guid;
 
-        sLog.outDebug(  "WORLD: CMSG_CREATURE_QUERY - (%u) NO CREATURE INFO! (GUID: %u, ENTRY: %u)", uint32(GUID_LOPART(guid)), guid, entry );
+        sLog.outDebug("WORLD: CMSG_CREATURE_QUERY - NO CREATURE INFO! (GUID: %u, ENTRY: %u)",
+            GUID_LOPART(guid), entry);
         WorldPacket data( SMSG_CREATURE_QUERY_RESPONSE, 4 );
         data << uint32(entry | 0x80000000);
@@ -261 +262 @@
         recv_data >> guid;
 
-        sLog.outDebug(  "WORLD: CMSG_GAMEOBJECT_QUERY - (%u) Missing gameobject info for (GUID: %u, ENTRY: %u)", uint32(GUID_LOPART(guid)), guid, entryID );
+        sLog.outDebug(  "WORLD: CMSG_GAMEOBJECT_QUERY - Missing gameobject info for (GUID: %u, ENTRY: %u)",
+            GUID_LOPART(guid), entryID );
         WorldPacket data ( SMSG_GAMEOBJECT_QUERY_RESPONSE, 4 );
         data << uint32(entryID | 0x80000000);

trunk/src/game/QuestHandler.cpp

@@ -88 +88 @@
     recv_data >> guid;
 
-    sLog.outDebug( "WORLD: Received CMSG_QUESTGIVER_HELLO npc = %u",guid );
+    sLog.outDebug ("WORLD: Received CMSG_QUESTGIVER_HELLO npc = %u", GUID_LOPART(guid));
 
     Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, guid,UNIT_NPC_FLAG_NONE);
     if (!pCreature)
     {
-        sLog.outDebug( "WORLD: HandleQuestgiverHelloOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) );
+        sLog.outDebug ("WORLD: HandleQuestgiverHelloOpcode - Unit (GUID: %u) not found or you can't interact with him.",
+            GUID_LOPART(guid));
         return;
     }

trunk/src/game/SpellAuras.cpp

@@ -5603 +5603 @@
 
             sLog.outDetail("PeriodicTick: %u (TypeId: %u) attacked %u (TypeId: %u) for %u dmg inflicted by %u abs is %u",
-                GetCasterGUID(), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), m_target->GetGUIDLow(), m_target->GetTypeId(), pdamage, GetId(),absorb);
+                GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), m_target->GetGUIDLow(), m_target->GetTypeId(), pdamage, GetId(),absorb);
 
             WorldPacket data(SMSG_PERIODICAURALOG, (21+16));// we guess size
@@ -5724 +5724 @@
 
             sLog.outDetail("PeriodicTick: %u (TypeId: %u) health leech of %u (TypeId: %u) for %u dmg inflicted by %u abs is %u",
-                GetCasterGUID(), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), m_target->GetGUIDLow(), m_target->GetTypeId(), pdamage, GetId(),absorb);
+                GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), m_target->GetGUIDLow(), m_target->GetTypeId(), pdamage, GetId(),absorb);
 
             pCaster->SendSpellNonMeleeDamageLog(m_target, GetId(), pdamage, GetSpellSchoolMask(GetSpellProto()), absorb, resist, false, 0);

trunk/src/game/SpellEffects.cpp

@@ -1951 +1951 @@
     if(!spellInfo)
     {
-        sLog.outError("EffectTriggerMissileSpell of spell %u: triggering unknown spell id %effect_idx", m_spellInfo->Id,triggered_spell_id);
+        sLog.outError("EffectTriggerMissileSpell of spell %u (eff: %u): triggering unknown spell id %u",
+            m_spellInfo->Id,effect_idx,triggered_spell_id);
         return;
     }
@@ -3216 +3217 @@
     if(!spawnCreature->IsPositionValid())
     {
-        sLog.outError("ERROR: Pet (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %d Y: ^%d)", spawnCreature->GetGUIDLow(), spawnCreature->GetEntry(), spawnCreature->GetPositionX(), spawnCreature->GetPositionY());
+        sLog.outError("ERROR: Pet (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %f Y: %f)",
+            spawnCreature->GetGUIDLow(), spawnCreature->GetEntry(), spawnCreature->GetPositionX(), spawnCreature->GetPositionY());
         delete spawnCreature;
         return;
@@ -3658 +3660 @@
         if(!spawnCreature->IsPositionValid())
         {
-            sLog.outError("ERROR: Pet (guidlow %d, entry %d) not created base at creature. Suggested coordinates isn't valid (X: %d Y: ^%d)", spawnCreature->GetGUIDLow(), spawnCreature->GetEntry(), spawnCreature->GetPositionX(), spawnCreature->GetPositionY());
+            sLog.outError("ERROR: Pet (guidlow %d, entry %d) not created base at creature. Suggested coordinates isn't valid (X: %f Y: %f)",
+                spawnCreature->GetGUIDLow(), spawnCreature->GetEntry(), spawnCreature->GetPositionX(), spawnCreature->GetPositionY());
             delete spawnCreature;
             return;
@@ -4076 +4079 @@
     if(!NewSummon->IsPositionValid())
     {
-        sLog.outError("ERROR: Pet (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %d Y: ^%d)", NewSummon->GetGUIDLow(), NewSummon->GetEntry(), NewSummon->GetPositionX(), NewSummon->GetPositionY());
+        sLog.outError("ERROR: Pet (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %f Y: %f)",
+            NewSummon->GetGUIDLow(), NewSummon->GetEntry(), NewSummon->GetPositionX(), NewSummon->GetPositionY());
         delete NewSummon;
         return;
@@ -5674 +5678 @@
     if(!critter->IsPositionValid())
     {
-        sLog.outError("ERROR: Pet (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %d Y: ^%d)", critter->GetGUIDLow(), critter->GetEntry(), critter->GetPositionX(), critter->GetPositionY());
+        sLog.outError("ERROR: Pet (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %f Y: %f)",
+            critter->GetGUIDLow(), critter->GetEntry(), critter->GetPositionX(), critter->GetPositionY());
         delete critter;
         return;

trunk/src/game/SpellHandler.cpp

@@ -264 +264 @@
     recv_data >> guid;
 
-    sLog.outDebug( "WORLD: Recvd CMSG_GAMEOBJ_USE Message [guid=%u]", guid);
+    sLog.outDebug( "WORLD: Recvd CMSG_GAMEOBJ_USE Message [guid=%u]", GUID_LOPART(guid));
     GameObject *obj = ObjectAccessor::GetGameObject(*_player, guid);
 

trunk/src/game/Transports.cpp

@@ -149 +149 @@
     if(!IsPositionValid())
     {
-        sLog.outError("ERROR: Transport (GUID: %u) not created. Suggested coordinates isn't valid (X: %d Y: ^%d)",guidlow,x,y);
+        sLog.outError("ERROR: Transport (GUID: %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)",
+            guidlow,x,y);
         return false;
     }

trunk/src/game/WaypointManager.cpp

@@ -92 +92 @@
             {
                 QueryResult *result1 = WorldDatabase.PQuery("SELECT id, map FROM creature WHERE guid = '%u'", id);
-                if(result1) sLog.outErrorDb("ERROR: Creature (guidlow %d, entry %d) have invalid coordinates in his waypoint %d (X: %d, Y: %d).", id, result1->Fetch()[0].GetUInt32(), point, node.x, node.y);
-                else sLog.outErrorDb("ERROR: Waypoint path %d, have invalid coordinates in his waypoint %d (X: %d, Y: %d).", id, point, node.x, node.y);
+                if(result1)
+                    sLog.outErrorDb("ERROR: Creature (guidlow %d, entry %d) have invalid coordinates in his waypoint %d (X: %f, Y: %f).",
+                        id, result1->Fetch()[0].GetUInt32(), point, node.x, node.y);
+                else
+                    sLog.outErrorDb("ERROR: Waypoint path %d, have invalid coordinates in his waypoint %d (X: %f, Y: %f).",
+                        id, point, node.x, node.y);
 
                 Trinity::NormalizeMapCoord(node.x);

trunk/src/game/World.cpp

@@ -60 +60 @@
 #include "InstanceSaveMgr.h"
 #include "WaypointManager.h"
+#include "GMTicketMgr.h"
 #include "Util.h"
 #include "Language.h"
@@ -461 +462 @@
     else if(rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] > ATTACK_DISTANCE)
     {
-        sLog.outError("TargetPosRecalculateRange (%f) must be <= %f. Using %f instead.",rate_values[RATE_TARGET_POS_RECALCULATION_RANGE],ATTACK_DISTANCE,ATTACK_DISTANCE);
+        sLog.outError("TargetPosRecalculateRange (%f) must be <= %f. Using %f instead.",
+            rate_values[RATE_TARGET_POS_RECALCULATION_RANGE],ATTACK_DISTANCE,ATTACK_DISTANCE);
         rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] = ATTACK_DISTANCE;
     }
@@ -1175 +1177 @@
     WaypointMgr.Load();
 
+    sLog.outString( "Loading GM tickets...");
+    ticketmgr.LoadGMTickets();
+
     ///- Handle outdated emails (delete/return)
     sLog.outString( "Returning old mails..." );
@@ -1204 +1209 @@
         local.tm_year+1900, local.tm_mon+1, local.tm_mday, local.tm_hour, local.tm_min, local.tm_sec);
 
-    WorldDatabase.PExecute("INSERT INTO uptime (startstring, starttime, uptime) VALUES('%s', %ld, 0)", isoDate, m_startTime );
+    WorldDatabase.PExecute("INSERT INTO uptime (startstring, starttime, uptime) VALUES('%s', " I64FMTD ", 0)",
+        isoDate, uint64(m_startTime));
 
     m_timers[WUPDATE_OBJECTS].SetInterval(0);

trunk/win/VC71/game.vcproj

@@ -627 +627 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\game\HateMatrix.h">
-                        </File>
-                        <File
                                 RelativePath="..\..\src\game\HomeMovementGenerator.cpp">
                         </File>

trunk/win/VC80/game.vcproj

@@ -992 +992 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\game\HateMatrix.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\game\HomeMovementGenerator.cpp"
                                 >

trunk/win/VC90/game.vcproj

@@ -997 +997 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\game\HateMatrix.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\game\HomeMovementGenerator.cpp"
                                 >