Changeset 149

Timestamp:

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

Author:

yumileroy

Message:

[svn] *Implement new player conditions CONDITION_NO_AURA, CONDITION_ACTIVE_EVENT
* Default behaviour of pets for creatures changed to REACT_DEFENSIVE
* Disallowed sending wrapped items as COD
* Prevent loading and saving single target auras for pet in same way as already implemented for player
* Correctly limit use some flask types to zones.
* Fixed extracting common.MPQ under *nix
* Many small xleanups and fixes.
** mangos merge rev.

TEST REV so be careful of creepy crawly bugs!

Original author: KingPin?
Date: 2008-11-02 16:53:46-06:00

Location:

trunk

Files:

• contrib/extractor/libmpq/mpq.cpp (modified) (1 diff)
• src/bindings/scripts/ScriptMgr.cpp (modified) (1 diff)
• src/bindings/scripts/ScriptMgr.h (modified) (1 diff)
• src/game/CharacterHandler.cpp (modified) (1 diff)
• src/game/Chat.cpp (modified) (1 diff)
• src/game/Chat.h (modified) (2 diffs)
• src/game/Language.h (modified) (1 diff)
• src/game/Level0.cpp (modified) (2 diffs)
• src/game/Level2.cpp (modified) (3 diffs)
• src/game/Level3.cpp (modified) (1 diff)
• src/game/Mail.cpp (modified) (2 diffs)
• src/game/Map.cpp (modified) (2 diffs)
• src/game/ObjectMgr.cpp (modified) (2 diffs)
• src/game/ObjectMgr.h (modified) (2 diffs)
• src/game/Pet.cpp (modified) (2 diffs)
• src/game/Player.cpp (modified) (5 diffs)
• src/game/ScriptCalls.cpp (modified) (3 diffs)
• src/game/ScriptCalls.h (modified) (2 diffs)
• src/game/SpellEffects.cpp (modified) (1 diff)
• src/game/SpellMgr.cpp (modified) (1 diff)
• src/game/Unit.cpp (modified) (4 diffs)
• src/game/Unit.h (modified) (2 diffs)
• src/game/World.cpp (modified) (1 diff)
• src/game/World.h (modified) (2 diffs)
• src/game/WorldSession.cpp (modified) (6 diffs)
• src/game/WorldSocket.cpp (modified) (2 diffs)
• src/game/WorldSocketMgr.cpp (modified) (3 diffs)
• src/shared/Database/DatabaseEnv.h (modified) (2 diffs)
• src/trinitycore/Master.cpp (modified) (1 diff)
• src/trinitycore/RASocket.cpp (modified) (1 diff)

trunk/contrib/extractor/libmpq/mpq.cpp

@@ -60 +60 @@
 
         /* Check if file exists and is readable */
-        fd = _open((char *)mpq_filename, O_RDONLY | O_BINARY);
+        fd = _open((char *)mpq_filename, O_RDONLY | O_BINARY | O_LARGEFILE);
         if (fd == LIBMPQ_EFILE) {
                 return LIBMPQ_EFILE;

trunk/src/bindings/scripts/ScriptMgr.cpp

@@ -1839 +1839 @@
 //*** Functions used internally ***
 
+//Trinity_DLL_EXPORT
+//char const* ScriptsVersion()
+//{
+//      return "Default Trinity scripting library";
+//}
+
 Script* GetScriptByName(std::string Name)
 {

trunk/src/bindings/scripts/ScriptMgr.h

@@ -78 +78 @@
   #define TRINITY_DLL_EXPORT extern "C" __declspec(dllexport)
 #elif defined( __GNUC__ )
-  #define TRINITY_DLL_EXPORT extern "C"
+#define TRINITY_DLL_EXPORT extern "C"
 #else
-  #define TRINITY_DLL_EXPORT extern "C" export
+#define TRINITY_DLL_EXPORT extern "C" export
 #endif
 

trunk/src/game/CharacterHandler.cpp

@@ -380 +380 @@
     SendPacket( &data );
 
-    std::string IP_str = GetRemoteAddress().c_str();
+    std::string IP_str = GetRemoteAddress();
     sLog.outBasic("Account: %d (IP: %s) Create Character:[%s]",GetAccountId(),IP_str.c_str(),name.c_str());
     sLog.outChar("Account: %d (IP: %s) Create Character:[%s]",GetAccountId(),IP_str.c_str(),name.c_str());

trunk/src/game/Chat.cpp

@@ -70 +70 @@
                 { "idlerestart",    SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleIdleRestartCommand,         "", NULL },
                 { "idleshutdown",   SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleIdleShutDownCommand,        "", NULL },
-                { "info",           SEC_PLAYER,         true,  &ChatHandler::HandleInfoCommand,                "", NULL },
+                { "info",           SEC_PLAYER,         true,  &ChatHandler::HandleServerInfoCommand,          "", NULL },
                 { "motd",           SEC_PLAYER,         true,  &ChatHandler::HandleServerMotdCommand,          "", NULL },
                 { "restart",        SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleRestartCommand,             "", NULL },

trunk/src/game/Chat.h

@@ -100 +100 @@
         bool HandleCommandsCommand(const char* args);
         bool HandleStartCommand(const char* args);
-        bool HandleInfoCommand(const char* args);
         bool HandleDismountCommand(const char* args);
         bool HandleSaveCommand(const char* args);
@@ -230 +229 @@
                 bool HandleServerCorpsesCommand(const char* args);
                 bool HandleServerExitCommand(const char* args);
+                bool HandleServerInfoCommand(const char* args);
                 bool HandleServerMotdCommand(const char* args);
                 bool HandleServerSetMotdCommand(const char* args);

trunk/src/game/Language.h

@@ -83 +83 @@
         LANG_PASSWORD_TOO_LONG              = 55,
         LANG_MOTD_CURRENT                   = 56,
-        // Room for more level 0              57-99 not used
+        LANG_USING_WORLD_DB                 = 57,
+        LANG_USING_SCRIPT_LIB               = 58,
+        // Room for more level 0              59-99 not used
 
     // level 1 chat

trunk/src/game/Level0.cpp

@@ -87 +87 @@
 }
 
-bool ChatHandler::HandleInfoCommand(const char* /*args*/)
+bool ChatHandler::HandleServerInfoCommand(const char* /*args*/)
 {
     uint32 activeClientsNum = sWorld.GetActiveSessionCount();
@@ -95 +95 @@
     std::string str = secsToTimeString(sWorld.GetUptime());
 
-    PSendSysMessage(_FULLVERSION);
+    PSendSysMessage(_FULLVERSION); //char const* full;
+    //if(m_session)
+    //    full = _FULLVERSION(REVISION_DATE,REVISION_TIME,"|cffffffff|Hurl:" REVISION_ID "|h" REVISION_ID "|h|r");
+    //else
+    //    full = _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_ID);
+
+    //SendSysMessage(full);
+    //PSendSysMessage(LANG_USING_SCRIPT_LIB,sWorld.GetScriptsVersion());
+    //PSendSysMessage(LANG_USING_WORLD_DB,sWorld.GetDBVersion());
     PSendSysMessage(LANG_CONNECTED_USERS, activeClientsNum, maxActiveClientsNum, queuedClientsNum, maxQueuedClientsNum);
     PSendSysMessage(LANG_UPTIME, str.c_str());

trunk/src/game/Level2.cpp

@@ -1955 +1955 @@
     if(num > 0)
     {
-        QueryResult *result = CharacterDatabase.PQuery("SELECT guid,ticket_text,ticket_lastchange FROM character_ticket ORDER BY ticket_id ASC LIMIT %d,1",num-1);
+        QueryResult *result = CharacterDatabase.PQuery("SELECT guid,ticket_text,ticket_lastchange FROM character_ticket ORDER BY ticket_id ASC "_OFFSET_, num-1);
 
         if(!result)
@@ -2067 +2067 @@
     if(num > 0)
     {
-        QueryResult *result = CharacterDatabase.PQuery("SELECT ticket_id,guid FROM character_ticket LIMIT %i",num);
-
-        if(!result || uint64(num) > result->GetRowCount())
+        QueryResult *result = CharacterDatabase.PQuery("SELECT ticket_id,guid FROM character_ticket ORDER BY ticket_id ASC "_OFFSET_,num-1);
+
+        if(!result)
         {
             PSendSysMessage(LANG_COMMAND_TICKENOTEXIST, num);
@@ -2076 +2076 @@
             return false;
         }
-
-        for(int i = 1; i < num; ++i)
-            result->NextRow();
 
         Field* fields = result->Fetch();

trunk/src/game/Level3.cpp

@@ -5543 +5543 @@
                         return false;
                 case DUMP_TOO_MANY_CHARS:
-                        PSendSysMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL,account_name,account_id);
+                        PSendSysMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL,account_name.c_str(),account_id);
                         SetSentErrorMessage(true);
                         return false;

trunk/src/game/Mail.cpp

@@ -188 +188 @@
                 return;
             }
+
             if (mailItem.item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_CONJURED) || mailItem.item->GetUInt32Value(ITEM_FIELD_DURATION))
             {
@@ -193 +194 @@
                 return;
             }
+
+                        if(COD && mailItem.item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_WRAPPED))
+                        {
+                                pl->SendMailResult(0, 0, MAIL_ERR_CANT_SEND_WRAPPED_COD);
+                                return;
+                        }
         }
     }

trunk/src/game/Map.cpp

@@ -579 +579 @@
     }
 }
-
-void InstanceMap::Update(const uint32& t_diff)
-{
-    Map::Update(t_diff);
-
-    if(i_data)
-        i_data->Update(t_diff);
-}
-
 
 void Map::Remove(Player *player, bool remove)
@@ -1558 +1549 @@
 }
 
+void InstanceMap::Update(const uint32& t_diff)
+{
+        Map::Update(t_diff);
+
+        if(i_data)
+                i_data->Update(t_diff);
+}
+
 void InstanceMap::Remove(Player *player, bool remove)
 {

trunk/src/game/ObjectMgr.cpp

@@ -6570 +6570 @@
             return false;
         }
+                case CONDITION_NO_AURA:
+                        return !player->HasAura(value1, value2);
+                case CONDITION_ACTIVE_EVENT:
+                        return gameeventmgr.IsActiveEvent(value1);
         default:
             return false;
@@ -6690 +6694 @@
             break;
         }
+                case CONDITION_NO_AURA:
+                {
+                        if(!sSpellStore.LookupEntry(value1))
+                        {
+                                sLog.outErrorDb("Aura condition requires to have non existing spell (Id: %d), skipped", value1);
+                                return false;
+                        }
+                        if(value2 > 2)
+                        {
+                                sLog.outErrorDb("Aura condition requires to have non existing effect index (%u) (must be 0..2), skipped", value2);
+                                return false;
+                        }
+                        break;
+                }
+                case CONDITION_ACTIVE_EVENT:
+                {
+                        GameEvent::GameEventDataMap const& events = gameeventmgr.GetEventMap();
+                        if(value1 >=events.size() || !events[value1].isValid())
+                        {
+                                sLog.outErrorDb("Active event condition requires existed event id (%u), skipped", value1);
+                                return false;
+                        }
+                        break;
+                }
     }
     return true;

trunk/src/game/ObjectMgr.h

@@ -206 +206 @@
     CONDITION_QUESTTAKEN            = 9,                    // quest_id     0,      for condition true while quest active.
     CONDITION_AD_COMMISSION_AURA    = 10,                   // 0            0,      for condition true while one from AD ñommission aura active
-};
-
-#define MAX_CONDITION                 11                    // maximum value in ConditionType enum
+        CONDITION_NO_AURA               = 11,                   // spell_id     effindex
+        CONDITION_ACTIVE_EVENT          = 12,                   // event_id
+};
+
+#define MAX_CONDITION                 13                    // maximum value in ConditionType enum
 
 //Player's info
@@ -771 +773 @@
         bool RemoveVendorItem(uint32 entry,uint32 item, bool savetodb = true);
         bool IsVendorItemValid( uint32 vendor_entry, uint32 item, uint32 maxcount, uint32 ptime, uint32 ExtendedCost, Player* pl = NULL, std::set<uint32>* skip_vendors = NULL, uint32 ORnpcflag = 0) const;
+
     protected:
         uint32 m_auctionid;

trunk/src/game/Pet.cpp

@@ -1367 +1367 @@
                 remaincharges = -1;
 
+                        /// do not load single target auras (unless they were cast by the player)
+                        if (caster_guid != GetGUID() && IsSingleTargetSpell(spellproto))
+                                continue;
+
             Aura* aura = CreateAura(spellproto, effindex, NULL, this, NULL);
 
@@ -1396 +1400 @@
                 break;
 
-        if (i == 3 && !itr->second->IsPassive())
-            CharacterDatabase.PExecute("INSERT INTO pet_aura (guid,caster_guid,spell,effect_index,amount,maxduration,remaintime,remaincharges) "
-                "VALUES ('%u', '" I64FMTD "', '%u', '%u', '%d', '%d', '%d', '%d')",
-                m_charmInfo->GetPetNumber(), itr->second->GetCasterGUID(),(uint32)(*itr).second->GetId(), (uint32)(*itr).second->GetEffIndex(),(*itr).second->GetModifier()->m_amount,int((*itr).second->GetAuraMaxDuration()),int((*itr).second->GetAuraDuration()),int((*itr).second->m_procCharges));
+        if (i != 3)
+                        continue;
+
+                if(itr->second->IsPassive())
+                        continue;
+
+                /// do not save single target auras (unless they were cast by the player)
+                if (itr->second->GetCasterGUID() != GetGUID() && IsSingleTargetSpell(spellInfo))
+                        continue;
+
+                CharacterDatabase.PExecute("INSERT INTO pet_aura (guid,caster_guid,spell,effect_index,amount,maxduration,remaintime,remaincharges) "
+                        "VALUES ('%u', '" I64FMTD "', '%u', '%u', '%d', '%d', '%d', '%d')",
+                        m_charmInfo->GetPetNumber(), itr->second->GetCasterGUID(),(uint32)(*itr).second->GetId(), (uint32)(*itr).second->GetEffIndex(),(*itr).second->GetModifier()->m_amount,int((*itr).second->GetAuraMaxDuration()),int((*itr).second->GetAuraDuration()),int((*itr).second->m_procCharges));
     }
 }

trunk/src/game/Player.cpp

@@ -3258 +3258 @@
     updateVisualBits.SetCount(PLAYER_END);
 
+        // TODO: really implement OWNER_ONLY and GROUP_ONLY. Flags can be found in UpdateFields.h
+
     updateVisualBits.SetBit(OBJECT_FIELD_GUID);
     updateVisualBits.SetBit(OBJECT_FIELD_TYPE);
@@ -3269 +3271 @@
 
     updateVisualBits.SetBit(UNIT_FIELD_CHARMEDBY);
+        updateVisualBits.SetBit(UNIT_FIELD_CHARMEDBY+1);
 
     updateVisualBits.SetBit(UNIT_FIELD_TARGET);
@@ -3300 +3303 @@
     updateVisualBits.SetBit(UNIT_FIELD_BASEATTACKTIME);
     updateVisualBits.SetBit(UNIT_FIELD_BASEATTACKTIME + 1);
-    updateVisualBits.SetBit(UNIT_FIELD_RANGEDATTACKTIME);
     updateVisualBits.SetBit(UNIT_FIELD_BOUNDINGRADIUS);
     updateVisualBits.SetBit(UNIT_FIELD_COMBATREACH);
     updateVisualBits.SetBit(UNIT_FIELD_DISPLAYID);
     updateVisualBits.SetBit(UNIT_FIELD_NATIVEDISPLAYID);
-    updateVisualBits.SetBit(UNIT_FIELD_MOUNTDISPLAYID);
     updateVisualBits.SetBit(UNIT_FIELD_BYTES_1);
     updateVisualBits.SetBit(UNIT_FIELD_MOUNTDISPLAYID);
@@ -3315 +3316 @@
     updateVisualBits.SetBit(UNIT_FIELD_BYTES_2);
 
+        updateVisualBits.SetBit(PLAYER_DUEL_ARBITER);
+        updateVisualBits.SetBit(PLAYER_DUEL_ARBITER+1);
     updateVisualBits.SetBit(PLAYER_FLAGS);
+        updateVisualBits.SetBit(PLAYER_GUILDID);
+        updateVisualBits.SetBit(PLAYER_GUILDRANK);
     updateVisualBits.SetBit(PLAYER_BYTES);
     updateVisualBits.SetBit(PLAYER_BYTES_2);
     updateVisualBits.SetBit(PLAYER_BYTES_3);
-    updateVisualBits.SetBit(PLAYER_GUILDID);
-    updateVisualBits.SetBit(PLAYER_GUILDRANK);
+    updateVisualBits.SetBit(PLAYER_DUEL_TEAM);
     updateVisualBits.SetBit(PLAYER_GUILD_TIMESTAMP);
-    updateVisualBits.SetBit(PLAYER_DUEL_TEAM);
-    updateVisualBits.SetBit(PLAYER_DUEL_ARBITER);
-    updateVisualBits.SetBit(PLAYER_DUEL_ARBITER+1);
 
     // PLAYER_QUEST_LOG_x also visible bit on official (but only on party/raid)...
@@ -3353 +3354 @@
 
     updateVisualBits.SetBit(PLAYER_CHOSEN_TITLE);
-
-    updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_SLOT_DISPLAY);
-    updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_SLOT_DISPLAY + 1);
-    updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_SLOT_DISPLAY + 2);
-    updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_INFO);
-    updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_INFO + 1);
-    updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_INFO + 2);
-    updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_INFO + 3);
-    updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_INFO + 4);
-    updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_INFO + 5);
 }
 

trunk/src/game/ScriptCalls.cpp

@@ -25 +25 @@
 #include "Platform/Define.h"
 #include "ScriptCalls.h"
+#include "World.h"
 
 ScriptsSet Script=NULL;
@@ -58 +59 @@
     if(   !(testScript->ScriptsInit         =(scriptCallScriptsInit         )TRINITY_GET_PROC_ADDR(testScript->hScriptsLib,"ScriptsInit"         ))
         ||!(testScript->ScriptsFree         =(scriptCallScriptsFree         )TRINITY_GET_PROC_ADDR(testScript->hScriptsLib,"ScriptsFree"         ))
+                ||!(testScript->ScriptsVersion      =(scriptCallScriptsVersion      )TRINITY_GET_PROC_ADDR(testScript->hScriptsLib,"ScriptsVersion"      ))
         ||!(testScript->GossipHello         =(scriptCallGossipHello         )TRINITY_GET_PROC_ADDR(testScript->hScriptsLib,"GossipHello"         ))
         ||!(testScript->GOChooseReward      =(scriptCallGOChooseReward      )TRINITY_GET_PROC_ADDR(testScript->hScriptsLib,"GOChooseReward"      ))
@@ -94 +96 @@
     Script->ScriptsInit();
 
+        sWorld.SetScriptsVersion(Script->ScriptsVersion());
+
     return true;
 }

trunk/src/game/ScriptCalls.h

@@ -40 +40 @@
 typedef void(TRINITY_IMPORT * scriptCallScriptsInit) ();
 typedef void(TRINITY_IMPORT * scriptCallScriptsFree) ();
+typedef char const* (TRINITY_IMPORT * scriptCallScriptsVersion) ();
 
 typedef bool(TRINITY_IMPORT * scriptCallGossipHello) (Player *player, Creature *_Creature );
@@ -65 +66 @@
     scriptCallScriptsInit ScriptsInit;
     scriptCallScriptsFree ScriptsFree;
+        scriptCallScriptsVersion ScriptsVersion;
 
     scriptCallGossipHello GossipHello;

trunk/src/game/SpellEffects.cpp

@@ -4074 +4074 @@
 
     uint32 faction = m_caster->getFaction();
-    if(m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->isTotem())
-    {
-        Unit* owner = ((Totem*)m_caster)->GetOwner();
-        if(owner)
-            faction = owner->getFaction();
-        NewSummon->GetCharmInfo()->SetReactState(REACT_AGGRESSIVE);
+    if(m_caster->GetTypeId() == TYPEID_UNIT)
+    {
+                if ( ((Creature*)m_caster)->isTotem() )
+                        NewSummon->GetCharmInfo()->SetReactState(REACT_AGGRESSIVE);
+                else
+                        NewSummon->GetCharmInfo()->SetReactState(REACT_DEFENSIVE);
     }
 

trunk/src/game/SpellMgr.cpp

@@ -2193 +2193 @@
                 return zone_id ==3522 || map_id==565;
             }
-            if(mask & ELIXIR_UNSTABLE_MASK)
+            if(mask & ELIXIR_SHATTRATH_MASK)
             {
                 // in Tempest Keep, Serpentshrine Cavern, Caverns of Time: Mount Hyjal, Black Temple

trunk/src/game/Unit.cpp

@@ -6485 +6485 @@
         case 836:                                           // Improved Blizzard (Rank 1)
         {
-            if( !procSpell || procSpell->SpellVisual!=9487 )
+            if( !procSpell || procSpell->SpellVisual!=9487)
                 return false;
             triggered_spell_id = 12484;
@@ -6492 +6492 @@
         case 988:                                           // Improved Blizzard (Rank 2)
         {
-            if( !procSpell || procSpell->SpellVisual!=9487 )
+            if( !procSpell || procSpell->SpellVisual!=9487)
                 return false;
             triggered_spell_id = 12485;
@@ -6499 +6499 @@
         case 989:                                           // Improved Blizzard (Rank 3)
         {
-            if( !procSpell || procSpell->SpellVisual!=9487 )
+            if( !procSpell || procSpell->SpellVisual!=9487)
                 return false;
             triggered_spell_id = 12486;
@@ -9871 +9871 @@
 
 CharmInfo::CharmInfo(Unit* unit)
-: m_unit(unit), m_CommandState(COMMAND_FOLLOW), m_ReactSate(REACT_PASSIVE), m_petnumber(0)
+: m_unit(unit), m_CommandState(COMMAND_FOLLOW), m_reactState(REACT_PASSIVE), m_petnumber(0)
 {
     for(int i =0; i<4; ++i)

trunk/src/game/Unit.h

@@ -647 +647 @@
         CommandStates GetCommandState() { return m_CommandState; }
         bool HasCommandState(CommandStates state) { return (m_CommandState == state); }
-        void SetReactState(ReactStates st) { m_ReactSate = st; }
-        ReactStates GetReactState() { return m_ReactSate; }
-        bool HasReactState(ReactStates state) { return (m_ReactSate == state); }
+        void SetReactState(ReactStates st) { m_reactState = st; }
+                ReactStates GetReactState() { return m_reactState; }
+                bool HasReactState(ReactStates state) { return (m_reactState == state); }
 
         void InitPossessCreateSpells();
@@ -666 +666 @@
         CharmSpellEntry m_charmspells[4];
         CommandStates   m_CommandState;
-        ReactStates     m_ReactSate;
+        ReactStates     m_reactState;
         uint32          m_petnumber;
 };

trunk/src/game/World.cpp

@@ -2613 +2613 @@
     m_maxQueuedSessionCount = std::max(m_maxQueuedSessionCount,uint32(m_QueuedPlayer.size()));
 }
+
+void World::LoadDBVersion()
+{
+        QueryResult* result = WorldDatabase.Query("SELECT version FROM db_version LIMIT 1");
+        if(result)
+        {
+                Field* fields = result->Fetch();
+
+                m_DBVersion = fields[0].GetString();
+                delete result;
+        }
+        else
+                m_DBVersion = "unknown world database";
+}

trunk/src/game/World.h

@@ -481 +481 @@
 
         LocaleConstant GetAvailableDbcLocale(LocaleConstant locale) const { if(m_availableDbcLocaleMask & (1 << locale)) return locale; else return m_defaultDbcLocale; }
+
+                //used World DB version
+                void LoadDBVersion();
+                char const* GetDBVersion() { return m_DBVersion.c_str(); }
+
+                //used Script version
+                void SetScriptsVersion(char const* version) { m_ScriptsVersion = version ? version : "unknown scripting library"; }
+                char const* GetScriptsVersion() { return m_ScriptsVersion.c_str(); }
+
     protected:
         void _UpdateGameTime();
@@ -541 +550 @@
         void AddSession_(WorldSession* s);
         ZThread::LockedQueue<WorldSession*, ZThread::FastMutex> addSessQueue;
+
+                //used versions
+                std::string m_DBVersion;
+                std::string m_ScriptsVersion;
 };
 

trunk/src/game/WorldSession.cpp

@@ -52 +52 @@
 {
    if (sock)
-     {
-       m_Address = sock->GetRemoteAddress ();
-       sock->AddReference ();
-     }
+   {
+           m_Address = sock->GetRemoteAddress ();
+           sock->AddReference ();
+   }
 }
 
@@ -100 +100 @@
     if (!m_Socket)
         return;
+
     #ifdef TRINITY_DEBUG
+
     // Code for network use statistic
     static uint64 sendPacketCount = 0;
@@ -132 +134 @@
         sendLastPacketBytes = packet->wpos();               // wpos is real written size
     }
-#endif                                                  // !TRINITY_DEBUG
-
-  if (m_Socket->SendPacket (*packet) == -1)
-    {
-      m_Socket->CloseSocket ();
-    }
+
+        #endif                                                  // !TRINITY_DEBUG
+
+        if (m_Socket->SendPacket (*packet) == -1)
+                m_Socket->CloseSocket ();
 }
 
@@ -158 +159 @@
 bool WorldSession::Update(uint32 /*diff*/)
 {
-  if (m_Socket)
-    if (m_Socket->IsClosed ())
-      { 
+  if (m_Socket && m_Socket->IsClosed ())
+  {
         m_Socket->RemoveReference ();
         m_Socket = NULL;
-      }
+  }
   
     WorldPacket *packet;
@@ -396 +396 @@
         ///- Since each account can only have one online character at any given time, ensure all characters for active account are marked as offline
         //No SQL injection as AccountId is uint32
-        CharacterDatabase.PExecute("UPDATE characters SET online = 0 WHERE account = '%u'", GetAccountId());
+        CharacterDatabase.PExecute("UPDATE characters SET online = 0 WHERE account = '%u'",
+                        GetAccountId());
         sLog.outDebug( "SESSION: Sent SMSG_LOGOUT_COMPLETE Message" );
     }
@@ -408 +409 @@
 void WorldSession::KickPlayer()
 {
-  if (m_Socket)
-    {
-      m_Socket->CloseSocket ();
-    }
+        if (m_Socket)
+                m_Socket->CloseSocket ();
 }
 

trunk/src/game/WorldSocket.cpp

@@ -19 +19 @@
  */
 
-#include "Common.h"
-#include "WorldSocket.h" 
-
 #include <ace/Message_Block.h>
 #include <ace/OS_NS_string.h>
@@ -32 +29 @@
 #include <ace/Reactor.h>
 #include <ace/Auto_Ptr.h>
+
+#include "WorldSocket.h"
+#include "Common.h"
 
 #include "Util.h"

trunk/src/game/WorldSocketMgr.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
- *
- * Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
- *
- * 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
- */
+* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
+*
+* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
+*
+* 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
+*/
 
 /** \file WorldSocketMgr.cpp
- *  \ingroup u2w
- *  \author Derex <derex101@gmail.com>
- */
+*  \ingroup u2w
+*  \author Derex <derex101@gmail.com>
+*/
 
 #include "WorldSocketMgr.h"
@@ -48 +48 @@
 
 /** 
- * This is a helper class to WorldSocketMgr ,that manages 
- * network threads, and assigning connections from acceptor thread
- * to other network threads
- */
+* This is a helper class to WorldSocketMgr ,that manages 
+* network threads, and assigning connections from acceptor thread
+* to other network threads
+*/
 class ReactorRunnable : protected ACE_Task_Base
 {
 public:
 
-  ReactorRunnable () :
-  m_ThreadId (-1),
-  m_Connections (0),
-  m_Reactor (0)
-  {
-    ACE_Reactor_Impl* imp = 0;
+        ReactorRunnable () :
+          m_ThreadId (-1),
+                  m_Connections (0),
+                  m_Reactor (0)
+          {
+                  ACE_Reactor_Impl* imp = 0;
 
 #if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL)
-    imp = new ACE_Dev_Poll_Reactor ();
-
-    imp->max_notify_iterations (128);
-    imp->restart (1);
+
+                  imp = new ACE_Dev_Poll_Reactor ();
+
+                  imp->max_notify_iterations (128);
+                  imp->restart (1);
+
 #else
-    imp = new ACE_TP_Reactor ();
-    imp->max_notify_iterations (128);
+
+                  imp = new ACE_TP_Reactor ();
+                  imp->max_notify_iterations (128);
+
 #endif
 
-    m_Reactor = new ACE_Reactor (imp, 1);
-  }
-
-  virtual
-  ~ReactorRunnable ()
-  {
-    this->Stop ();
-    this->Wait ();
-
-    if (m_Reactor)
-      delete m_Reactor;
-  }
-
-  void
-  Stop ()
-  {
-    m_Reactor->end_reactor_event_loop ();
-  }
-
-  int
-  Start ()
-  {
-    if (m_ThreadId != -1)
-      return -1;
-
-    return (m_ThreadId = this->activate ());
-  }
-
-  void
-  Wait ()
-  {
-    ACE_Task_Base::wait ();
-  }
-
-  long
-  Connections ()
-  {
-    return static_cast<long> (m_Connections.value ());
-  }
-
-  int
-  AddSocket (WorldSocket* sock)
-  {
-    ACE_GUARD_RETURN (ACE_Thread_Mutex, Guard, m_NewSockets_Lock, -1);
-
-    ++m_Connections;
-    sock->AddReference();
-    sock->reactor (m_Reactor);
-    m_NewSockets.insert (sock);
-
-    return 0;
-  }
-  
-  ACE_Reactor* GetReactor ()
-  {
-    return m_Reactor;
-  }
-  
+                  m_Reactor = new ACE_Reactor (imp, 1);
+          }
+
+          virtual ~ReactorRunnable ()
+          {
+                  this->Stop ();
+                  this->Wait ();
+
+                  if (m_Reactor)
+                          delete m_Reactor;
+          }
+
+          void Stop ()
+          {
+                  m_Reactor->end_reactor_event_loop ();
+          }
+
+          int Start ()
+          {
+                  if (m_ThreadId != -1)
+                          return -1;
+
+                  return (m_ThreadId = this->activate ());
+          }
+
+          void Wait ()
+          {
+                  ACE_Task_Base::wait ();
+          }
+
+          long Connections ()
+          {
+                  return static_cast<long> (m_Connections.value ());
+          }
+
+          int AddSocket (WorldSocket* sock)
+          {
+                  ACE_GUARD_RETURN (ACE_Thread_Mutex, Guard, m_NewSockets_Lock, -1);
+
+                  ++m_Connections;
+                  sock->AddReference();
+                  sock->reactor (m_Reactor);
+                  m_NewSockets.insert (sock);
+
+                  return 0;
+          }
+
+          ACE_Reactor* GetReactor ()
+          {
+                  return m_Reactor;
+          }
+
 protected:
-  
-  void
-  AddNewSockets ()
-  {
-    ACE_GUARD (ACE_Thread_Mutex, Guard, m_NewSockets_Lock);
-
-    if (m_NewSockets.empty ())
-      return;
-
-    for (SocketSet::iterator i = m_NewSockets.begin (); i != m_NewSockets.end (); ++i)
-      {
-        WorldSocket* sock = (*i);
-
-        if (sock->IsClosed ())
-          {
-            sock->RemoveReference ();
-            --m_Connections;
-          }
-        else
-          m_Sockets.insert (sock);
-      }
-
-    m_NewSockets.clear ();
-  }
-
-  virtual int
-  svc (void)
-  {
-    DEBUG_LOG ("Network Thread Starting");
-
-    WorldDatabase.ThreadStart ();
-
-    ACE_ASSERT (m_Reactor);
-
-    SocketSet::iterator i, t;
-
-    while (!m_Reactor->reactor_event_loop_done ())
-      {
-        // dont be too smart to move this outside the loop 
-        // the run_reactor_event_loop will modify interval
-        ACE_Time_Value interval (0, 10000);
-
-        if (m_Reactor->run_reactor_event_loop (interval) == -1)
-          break;
-
-        AddNewSockets ();
-
-        for (i = m_Sockets.begin (); i != m_Sockets.end ();)
-          {
-            if ((*i)->Update () == -1)
-              {
-                t = i;
-                i++;
-                (*t)->CloseSocket ();
-                (*t)->RemoveReference ();
-                --m_Connections;
-                m_Sockets.erase (t);
-              }
-            else
-              i++;
-          }
-      }
-
-    WorldDatabase.ThreadEnd ();
-
-    DEBUG_LOG ("Network Thread Exitting");
-
-    return 0;
-  }
+
+        void AddNewSockets ()
+        {
+                ACE_GUARD (ACE_Thread_Mutex, Guard, m_NewSockets_Lock);
+
+                if (m_NewSockets.empty ())
+                        return;
+
+                for (SocketSet::iterator i = m_NewSockets.begin (); i != m_NewSockets.end (); ++i)
+                {
+                        WorldSocket* sock = (*i);
+
+                        if (sock->IsClosed ())
+                        {
+                                sock->RemoveReference ();
+                                --m_Connections;
+                        }
+                        else
+                                m_Sockets.insert (sock);
+                }
+
+                m_NewSockets.clear ();
+        }
+
+        virtual int svc (void)
+        {
+                DEBUG_LOG ("Network Thread Starting");
+
+                WorldDatabase.ThreadStart ();
+
+                ACE_ASSERT (m_Reactor);
+
+                SocketSet::iterator i, t;
+
+                while (!m_Reactor->reactor_event_loop_done ())
+                {
+                        // dont be too smart to move this outside the loop 
+                        // the run_reactor_event_loop will modify interval
+                        ACE_Time_Value interval (0, 10000);
+
+                        if (m_Reactor->run_reactor_event_loop (interval) == -1)
+                                break;
+
+                        AddNewSockets ();
+
+                        for (i = m_Sockets.begin (); i != m_Sockets.end ();)
+                        {
+                                if ((*i)->Update () == -1)
+                                {
+                                        t = i;
+                                        i++;
+                                        (*t)->CloseSocket ();
+                                        (*t)->RemoveReference ();
+                                        --m_Connections;
+                                        m_Sockets.erase (t);
+                                }
+                                else
+                                        i++;
+                        }
+                }
+
+                WorldDatabase.ThreadEnd ();
+
+                DEBUG_LOG ("Network Thread Exitting");
+
+                return 0;
+        }
 
 private:
-  typedef ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> AtomicInt;
-  typedef std::set<WorldSocket*> SocketSet;
-
-  ACE_Reactor* m_Reactor;
-  AtomicInt m_Connections;
-  int m_ThreadId;
-
-  SocketSet m_Sockets;
-
-  SocketSet m_NewSockets;
-  ACE_Thread_Mutex m_NewSockets_Lock;
+        typedef ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> AtomicInt;
+        typedef std::set<WorldSocket*> SocketSet;
+
+        ACE_Reactor* m_Reactor;
+        AtomicInt m_Connections;
+        int m_ThreadId;
+
+        SocketSet m_Sockets;
+
+        SocketSet m_NewSockets;
+        ACE_Thread_Mutex m_NewSockets_Lock;
 };
 
@@ -228 +224 @@
 WorldSocketMgr::~WorldSocketMgr ()
 {
-  if (m_NetThreads)
-    delete [] m_NetThreads;
-  
-  if(m_Acceptor)
-    delete m_Acceptor;
-}
-
-int
-WorldSocketMgr::StartReactiveIO (ACE_UINT16 port, const char* address)
-{
-  m_UseNoDelay = sConfig.GetBoolDefault ("Network.TcpNodelay", true);
-
-  int num_threads = sConfig.GetIntDefault ("Network.Threads", 1);
-
-  if (num_threads <= 0)
-    {
-      sLog.outError ("Network.Threads is wrong in your config file");
-      return -1;
-    }
-
-  m_NetThreadsCount = static_cast<size_t> (num_threads + 1);
-
-  m_NetThreads = new ReactorRunnable[m_NetThreadsCount];
-
-  sLog.outBasic ("Max alowed socket connections %d",ACE::max_handles ());
-
-  m_SockOutKBuff = sConfig.GetIntDefault ("Network.OutKBuff", -1); // -1 means use default
-
-  m_SockOutUBuff = sConfig.GetIntDefault ("Network.OutUBuff", 65536);
-
-  if ( m_SockOutUBuff <= 0 )
-    {
-      sLog.outError ("Network.OutUBuff is wrong in your config file");
-      return -1;
-    }
-
-  WorldSocket::Acceptor *acc = new WorldSocket::Acceptor;
-  m_Acceptor = acc;
-
-  ACE_INET_Addr listen_addr (port, address);
-
-  if (acc->open (listen_addr, m_NetThreads[0].GetReactor (), ACE_NONBLOCK) == -1)
-    {
-      sLog.outError ("Failed to open acceptor ,check if the port is free");
-      return -1;
-    }
-
-  for (size_t i = 0; i < m_NetThreadsCount; ++i)
-    m_NetThreads[i].Start ();
-
-  return 0;
-}
-
-int
-WorldSocketMgr::StartNetwork (ACE_UINT16 port, const char* address)
-{
-  if (!sLog.IsOutDebug ())
-    ACE_Log_Msg::instance ()->priority_mask (LM_ERROR, ACE_Log_Msg::PROCESS);
-
-  if (this->StartReactiveIO (port, address) == -1)
-    return -1;
-
-  return 0;
-}
-
-void
-WorldSocketMgr::StopNetwork ()
-{
-  if (m_Acceptor)
-    {
-      WorldSocket::Acceptor* acc = dynamic_cast<WorldSocket::Acceptor*> (m_Acceptor);
-
-      if (acc)
-        acc->close ();
-    }
-
-  if (m_NetThreadsCount != 0)
-    {
-      for (size_t i = 0; i < m_NetThreadsCount; ++i)
-        m_NetThreads[i].Stop ();
-    }
-  
-  this->Wait ();
-}
-
-void 
-WorldSocketMgr::Wait ()
-{
-  if (m_NetThreadsCount != 0)
-    {
-      for (size_t i = 0; i < m_NetThreadsCount; ++i)
-        m_NetThreads[i].Wait ();
-    }
-}
-
-int
-WorldSocketMgr::OnSocketOpen (WorldSocket* sock)
-{
-  // set some options here
-  if (m_SockOutKBuff >= 0)
-    if (sock->peer ().set_option (SOL_SOCKET,
-                                  SO_SNDBUF,
-                                  (void*) & m_SockOutKBuff,
-                                  sizeof (int)) == -1 && errno != ENOTSUP)
-      {
-        sLog.outError ("WorldSocketMgr::OnSocketOpen set_option SO_SNDBUF");
-        return -1;
-      }
-
-  static const int ndoption = 1;
-
-  // Set TCP_NODELAY.
-  if (m_UseNoDelay)
-    if (sock->peer ().set_option (ACE_IPPROTO_TCP,
-                                  TCP_NODELAY,
-                                  (void*) & ndoption,
-                                  sizeof (int)) == -1)
-      {
-        sLog.outError ("WorldSocketMgr::OnSocketOpen: peer ().set_option TCP_NODELAY errno = %s", ACE_OS::strerror (errno));
-        return -1;
-      }
-  
-  sock->m_OutBufferSize = static_cast<size_t> (m_SockOutUBuff);
-
-  // we skip the Acceptor Thread
-  size_t min = 1;
-
-  ACE_ASSERT (m_NetThreadsCount >= 1);
-
-  for (size_t i = 1; i < m_NetThreadsCount; ++i)
-    if (m_NetThreads[i].Connections () < m_NetThreads[min].Connections ())
-      min = i;
-
-  return m_NetThreads[min].AddSocket (sock);
-
-}
-
-WorldSocketMgr*
-WorldSocketMgr::Instance ()
-{
-  return ACE_Singleton<WorldSocketMgr,ACE_Thread_Mutex>::instance();
-}
+        if (m_NetThreads)
+                delete [] m_NetThreads;
+
+        if(m_Acceptor)
+                delete m_Acceptor;
+}
+
+int WorldSocketMgr::StartReactiveIO (ACE_UINT16 port, const char* address)
+{
+        m_UseNoDelay = sConfig.GetBoolDefault ("Network.TcpNodelay", true);
+
+        int num_threads = sConfig.GetIntDefault ("Network.Threads", 1);
+
+        if (num_threads <= 0)
+        {
+                sLog.outError ("Network.Threads is wrong in your config file");
+                return -1;
+        }
+
+        m_NetThreadsCount = static_cast<size_t> (num_threads + 1);
+
+        m_NetThreads = new ReactorRunnable[m_NetThreadsCount];
+
+        sLog.outBasic ("Max alowed socket connections %d",ACE::max_handles ());
+
+        m_SockOutKBuff = sConfig.GetIntDefault ("Network.OutKBuff", -1); // -1 means use default
+
+        m_SockOutUBuff = sConfig.GetIntDefault ("Network.OutUBuff", 65536);
+
+        if ( m_SockOutUBuff <= 0 )
+        {
+                sLog.outError ("Network.OutUBuff is wrong in your config file");
+                return -1;
+        }
+
+        WorldSocket::Acceptor *acc = new WorldSocket::Acceptor;
+        m_Acceptor = acc;
+
+        ACE_INET_Addr listen_addr (port, address);
+
+        if (acc->open (listen_addr, m_NetThreads[0].GetReactor (), ACE_NONBLOCK) == -1)
+        {
+                sLog.outError ("Failed to open acceptor ,check if the port is free");
+                return -1;
+        }
+
+        for (size_t i = 0; i < m_NetThreadsCount; ++i)
+                m_NetThreads[i].Start ();
+
+        return 0;
+}
+
+int WorldSocketMgr::StartNetwork (ACE_UINT16 port, const char* address)
+{
+        if (!sLog.IsOutDebug ())
+                ACE_Log_Msg::instance ()->priority_mask (LM_ERROR, ACE_Log_Msg::PROCESS);
+
+        if (this->StartReactiveIO (port, address) == -1)
+                return -1;
+
+        return 0;
+}
+
+void WorldSocketMgr::StopNetwork ()
+{
+        if (m_Acceptor)
+        {
+                WorldSocket::Acceptor* acc = dynamic_cast<WorldSocket::Acceptor*> (m_Acceptor);
+
+                if (acc)
+                        acc->close ();
+        }
+
+        if (m_NetThreadsCount != 0)
+        {
+                for (size_t i = 0; i < m_NetThreadsCount; ++i)
+                        m_NetThreads[i].Stop ();
+        }
+
+        this->Wait ();
+}
+
+void WorldSocketMgr::Wait ()
+{
+        if (m_NetThreadsCount != 0)
+        {
+                for (size_t i = 0; i < m_NetThreadsCount; ++i)
+                        m_NetThreads[i].Wait ();
+        }
+}
+
+int WorldSocketMgr::OnSocketOpen (WorldSocket* sock)
+{
+        // set some options here
+        if (m_SockOutKBuff >= 0)
+                if (sock->peer ().set_option (SOL_SOCKET,
+                        SO_SNDBUF,
+                        (void*) & m_SockOutKBuff,
+                        sizeof (int)) == -1 && errno != ENOTSUP)
+                {
+                        sLog.outError ("WorldSocketMgr::OnSocketOpen set_option SO_SNDBUF");
+                        return -1;
+                }
+
+                static const int ndoption = 1;
+
+                // Set TCP_NODELAY.
+                if (m_UseNoDelay)
+                        if (sock->peer ().set_option (ACE_IPPROTO_TCP,
+                                TCP_NODELAY,
+                                (void*) & ndoption,
+                                sizeof (int)) == -1)
+                        {
+                                sLog.outError ("WorldSocketMgr::OnSocketOpen: peer ().set_option TCP_NODELAY errno = %s", ACE_OS::strerror (errno));
+                                return -1;
+                        }
+
+                        sock->m_OutBufferSize = static_cast<size_t> (m_SockOutUBuff);
+
+                        // we skip the Acceptor Thread
+                        size_t min = 1;
+
+                        ACE_ASSERT (m_NetThreadsCount >= 1);
+
+                        for (size_t i = 1; i < m_NetThreadsCount; ++i)
+                                if (m_NetThreads[i].Connections () < m_NetThreads[min].Connections ())
+                                        min = i;
+
+                        return m_NetThreads[min].AddSocket (sock);
+}
+
+WorldSocketMgr* WorldSocketMgr::Instance ()
+{
+        return ACE_Singleton<WorldSocketMgr,ACE_Thread_Mutex>::instance();
+}

trunk/src/shared/Database/DatabaseEnv.h

@@ -35 +35 @@
 #include "Database/DatabasePostgre.h"
 typedef DatabasePostgre DatabaseType;
-#define _LIKE_          "ILIKE"
-#define _TABLE_SIM_     "\""
+#define _LIKE_           "ILIKE"
+#define _TABLE_SIM_      "\""
 #define _CONCAT3_(A,B,C) "( " A " || " B " || " C " )"
+#define _OFFSET_         "LIMIT 1 OFFSET %d"
 #else
 #include "Database/QueryResultMysql.h"
@@ -45 +46 @@
 #include "Database/DatabaseSqlite.h"
 typedef DatabaseMysql DatabaseType;
-#define _LIKE_          "LIKE"
-#define _TABLE_SIM_     "`"
+#define _LIKE_           "LIKE"
+#define _TABLE_SIM_      "`"
 #define _CONCAT3_(A,B,C) "CONCAT( " A " , " B " , " C " )"
+#define _OFFSET_         "LIMIT %d,1"
 #endif
 

trunk/src/trinitycore/Master.cpp

@@ -458 +458 @@
     clearOnlineAccounts();
 
-    QueryResult* result = WorldDatabase.Query("SELECT version FROM db_version LIMIT 1");
-    if(result)
-    {
-        Field* fields = result->Fetch();
-
-        sLog.outString("Using %s", fields[0].GetString());
-        delete result;
-    }
-    else
-        sLog.outString("Using unknown world database.");
-
+    sWorld.LoadDBVersion();
+
+        sLog.outString("Using %s", sWorld.GetDBVersion());
     return true;
 }

trunk/src/trinitycore/RASocket.cpp

@@ -197 +197 @@
                     loginDatabase.escape_string(pw);
 
-                    QueryResult *check = loginDatabase.PQuery("SELECT 1 FROM account WHERE username = '%s' AND sha_pass_hash=SHA1(CONCAT(username,':','%s'))", login.c_str(), pw.c_str());
+                    QueryResult *check = loginDatabase.PQuery(
+                                                "SELECT 1 FROM account WHERE username = '%s' AND sha_pass_hash=SHA1(CONCAT(username,':','%s'))",
+                                                login.c_str(), pw.c_str());
+
                     if(check)
                     {