*Merge.

--HG-- branch : trunk
author: megamage <none@none> 2009-02-04 17:22:43 -0600
committer: megamage <none@none> 2009-02-04 17:22:43 -0600
commit: d69198732e65002b53bab3a85779107490fe4dd2 (patch)
tree: e1f4b11f1964cc42ac05c79bdc43eedc1db16866 /src/shared
parent: 5d4d9530556eb66940775f12c3cc5f3c115447ca (diff)
parent: c745eba4a1d122b4184b27a982674c86ff193c23 (diff)
85 files changed, 193 insertions, 194 deletions
diff --git a/src/shared/Auth/AuthCrypt.cpp b/src/shared/Auth/AuthCrypt.cpp
index 3b6ffa0b725..2d8bd824fd1 100644
--- a/src/shared/Auth/AuthCrypt.cpp
+++ b/src/shared/Auth/AuthCrypt.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Auth/AuthCrypt.h b/src/shared/Auth/AuthCrypt.h
index dec59e1d5d3..7a0b0a4d219 100644
--- a/src/shared/Auth/AuthCrypt.h
+++ b/src/shared/Auth/AuthCrypt.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Auth/BigNumber.cpp b/src/shared/Auth/BigNumber.cpp
index 96c8e197869..becbe44c0ed 100644
--- a/src/shared/Auth/BigNumber.cpp
+++ b/src/shared/Auth/BigNumber.cpp
@@ -175,7 +175,7 @@ uint8 *BigNumber::AsByteArray(int minSize)
     // If we need more bytes than length of BigNumber set the rest to 0
     if (length > GetNumBytes())
         memset((void*)_array, 0, length);
-    
+
     BN_bn2bin(_bn, (unsigned char *)_array);
 
     std::reverse(_array, _array + length);
diff --git a/src/shared/Auth/Hmac.cpp b/src/shared/Auth/Hmac.cpp
index 9496caa14d3..5f97ee65cc2 100644
--- a/src/shared/Auth/Hmac.cpp
+++ b/src/shared/Auth/Hmac.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Auth/Hmac.h b/src/shared/Auth/Hmac.h
index b08c8515791..b8ab30f2dc7 100644
--- a/src/shared/Auth/Hmac.h
+++ b/src/shared/Auth/Hmac.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Auth/Sha1.cpp b/src/shared/Auth/Sha1.cpp
index 2ce34643e15..f367c2919b3 100644
--- a/src/shared/Auth/Sha1.cpp
+++ b/src/shared/Auth/Sha1.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Auth/Sha1.h b/src/shared/Auth/Sha1.h
index d7cf0071440..811ccc2053a 100644
--- a/src/shared/Auth/Sha1.h
+++ b/src/shared/Auth/Sha1.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/ByteBuffer.h b/src/shared/ByteBuffer.h
index 347e2ef0a45..2dd01e8a022 100644
--- a/src/shared/ByteBuffer.h
+++ b/src/shared/ByteBuffer.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index 006fa284c5d..36d65544d3c 100644
--- a/src/shared/CMakeLists.txt
+++ b/src/shared/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 add_subdirectory(vmap)
 add_subdirectory(Auth)
 add_subdirectory(Config)
diff --git a/src/shared/Common.cpp b/src/shared/Common.cpp
index 6728e419136..e70dc8358c2 100644
--- a/src/shared/Common.cpp
+++ b/src/shared/Common.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Common.h b/src/shared/Common.h
index e7b3e72bb10..1fca98831b2 100644
--- a/src/shared/Common.h
+++ b/src/shared/Common.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
@@ -25,9 +25,9 @@
 // TODO this thingy looks like hack ,but its not, need to
 // make separate header however, because It makes mess here.
 #ifdef HAVE_CONFIG_H
-// Remove Some things that we will define 
-// This is in case including another config.h 
-// before trinity config.h 
+// Remove Some things that we will define
+// This is in case including another config.h
+// before trinity config.h
 #ifdef PACKAGE
 #undef PACKAGE
 #endif //PACKAGE
diff --git a/src/shared/Config/Config.cpp b/src/shared/Config/Config.cpp
index 484b3c5f0e0..b3a3b13d652 100644
--- a/src/shared/Config/Config.cpp
+++ b/src/shared/Config/Config.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Config/Config.h b/src/shared/Config/Config.h
index a27777fa6d2..424c369bd92 100644
--- a/src/shared/Config/Config.h
+++ b/src/shared/Config/Config.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Config/ConfigEnv.h b/src/shared/Config/ConfigEnv.h
index 7058aede10c..6c3a54a45fc 100644
--- a/src/shared/Config/ConfigEnv.h
+++ b/src/shared/Config/ConfigEnv.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DBCStructure.h b/src/shared/Database/DBCStructure.h
index 4840a242401..d041f8fa3b2 100644
--- a/src/shared/Database/DBCStructure.h
+++ b/src/shared/Database/DBCStructure.h
@@ -1278,14 +1278,14 @@ struct SpellItemEnchantmentEntry
     uint32      amount[3];                                  // 5-7      m_effectPointsMin[3]
     //uint32      amount2[3]                                // 8-10     m_effectPointsMax[3]
     uint32      spellid[3];                                 // 11-13    m_effectArg[3]
-    char*       description[16];                            // 14-30    m_name_lang[16]
-    //uint32      descriptionFlags;                         // 31 name flags
-    uint32      aura_id;                                    // 32       m_itemVisual
-    uint32      slot;                                       // 33       m_flags
-    uint32      GemID;                                      // 34       m_src_itemID
-    uint32      EnchantmentCondition;                       // 35       m_condition_id
-    //uint32      requiredSkill;                            // 36       m_requiredSkillID
-    //uint32      requiredSkillValue;                       // 37       m_requiredSkillRank
+    char*       description[16];                            // 14-29    m_name_lang[16]
+    //uint32      descriptionFlags;                         // 30 name flags
+    uint32      aura_id;                                    // 31       m_itemVisual
+    uint32      slot;                                       // 32       m_flags
+    uint32      GemID;                                      // 33       m_src_itemID
+    uint32      EnchantmentCondition;                       // 34       m_condition_id
+    //uint32      requiredSkill;                            // 35       m_requiredSkillID
+    //uint32      requiredSkillValue;                       // 36       m_requiredSkillRank
 };
 
 struct SpellItemEnchantmentConditionEntry
diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp
index d67140726e5..5d7f5bf473e 100644
--- a/src/shared/Database/Database.cpp
+++ b/src/shared/Database/Database.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h
index 8d70ccaa545..beff0fb740a 100644
--- a/src/shared/Database/Database.h
+++ b/src/shared/Database/Database.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabaseEnv.h b/src/shared/Database/DatabaseEnv.h
index 9aa37d3929b..df1f51adbe7 100644
--- a/src/shared/Database/DatabaseEnv.h
+++ b/src/shared/Database/DatabaseEnv.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabaseImpl.h b/src/shared/Database/DatabaseImpl.h
index 8e4f3ce47e1..c9a02a0a4a1 100644
--- a/src/shared/Database/DatabaseImpl.h
+++ b/src/shared/Database/DatabaseImpl.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp
index dd52fcf36f0..7e67861d883 100644
--- a/src/shared/Database/DatabaseMysql.cpp
+++ b/src/shared/Database/DatabaseMysql.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h
index 3d8b92eb842..6dbaf4a59ab 100644
--- a/src/shared/Database/DatabaseMysql.h
+++ b/src/shared/Database/DatabaseMysql.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabasePostgre.cpp b/src/shared/Database/DatabasePostgre.cpp
index f576a3cfd18..8f8cf95b429 100644
--- a/src/shared/Database/DatabasePostgre.cpp
+++ b/src/shared/Database/DatabasePostgre.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabasePostgre.h b/src/shared/Database/DatabasePostgre.h
index 4e9d8f99cc0..9a2aeb84a07 100644
--- a/src/shared/Database/DatabasePostgre.h
+++ b/src/shared/Database/DatabasePostgre.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabaseSqlite.cpp b/src/shared/Database/DatabaseSqlite.cpp
index 303a118f87a..a3fffd8aa4c 100644
--- a/src/shared/Database/DatabaseSqlite.cpp
+++ b/src/shared/Database/DatabaseSqlite.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabaseSqlite.h b/src/shared/Database/DatabaseSqlite.h
index 86a9becaf62..a9593989143 100644
--- a/src/shared/Database/DatabaseSqlite.h
+++ b/src/shared/Database/DatabaseSqlite.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/Field.cpp b/src/shared/Database/Field.cpp
index 97a537fd7fd..18831e23687 100644
--- a/src/shared/Database/Field.cpp
+++ b/src/shared/Database/Field.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/Field.h b/src/shared/Database/Field.h
index 346cac39e20..a4514c963cd 100644
--- a/src/shared/Database/Field.h
+++ b/src/shared/Database/Field.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/MySQLDelayThread.h b/src/shared/Database/MySQLDelayThread.h
index 35530a86337..5f3e66de722 100644
--- a/src/shared/Database/MySQLDelayThread.h
+++ b/src/shared/Database/MySQLDelayThread.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/PGSQLDelayThread.h b/src/shared/Database/PGSQLDelayThread.h
index 4c7b1c77321..bd6a2bf962d 100644
--- a/src/shared/Database/PGSQLDelayThread.h
+++ b/src/shared/Database/PGSQLDelayThread.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h
index 82b9a2c5545..0fab7a3633b 100644
--- a/src/shared/Database/QueryResult.h
+++ b/src/shared/Database/QueryResult.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/QueryResultMysql.cpp b/src/shared/Database/QueryResultMysql.cpp
index a3c358edc1f..8ae59b350d8 100644
--- a/src/shared/Database/QueryResultMysql.cpp
+++ b/src/shared/Database/QueryResultMysql.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/QueryResultMysql.h b/src/shared/Database/QueryResultMysql.h
index 894bd365ee3..39d2985ad77 100644
--- a/src/shared/Database/QueryResultMysql.h
+++ b/src/shared/Database/QueryResultMysql.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/QueryResultPostgre.cpp b/src/shared/Database/QueryResultPostgre.cpp
index 05a120df4af..e10905f0feb 100644
--- a/src/shared/Database/QueryResultPostgre.cpp
+++ b/src/shared/Database/QueryResultPostgre.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/QueryResultPostgre.h b/src/shared/Database/QueryResultPostgre.h
index dff207dcb09..aa183ab4b96 100644
--- a/src/shared/Database/QueryResultPostgre.h
+++ b/src/shared/Database/QueryResultPostgre.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/QueryResultSqlite.cpp b/src/shared/Database/QueryResultSqlite.cpp
index 0f3919b9069..9a32e36bc84 100644
--- a/src/shared/Database/QueryResultSqlite.cpp
+++ b/src/shared/Database/QueryResultSqlite.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/QueryResultSqlite.h b/src/shared/Database/QueryResultSqlite.h
index b88ecb7d249..d3462977e49 100644
--- a/src/shared/Database/QueryResultSqlite.h
+++ b/src/shared/Database/QueryResultSqlite.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp
index 65fe5340c2a..4d4b883926a 100644
--- a/src/shared/Database/SQLStorage.cpp
+++ b/src/shared/Database/SQLStorage.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/SQLStorage.h b/src/shared/Database/SQLStorage.h
index e4d0b3f01d9..f2250410c26 100644
--- a/src/shared/Database/SQLStorage.h
+++ b/src/shared/Database/SQLStorage.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/SqlDelayThread.cpp b/src/shared/Database/SqlDelayThread.cpp
index a91bd12a3c0..a35090adb7e 100644
--- a/src/shared/Database/SqlDelayThread.cpp
+++ b/src/shared/Database/SqlDelayThread.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/SqlDelayThread.h b/src/shared/Database/SqlDelayThread.h
index 39936d1e203..1fc35741fc5 100644
--- a/src/shared/Database/SqlDelayThread.h
+++ b/src/shared/Database/SqlDelayThread.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp
index c7148ab086c..233eed1e4cb 100644
--- a/src/shared/Database/SqlOperations.cpp
+++ b/src/shared/Database/SqlOperations.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/SqlOperations.h b/src/shared/Database/SqlOperations.h
index 28e854e02e9..b7c84b5d6cf 100644
--- a/src/shared/Database/SqlOperations.h
+++ b/src/shared/Database/SqlOperations.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/dbcfile.cpp b/src/shared/Database/dbcfile.cpp
index 7fe95f0624e..f0b7e6e3c15 100644
--- a/src/shared/Database/dbcfile.cpp
+++ b/src/shared/Database/dbcfile.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/dbcfile.h b/src/shared/Database/dbcfile.h
index ca12dfb989d..470322326aa 100644
--- a/src/shared/Database/dbcfile.h
+++ b/src/shared/Database/dbcfile.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Errors.h b/src/shared/Errors.h
index e53d36555ac..a521ae7f3f0 100644
--- a/src/shared/Errors.h
+++ b/src/shared/Errors.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Log.cpp b/src/shared/Log.cpp
index 61f5fcb4097..2ed66ae3189 100644
--- a/src/shared/Log.cpp
+++ b/src/shared/Log.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Log.h b/src/shared/Log.h
index f7dce238725..076d660be61 100644
--- a/src/shared/Log.h
+++ b/src/shared/Log.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/PacketLog.cpp b/src/shared/PacketLog.cpp
index 5af9bd69aed..2fcd6c58b9b 100644
--- a/src/shared/PacketLog.cpp
+++ b/src/shared/PacketLog.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/PacketLog.h b/src/shared/PacketLog.h
index d914efdcb76..b4313c48624 100644
--- a/src/shared/PacketLog.h
+++ b/src/shared/PacketLog.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/ProgressBar.cpp b/src/shared/ProgressBar.cpp
index 009aed2e7e2..0108dfec974 100644
--- a/src/shared/ProgressBar.cpp
+++ b/src/shared/ProgressBar.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/ProgressBar.h b/src/shared/ProgressBar.h
index 855f30a235a..8c551ed65dc 100644
--- a/src/shared/ProgressBar.h
+++ b/src/shared/ProgressBar.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/ServiceWin32.cpp b/src/shared/ServiceWin32.cpp
index 7ccad749c5f..878656b1d91 100644
--- a/src/shared/ServiceWin32.cpp
+++ b/src/shared/ServiceWin32.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/ServiceWin32.h b/src/shared/ServiceWin32.h
index 5c668f8e046..762502ccaa7 100644
--- a/src/shared/ServiceWin32.h
+++ b/src/shared/ServiceWin32.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Timer.h b/src/shared/Timer.h
index a27f4889049..30f5966afce 100644
--- a/src/shared/Timer.h
+++ b/src/shared/Timer.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
@@ -50,7 +50,7 @@ inline uint32 getMSTime()
 inline uint32 getMSTimeDiff(uint32 oldMSTime, uint32 newMSTime)
 {
     // getMSTime() have limited data range and this is case when it overflow in this tick
-    if (oldMSTime > newMSTime)                    
+    if (oldMSTime > newMSTime)
         return (0xFFFFFFFF - oldMSTime) + newMSTime;
     else
         return newMSTime - oldMSTime;
diff --git a/src/shared/Util.cpp b/src/shared/Util.cpp
index 9062fc99624..0d3010c5f04 100644
--- a/src/shared/Util.cpp
+++ b/src/shared/Util.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
@@ -28,7 +28,7 @@
 typedef ZThread::ThreadLocal<MTRand> MTRandTSS;
 
 /* NOTE: Not sure if static initialization is ok for TSS objects ,
- * as I see zthread uses custom implementation of the TSS 
+ * as I see zthread uses custom implementation of the TSS
  * ,and in the consturctor there is no code ,so I suppose its ok
  * If its not ok ,change it to use singleton.
  */
diff --git a/src/shared/Util.h b/src/shared/Util.h
index b10e29ef4af..adfbdad620a 100644
--- a/src/shared/Util.h
+++ b/src/shared/Util.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
@@ -161,7 +161,7 @@ inline bool isEastAsianCharacter(wchar_t wchar)
         return true;
     if(wchar >= 0x31F0 && wchar <= 0x31FF)                  // Katakana Phonetic Ext.
         return true;
-    if(wchar >= 0x3400 && wchar <= 0x4DB5)                  // CJK Ideographs Ext. A 
+    if(wchar >= 0x3400 && wchar <= 0x4DB5)                  // CJK Ideographs Ext. A
         return true;
     if(wchar >= 0x4E00 && wchar <= 0x9FC3)                  // Unified CJK Ideographs
         return true;
diff --git a/src/shared/WorldPacket.h b/src/shared/WorldPacket.h
index 8d3e4fd8cbb..4d30533d2f1 100644
--- a/src/shared/WorldPacket.h
+++ b/src/shared/WorldPacket.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index cd1d48dc8b3..a257b588318 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7226"
+ #define REVISION_NR "7227"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/vmap/AABSPTree.h b/src/shared/vmap/AABSPTree.h
index 9b44470e7d9..5107676d48e 100644
--- a/src/shared/vmap/AABSPTree.h
+++ b/src/shared/vmap/AABSPTree.h
@@ -1,14 +1,14 @@
 /**
   @file AABSPTree.h
-  
+
   @maintainer Morgan McGuire, matrix@graphics3d.com
- 
+
   @created 2004-01-11
   @edited  2007-02-16
 
   Copyright 2000-2007, Morgan McGuire.
   All rights reserved.
-  
+
   */
 
 #ifndef G3D_AABSPTREE_H
@@ -89,7 +89,7 @@ namespace G3D {
 
     /**
      Wraps a pointer value so that it can be treated as the instance itself;
-     convenient for inserting pointers into a Table but using the 
+     convenient for inserting pointers into a Table but using the
      object equality instead of pointer equality.
     */
     template<class Type>
@@ -136,9 +136,9 @@ namespace G3D {
  AABSPTree is as powerful as but more general than a Quad Tree, Oct
  Tree, or KD Tree, but less general than an unconstrained BSP tree
  (which is much slower to create).
- 
+
  Internally, objects
- are arranged into an axis-aligned BSP-tree according to their 
+ are arranged into an axis-aligned BSP-tree according to their
  axis-aligned bounds.  This increases the cost of insertion to
  O(log n) but allows fast overlap queries.
 
@@ -158,13 +158,13 @@ namespace G3D {
  <B>Moving %Set Members</B>
  <DT>It is important that objects do not move without updating the
  AABSPTree.  If the axis-aligned bounds of an object are about
- to change, AABSPTree::remove it before they change and 
+ to change, AABSPTree::remove it before they change and
  AABSPTree::insert it again afterward.  For objects
- where the hashCode and == operator are invariant with respect 
+ where the hashCode and == operator are invariant with respect
  to the 3D position,
  you can use the AABSPTree::update method as a shortcut to
  insert/remove an object in one step after it has moved.
- 
+
 
  Note: Do not mutate any value once it has been inserted into AABSPTree. Values
  are copied interally. All AABSPTree iterators convert to pointers to constant
@@ -185,9 +185,9 @@ namespace G3D {
 */
 namespace _AABSPTree {
 
-    /** Wrapper for a value that includes a cache of its bounds. 
+    /** Wrapper for a value that includes a cache of its bounds.
         Except for the test value used in a set-query operation, there
-        is only ever one instance of the handle associated with any 
+        is only ever one instance of the handle associated with any
         value and the memberTable and Nodes maintain pointers to that
         heap-allocated value.
      */
@@ -261,10 +261,10 @@ public:
 
     /** Returns the bounds of the sub array. Used by makeNode. */
     static AABox computeBounds(
-    const Array<_AABSPTree::Handle<T>*>& point, 
+    const Array<_AABSPTree::Handle<T>*>& point,
         int                   beginIndex,
         int                   endIndex) {
-    
+
         Vector3 lo = Vector3::inf();
         Vector3 hi = -lo;
 
@@ -357,8 +357,8 @@ public:
 
         /** Location along the specified axis */
         float               splitLocation;
- 
-        /** child[0] contains all values strictly 
+
+        /** child[0] contains all values strictly
             smaller than splitLocation along splitAxis.
 
             child[1] contains all values strictly
@@ -371,15 +371,15 @@ public:
 
         /** Array of values at this node (i.e., values
             straddling the split plane + all values if
-            this is a leaf node). 
+            this is a leaf node).
 
             This is an array of pointers because that minimizes
-            data movement during tree building, which accounts 
+            data movement during tree building, which accounts
             for about 15% of the time cost of tree building.
           */
         Array<_AABSPTree::Handle<T> * >      valueArray;
 
-        /** For each object in the value array, a copy of its bounds. 
+        /** For each object in the value array, a copy of its bounds.
             Packing these into an array at the node level
             instead putting them in the valueArray improves
             cache coherence, which is about a 3x performance
@@ -403,7 +403,7 @@ public:
         Node(const Node& other) : valueArray(other.valueArray), boundsArray(other.boundsArray) {
             splitAxis       = other.splitAxis;
             splitLocation   = other.splitLocation;
-            splitBounds     = other.splitBounds;            
+            splitBounds     = other.splitBounds;
             for (int i = 0; i < 2; ++i) {
                 child[i] = NULL;
             }
@@ -490,7 +490,7 @@ public:
 #if 0
         /**
           Stores the locations of the splitting planes (the structure but not the content)
-          so that the tree can be quickly rebuilt from a previous configuration without 
+          so that the tree can be quickly rebuilt from a previous configuration without
           calling balance.
          */
         static void serializeStructure(const Node* n, BinaryOutput& bo) {
@@ -546,7 +546,7 @@ public:
         }
 
 
-        /** Appends all members that intersect the box. 
+        /** Appends all members that intersect the box.
             If useSphere is true, members that pass the box test
             face a second test against the sphere. */
         void getIntersectingMembers(
@@ -604,11 +604,11 @@ public:
             // See if the ray will ever hit this node or its children
             Vector3 location;
             bool alreadyInsideBounds = false;
-            bool rayWillHitBounds = 
+            bool rayWillHitBounds =
                 VMAP::MyCollisionDetection::collisionLocationForMovingPointFixedAABox(
                     ray.origin, ray.direction, splitBounds, location, alreadyInsideBounds);
-           
-            bool canHitThisNode = (alreadyInsideBounds ||                
+
+            bool canHitThisNode = (alreadyInsideBounds ||
                 (rayWillHitBounds && ((location - ray.origin).squaredLength() < square(distance))));
 
             return canHitThisNode;
@@ -616,20 +616,20 @@ public:
 
         template<typename RayCallback>
         void intersectRay(
-            const Ray& ray, 
-            RayCallback& intersectCallback, 
+            const Ray& ray,
+            RayCallback& intersectCallback,
             float& distance,
             bool pStopAtFirstHit,
             bool intersectCallbackIsFast) const {
                 float enterDistance = distance;
-            
+
             if (! intersects(ray, distance)) {
                 // The ray doesn't hit this node, so it can't hit the children of the node.
                 return;
             }
 
             // Test for intersection against every object at this node.
-            for (int v = 0; v < valueArray.size(); ++v) {        
+            for (int v = 0; v < valueArray.size(); ++v) {
                 bool canHitThisObject = true;
 
                 if (! intersectCallbackIsFast) {
@@ -637,11 +637,11 @@ public:
                     Vector3 location;
                     const AABox& bounds = boundsArray[v];
                     bool alreadyInsideBounds = false;
-                    bool rayWillHitBounds = 
+                    bool rayWillHitBounds =
                         VMAP::MyCollisionDetection::collisionLocationForMovingPointFixedAABox(
                             ray.origin, ray.direction, bounds, location, alreadyInsideBounds);
 
-                    canHitThisObject = (alreadyInsideBounds ||                
+                    canHitThisObject = (alreadyInsideBounds ||
                         (rayWillHitBounds && ((location - ray.origin).squaredLength() < square(distance))));
                 }
 
@@ -656,7 +656,7 @@ public:
             }
 
             // There are three cases to consider next:
-            // 
+            //
             //  1. the ray can start on one side of the splitting plane and never enter the other,
             //  2. the ray can start on one side and enter the other, and
             //  3. the ray can travel exactly down the splitting plane
@@ -666,7 +666,7 @@ public:
             int secondChild = NONE;
 
             if (ray.origin[splitAxis] < splitLocation) {
-                
+
                 // The ray starts on the small side
                 firstChild = 0;
 
@@ -702,7 +702,7 @@ public:
             }
 
             if (ray.direction[splitAxis] != 0) {
-                // See if there was an intersection before hitting the splitting plane.  
+                // See if there was an intersection before hitting the splitting plane.
                 // If so, there is no need to look on the far side and recursion terminates.
                 float distanceToSplittingPlane = (splitLocation - ray.origin[splitAxis]) / ray.direction[splitAxis];
                 if (distanceToSplittingPlane > distance) {
@@ -724,43 +724,43 @@ public:
 
     /**
      Recursively subdivides the subarray.
-    
+
      Clears the source array as soon as it is no longer needed.
 
      Call assignSplitBounds() on the root node after making a tree.
      */
     Node* makeNode(
-        Array<_AABSPTree::Handle<T> * >& source, 
-        int valuesPerNode, 
+        Array<_AABSPTree::Handle<T> * >& source,
+        int valuesPerNode,
         int numMeanSplits,
         Array<_AABSPTree::Handle<T> * >& temp)  {
 
 	    Node* node = NULL;
-	    
+
 	    if (source.size() <= valuesPerNode) {
 		    // Make a new leaf node
 		    node = new Node(source);
-		    
+
 		    // Set the pointers in the memberTable
 		    for (int i = 0; i < source.size(); ++i) {
 			    memberTable.set(Member(source[i]), node);
 		    }
             source.clear();
-		    
+
         } else {
 		    // Make a new internal node
 		    node = new Node();
-		    
+
             const AABox bounds = computeBounds(source, 0, source.size() - 1);
 		    const Vector3 extent = bounds.high() - bounds.low();
-		    
+
 		    Vector3::Axis splitAxis = extent.primaryAxis();
-		    
+
             float splitLocation;
 
             // Arrays for holding the children
             Array<_AABSPTree::Handle<T> * > lt, gt;
-                
+
             if (numMeanSplits <= 0) {
 
                 source.medianPartition(lt, node->valueArray, gt, temp, CenterComparator(splitAxis));
@@ -788,13 +788,13 @@ public:
                         // is swapped in in its place.
                         gt.fastRemove(i); --i;
                     }
-                }            
+                }
 
                 if ((node->valueArray.size() > (source.size() / 2)) &&
                     (source.size() > 6)) {
-                    // This was a bad partition; we ended up putting the splitting plane right in the middle of most of the 
-                    // objects.  We could try to split on a different axis, or use a different partition (e.g., the extents mean, 
-                    // or geometric mean).  This implementation falls back on the extents mean, since that case is already handled 
+                    // This was a bad partition; we ended up putting the splitting plane right in the middle of most of the
+                    // objects.  We could try to split on a different axis, or use a different partition (e.g., the extents mean,
+                    // or geometric mean).  This implementation falls back on the extents mean, since that case is already handled
                     // below.
                     numMeanSplits = 1;
                 }
@@ -805,9 +805,9 @@ public:
 
             if (numMeanSplits > 0) {
                 // Split along the mean
-                splitLocation = (bounds.high()[splitAxis] + 
+                splitLocation = (bounds.high()[splitAxis] +
                                  bounds.low()[splitAxis]) / 2.0;
-                
+
                 source.partition(NULL, lt, node->valueArray, gt, Comparator(splitAxis, splitLocation));
 
                 // The Comparator ensures that elements are strictly on the correct side of the split
@@ -817,7 +817,7 @@ public:
 #           if defined(G3D_DEBUG) && defined(VERIFY_TREE)
                 debugAssert(lt.size() + node->valueArray.size() + gt.size() == source.size());
                 // Verify that all objects ended up on the correct side of the split.
-                // (i.e., make sure that the Array partition was correct) 
+                // (i.e., make sure that the Array partition was correct)
                 for (int i = 0; i < lt.size(); ++i) {
                     const AABox& bounds  = lt[i]->bounds;
                     debugAssert(bounds.high()[splitAxis] < splitLocation);
@@ -849,16 +849,16 @@ public:
 			    memberTable.set(Member(v), node);
             }
 
-            if (lt.size() > 0) {		    
+            if (lt.size() > 0) {
 			    node->child[0] = makeNode(lt, valuesPerNode, numMeanSplits - 1, temp);
 		    }
-		    
+
 		    if (gt.size() > 0) {
 			    node->child[1] = makeNode(gt, valuesPerNode, numMeanSplits - 1, temp);
 		    }
-		    
+
 	    }
-	    
+
 	    return node;
     }
 
@@ -927,7 +927,7 @@ public:
      */
     void clear() {
         typedef typename Table<_internal::Indirector<_AABSPTree::Handle<T> >, Node* >::Iterator It;
-  
+
         // Delete all handles stored in the member table
         It cur = memberTable.begin();
         It end = memberTable.end();
@@ -970,7 +970,7 @@ public:
         // Insert into the node
         node->valueArray.append(h);
         node->boundsArray.append(h->bounds);
-        
+
         // Insert into the node table
         Member m(h);
         memberTable.set(m, node);
@@ -1022,8 +1022,8 @@ public:
     /**
      Removes an object from the set in O(1) time.
      It is an error to remove members that are not already
-     present.  May unbalance the tree.  
-     
+     present.  May unbalance the tree.
+
      Removing an element never causes a node (split plane) to be removed...
      nodes are only changed when the tree is rebalanced.  This behavior
      is desirable because it allows the split planes to be serialized,
@@ -1075,7 +1075,7 @@ public:
      on <I>T</I> are independent of the bounds.  In
      that case, you may call update(v) to insert an
      element for the first time and call update(v)
-     again every time it moves to keep the tree 
+     again every time it moves to keep the tree
      up to date.
      */
     void update(const T& value) {
@@ -1091,15 +1091,15 @@ public:
      have moved substantially from their original positions
      (which unbalances the tree and causes the spatial
      queries to be slow).
-     
+
      @param valuesPerNode Maximum number of elements to put at
      a node.
 
-     @param numMeanSplits numMeanSplits = 0 gives a 
+     @param numMeanSplits numMeanSplits = 0 gives a
      fully axis aligned BSP-tree, where the balance operation attempts to balance
      the tree so that every splitting plane has an equal number of left
-     and right children (i.e. it is a <B>median</B> split along that axis).  
-     This tends to maximize average performance.  
+     and right children (i.e. it is a <B>median</B> split along that axis).
+     This tends to maximize average performance.
 
      You can override this behavior by
      setting a number of <B>mean</B> (average) splits.  numMeanSplits = MAX_INT
@@ -1126,7 +1126,7 @@ public:
         }
 
         Array<_AABSPTree::Handle<T> * > temp;
-        // Make a new root.  Work with a copy of the value array because 
+        // Make a new root.  Work with a copy of the value array because
         // makeNode clears the source array as it progresses
         Array<_AABSPTree::Handle<T> * > copy(oldRoot->valueArray);
         root = makeNode(copy, valuesPerNode, numMeanSplits, temp);
@@ -1195,7 +1195,7 @@ protected:
 public:
 
     /**
-     Returns all members inside the set of planes.  
+     Returns all members inside the set of planes.
       @param members The results are appended to this array.
      */
     void getIntersectingMembers(const Array<Plane>& plane, Array<T>& members) const {
@@ -1221,7 +1221,7 @@ public:
       */
     void getIntersectingMembers(const GCamera::Frustum& frustum, Array<T>& members) const {
         Array<Plane> plane;
-        
+
         for (int i = 0; i < frustum.faceArray.size(); ++i) {
             plane.append(frustum.faceArray[i].plane);
         }
@@ -1260,14 +1260,14 @@ public:
         // caller uses post increment (which they shouldn't!).
         Array<Node*>    stack;
 
-        /** The next index of current->valueArray to return. 
+        /** The next index of current->valueArray to return.
             Undefined when isEnd is true.*/
         int             nextValueArrayIndex;
 
         BoxIntersectionIterator() : isEnd(true) {}
-        
-        BoxIntersectionIterator(const AABox& b, const Node* root) : 
-           isEnd(root == NULL), box(b), 
+
+        BoxIntersectionIterator(const AABox& b, const Node* root) :
+           isEnd(root == NULL), box(b),
            node(const_cast<Node*>(root)), nextValueArrayIndex(-1) {
 
            // We intentionally start at the "-1" index of the current
@@ -1290,10 +1290,10 @@ public:
             } else if (other.isEnd) {
                 return false;
             } else {
-                // Two non-end iterators; see if they match.  This is kind of 
+                // Two non-end iterators; see if they match.  This is kind of
                 // silly; users shouldn't call == on iterators in general unless
                 // one of them is the end iterator.
-                if ((box != other.box) || (node != other.node) || 
+                if ((box != other.box) || (node != other.node) ||
                     (nextValueArrayIndex != other.nextValueArrayIndex) ||
                     (stack.length() != other.stack.length())) {
                     return false;
@@ -1322,7 +1322,7 @@ public:
 
 				// Search for the next node if we've exhausted this one
                 while ((! isEnd) &&  (nextValueArrayIndex >= node->valueArray.length())) {
-					// If we entered this loop, then the iterator has exhausted the elements at 
+					// If we entered this loop, then the iterator has exhausted the elements at
 					// node (possibly because it just switched to a child node with no members).
 					// This loop continues until it finds a node with members or reaches
 					// the end of the whole intersection search.
@@ -1333,7 +1333,7 @@ public:
 						(box.high()[node->splitAxis] > node->splitLocation)) {
 						stack.push(node->child[1]);
 					}
-                
+
 					// If the left child overlaps the box, push it onto the stack for
 					// processing.
 					if ((node->child[0] != NULL) &&
@@ -1342,7 +1342,7 @@ public:
 					}
 
 					if (stack.length() > 0) {
-						// Go on to the next node (which may be either one of the ones we 
+						// Go on to the next node (which may be either one of the ones we
 						// just pushed, or one from farther back the tree).
 						node = stack.pop();
 						nextValueArrayIndex = 0;
@@ -1358,7 +1358,7 @@ public:
 						foundIntersection = true;
 					} else {
 						++nextValueArrayIndex;
-						// If we exhaust this node, we'll loop around the master loop 
+						// If we exhaust this node, we'll loop around the master loop
 						// to find a new node.
 					}
 				}
@@ -1431,7 +1431,7 @@ public:
      Invoke a callback for every member along a ray until the closest intersection is found.
 
      @param callback either a function or an instance of a class with an overloaded operator() of the form:
-             
+
             <code>void callback(const Ray& ray, const T& object, float& distance)</code>.  If the ray hits the object
             before travelling distance <code>distance</code>, updates <code>distance</code> with the new distance to
             the intersection, otherwise leaves it unmodified.  A common example is:
@@ -1482,12 +1482,12 @@ public:
      */
     template<typename RayCallback>
     void intersectRay(
-        const Ray& ray, 
-        RayCallback& intersectCallback, 
+        const Ray& ray,
+        RayCallback& intersectCallback,
         float& distance,
         bool pStopAtFirstHit,
         bool intersectCallbackIsFast = false) const {
-        
+
         root->intersectRay(ray, intersectCallback, distance, pStopAtFirstHit, intersectCallbackIsFast);
 
     }
@@ -1509,7 +1509,7 @@ public:
 #if 0
     /**
       Stores the locations of the splitting planes (the structure but not the content)
-      so that the tree can be quickly rebuilt from a previous configuration without 
+      so that the tree can be quickly rebuilt from a previous configuration without
       calling balance.
      */
     void serializeStructure(BinaryOutput& bo) const {
@@ -1593,9 +1593,9 @@ public:
 
 
     /**
-     C++ STL style iterator method.  Returns the first member.  
+     C++ STL style iterator method.  Returns the first member.
      Use preincrement (++entry) to get to the next element (iteration
-     order is arbitrary).  
+     order is arbitrary).
      Do not modify the set while iterating.
      */
     Iterator begin() const {
diff --git a/src/shared/vmap/BaseModel.cpp b/src/shared/vmap/BaseModel.cpp
index f281fdd8f61..bce9c718acd 100644
--- a/src/shared/vmap/BaseModel.cpp
+++ b/src/shared/vmap/BaseModel.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
@@ -84,11 +84,11 @@ namespace VMAP
         // See if the ray will ever hit this node or its children
         Vector3 location;
         bool alreadyInsideBounds = false;
-        bool rayWillHitBounds = 
+        bool rayWillHitBounds =
             MyCollisionDetection::collisionLocationForMovingPointFixedAABox(
             pRay.origin, pRay.direction, pBox, location, alreadyInsideBounds);
 
-        bool canHitThisNode = (alreadyInsideBounds ||                
+        bool canHitThisNode = (alreadyInsideBounds ||
             (rayWillHitBounds && ((location - pRay.origin).squaredLength() < (pMaxDist * pMaxDist))));
 
         return canHitThisNode;
diff --git a/src/shared/vmap/BaseModel.h b/src/shared/vmap/BaseModel.h
index b6d698dd056..42e277634ba 100644
--- a/src/shared/vmap/BaseModel.h
+++ b/src/shared/vmap/BaseModel.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/CoordModelMapping.cpp b/src/shared/vmap/CoordModelMapping.cpp
index 85ee88e5478..9c7cbe58a6b 100644
--- a/src/shared/vmap/CoordModelMapping.cpp
+++ b/src/shared/vmap/CoordModelMapping.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/CoordModelMapping.h b/src/shared/vmap/CoordModelMapping.h
index ad63929ed38..10392ca7eaf 100644
--- a/src/shared/vmap/CoordModelMapping.h
+++ b/src/shared/vmap/CoordModelMapping.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/DebugCmdLogger.cpp b/src/shared/vmap/DebugCmdLogger.cpp
index 87bbd247275..26846fa5783 100644
--- a/src/shared/vmap/DebugCmdLogger.cpp
+++ b/src/shared/vmap/DebugCmdLogger.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
@@ -25,7 +25,7 @@ using namespace G3D;
 namespace VMAP
 {
 
-    bool CommandFileRW::appendCmd(const Command& 
+    bool CommandFileRW::appendCmd(const Command&
 #ifdef _DEBUG
         pCommand
 #endif
@@ -55,7 +55,7 @@ namespace VMAP
 
     //=========================================================
 
-    bool CommandFileRW::appendCmds(const Array<Command>& 
+    bool CommandFileRW::appendCmds(const Array<Command>&
 #ifdef _DEBUG
         pCmdArray
 #endif
diff --git a/src/shared/vmap/DebugCmdLogger.h b/src/shared/vmap/DebugCmdLogger.h
index bc4c59ef195..f0e35d377bf 100644
--- a/src/shared/vmap/DebugCmdLogger.h
+++ b/src/shared/vmap/DebugCmdLogger.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/IVMapManager.h b/src/shared/vmap/IVMapManager.h
index d26f9be3f4f..49f639b845e 100644
--- a/src/shared/vmap/IVMapManager.h
+++ b/src/shared/vmap/IVMapManager.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/ManagedModelContainer.cpp b/src/shared/vmap/ManagedModelContainer.cpp
index f9f74e21ad8..34800b3b5f7 100644
--- a/src/shared/vmap/ManagedModelContainer.cpp
+++ b/src/shared/vmap/ManagedModelContainer.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/ManagedModelContainer.h b/src/shared/vmap/ManagedModelContainer.h
index 3674e04987a..5aa6bfdf1c3 100644
--- a/src/shared/vmap/ManagedModelContainer.h
+++ b/src/shared/vmap/ManagedModelContainer.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/ModelContainer.cpp b/src/shared/vmap/ModelContainer.cpp
index c5e3a333f50..56d09083677 100644
--- a/src/shared/vmap/ModelContainer.cpp
+++ b/src/shared/vmap/ModelContainer.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/ModelContainer.h b/src/shared/vmap/ModelContainer.h
index 319c480fff8..f66b11658d6 100644
--- a/src/shared/vmap/ModelContainer.h
+++ b/src/shared/vmap/ModelContainer.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/NodeValueAccess.h b/src/shared/vmap/NodeValueAccess.h
index 35051f1fbbf..70bd0eeefae 100644
--- a/src/shared/vmap/NodeValueAccess.h
+++ b/src/shared/vmap/NodeValueAccess.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/ShortBox.h b/src/shared/vmap/ShortBox.h
index 61bd0f97dcd..059e59f47e6 100644
--- a/src/shared/vmap/ShortBox.h
+++ b/src/shared/vmap/ShortBox.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/ShortVector.h b/src/shared/vmap/ShortVector.h
index 3bf707dff5a..d02e6b4081e 100644
--- a/src/shared/vmap/ShortVector.h
+++ b/src/shared/vmap/ShortVector.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/SubModel.cpp b/src/shared/vmap/SubModel.cpp
index 02e9865caad..ed586ce6b52 100644
--- a/src/shared/vmap/SubModel.cpp
+++ b/src/shared/vmap/SubModel.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/SubModel.h b/src/shared/vmap/SubModel.h
index 19d213cc1c0..5a0b0d38be7 100644
--- a/src/shared/vmap/SubModel.h
+++ b/src/shared/vmap/SubModel.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/TileAssembler.cpp b/src/shared/vmap/TileAssembler.cpp
index d74adae1ecf..e57836a6f9e 100644
--- a/src/shared/vmap/TileAssembler.cpp
+++ b/src/shared/vmap/TileAssembler.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/TileAssembler.h b/src/shared/vmap/TileAssembler.h
index 5d4efcdf720..cdfd6e1311d 100644
--- a/src/shared/vmap/TileAssembler.h
+++ b/src/shared/vmap/TileAssembler.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/TreeNode.cpp b/src/shared/vmap/TreeNode.cpp
index 5d285704410..1c0cff7d4b3 100644
--- a/src/shared/vmap/TreeNode.cpp
+++ b/src/shared/vmap/TreeNode.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/TreeNode.h b/src/shared/vmap/TreeNode.h
index e98e1fe1d29..d30b470b4b3 100644
--- a/src/shared/vmap/TreeNode.h
+++ b/src/shared/vmap/TreeNode.h
@@ -1,4 +1,4 @@
-/* 
+/*
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
@@ -109,11 +109,11 @@ namespace VMAP
             // See if the ray will ever hit this node or its children
             G3D::Vector3 location;
             bool alreadyInsideBounds = false;
-            bool rayWillHitBounds = 
+            bool rayWillHitBounds =
                 MyCollisionDetection::collisionLocationForMovingPointFixedAABox(
                 ray.origin, ray.direction, iBounds, location, alreadyInsideBounds);
 
-            bool canHitThisNode = (alreadyInsideBounds ||                
+            bool canHitThisNode = (alreadyInsideBounds ||
                 (rayWillHitBounds && ((location - ray.origin).squaredLength() < (distance*distance))));
 
             return canHitThisNode;
@@ -121,8 +121,8 @@ namespace VMAP
 
         template<typename RayCallback, typename TNode, typename TValue>
         void intersectRay(
-            const G3D::Ray& ray, 
-            RayCallback& intersectCallback, 
+            const G3D::Ray& ray,
+            RayCallback& intersectCallback,
             float& distance,
             const NodeValueAccess<TNode, TValue>& pNodeValueAccess,
             bool pStopAtFirstHit,
@@ -134,7 +134,7 @@ namespace VMAP
                 }
 
                 // Test for intersection against every object at this node.
-                for (unsigned int v = iStartPosition; v < (iNumberOfValues+iStartPosition); ++v) {        
+                for (unsigned int v = iStartPosition; v < (iNumberOfValues+iStartPosition); ++v) {
                     const TValue& nodeValue = pNodeValueAccess.getValue(v);
                     bool canHitThisObject = true;
                     if (! intersectCallbackIsFast) {
@@ -142,11 +142,11 @@ namespace VMAP
                         G3D::Vector3 location;
                         const G3D::AABox& bounds = nodeValue.getAABoxBounds();
                         bool alreadyInsideBounds = false;
-                        bool rayWillHitBounds = 
+                        bool rayWillHitBounds =
                             MyCollisionDetection::collisionLocationForMovingPointFixedAABox(
                             ray.origin, ray.direction, bounds, location, alreadyInsideBounds);
 
-                        canHitThisObject = (alreadyInsideBounds ||                
+                        canHitThisObject = (alreadyInsideBounds ||
                             (rayWillHitBounds && ((location - ray.origin).squaredLength() < (distance*distance))));
                     }
 
@@ -160,7 +160,7 @@ namespace VMAP
                 }
 
                 // There are three cases to consider next:
-                // 
+                //
                 //  1. the ray can start on one side of the splitting plane and never enter the other,
                 //  2. the ray can start on one side and enter the other, and
                 //  3. the ray can travel exactly down the splitting plane
@@ -205,7 +205,7 @@ namespace VMAP
                         return;
                 }
                 if (ray.direction[iSplitAxis] != 0) {
-                    // See if there was an intersection before hitting the splitting plane.  
+                    // See if there was an intersection before hitting the splitting plane.
                     // If so, there is no need to look on the far side and recursion terminates.
                     float distanceToSplittingPlane = (iSplitLocation - ray.origin[iSplitAxis]) / ray.direction[iSplitAxis];
                     if (distanceToSplittingPlane > distance) {
diff --git a/src/shared/vmap/VMapDefinitions.h b/src/shared/vmap/VMapDefinitions.h
index 70a42cde054..35c672bd82e 100644
--- a/src/shared/vmap/VMapDefinitions.h
+++ b/src/shared/vmap/VMapDefinitions.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/VMapFactory.cpp b/src/shared/vmap/VMapFactory.cpp
index 249c0725196..f0a78ba4f1c 100644
--- a/src/shared/vmap/VMapFactory.cpp
+++ b/src/shared/vmap/VMapFactory.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/VMapFactory.h b/src/shared/vmap/VMapFactory.h
index b451f163d92..738a8a7f4e0 100644
--- a/src/shared/vmap/VMapFactory.h
+++ b/src/shared/vmap/VMapFactory.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/VMapManager.cpp b/src/shared/vmap/VMapManager.cpp
index a3d6142a122..9cf35b2655d 100644
--- a/src/shared/vmap/VMapManager.cpp
+++ b/src/shared/vmap/VMapManager.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/VMapManager.h b/src/shared/vmap/VMapManager.h
index c2cabe40281..02e0ec3e179 100644
--- a/src/shared/vmap/VMapManager.h
+++ b/src/shared/vmap/VMapManager.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/VMapTools.h b/src/shared/vmap/VMapTools.h
index 1cda2a7bbe4..5253392f867 100644
--- a/src/shared/vmap/VMapTools.h
+++ b/src/shared/vmap/VMapTools.h
@@ -1,4 +1,4 @@
-/* 
+/*
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
@@ -34,7 +34,7 @@ The collision detection is modified to return true, if we are inside an object.
 
 namespace VMAP
 {
-    template<class TValue> 
+    template<class TValue>
     class IntersectionCallBack {
     public:
         TValue*      closestEntity;
author	megamage <none@none>	2009-02-04 17:22:43 -0600
committer	megamage <none@none>	2009-02-04 17:22:43 -0600
commit	d69198732e65002b53bab3a85779107490fe4dd2 (patch)
tree	e1f4b11f1964cc42ac05c79bdc43eedc1db16866 /src/shared
parent	5d4d9530556eb66940775f12c3cc5f3c115447ca (diff)
parent	c745eba4a1d122b4184b27a982674c86ff193c23 (diff)