Changeset 149 for trunk/src/trinitycore

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/src/trinitycore

Files:

• Master.cpp (modified) (1 diff)
• RASocket.cpp (modified) (1 diff)

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)
                     {