[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!

--HG--
branch : trunk

2 files changed, 6 insertions, 11 deletions

diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp
index 7ee10abe35c..9dcdc721f44 100644
--- a/src/trinitycore/Master.cpp
+++ b/src/trinitycore/Master.cpp
@@ -457,17 +457,9 @@ bool Master::_StartDB()
     ///- Clean the database before starting
     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;
 }
 
diff --git a/src/trinitycore/RASocket.cpp b/src/trinitycore/RASocket.cpp
index 69295917d7c..00f91f1a69a 100644
--- a/src/trinitycore/RASocket.cpp
+++ b/src/trinitycore/RASocket.cpp
@@ -196,7 +196,10 @@ void RASocket::OnRead()
                     loginDatabase.escape_string(login);
                     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)
                     {
                         delete check;