aboutsummaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authormegamage <none@none>2009-02-04 10:53:58 -0600
committermegamage <none@none>2009-02-04 10:53:58 -0600
commitdf7499e0565116c356308839079c36943ba7949c (patch)
tree5c7b362962dc49e95601eea5ccfe5102b370639d /src/shared
parent50c82c666093b5dac3cd60cddf9f46223a48d8d9 (diff)
parent6b19b789ca1757b99a5eaf37fba7c3f555347ab1 (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/Auth/AuthCrypt.cpp2
-rw-r--r--src/shared/Auth/AuthCrypt.h2
-rw-r--r--src/shared/Auth/BigNumber.cpp2
-rw-r--r--src/shared/Auth/Hmac.cpp2
-rw-r--r--src/shared/Auth/Hmac.h2
-rw-r--r--src/shared/Auth/Sha1.cpp2
-rw-r--r--src/shared/Auth/Sha1.h2
-rw-r--r--src/shared/ByteBuffer.h2
-rw-r--r--src/shared/CMakeLists.txt1
-rw-r--r--src/shared/Common.cpp2
-rw-r--r--src/shared/Common.h8
-rw-r--r--src/shared/Config/Config.cpp2
-rw-r--r--src/shared/Config/Config.h2
-rw-r--r--src/shared/Config/ConfigEnv.h2
-rw-r--r--src/shared/Database/Database.cpp2
-rw-r--r--src/shared/Database/Database.h2
-rw-r--r--src/shared/Database/DatabaseEnv.h2
-rw-r--r--src/shared/Database/DatabaseImpl.h2
-rw-r--r--src/shared/Database/DatabaseMysql.cpp2
-rw-r--r--src/shared/Database/DatabaseMysql.h2
-rw-r--r--src/shared/Database/DatabasePostgre.cpp2
-rw-r--r--src/shared/Database/DatabasePostgre.h2
-rw-r--r--src/shared/Database/DatabaseSqlite.cpp2
-rw-r--r--src/shared/Database/DatabaseSqlite.h2
-rw-r--r--src/shared/Database/Field.cpp2
-rw-r--r--src/shared/Database/Field.h2
-rw-r--r--src/shared/Database/MySQLDelayThread.h2
-rw-r--r--src/shared/Database/PGSQLDelayThread.h2
-rw-r--r--src/shared/Database/QueryResult.h2
-rw-r--r--src/shared/Database/QueryResultMysql.cpp2
-rw-r--r--src/shared/Database/QueryResultMysql.h2
-rw-r--r--src/shared/Database/QueryResultPostgre.cpp2
-rw-r--r--src/shared/Database/QueryResultPostgre.h2
-rw-r--r--src/shared/Database/QueryResultSqlite.cpp2
-rw-r--r--src/shared/Database/QueryResultSqlite.h2
-rw-r--r--src/shared/Database/SQLStorage.cpp2
-rw-r--r--src/shared/Database/SQLStorage.h2
-rw-r--r--src/shared/Database/SqlDelayThread.cpp2
-rw-r--r--src/shared/Database/SqlDelayThread.h2
-rw-r--r--src/shared/Database/SqlOperations.cpp2
-rw-r--r--src/shared/Database/SqlOperations.h2
-rw-r--r--src/shared/Database/dbcfile.cpp2
-rw-r--r--src/shared/Database/dbcfile.h2
-rw-r--r--src/shared/Errors.h2
-rw-r--r--src/shared/Log.cpp2
-rw-r--r--src/shared/Log.h2
-rw-r--r--src/shared/PacketLog.cpp2
-rw-r--r--src/shared/PacketLog.h2
-rw-r--r--src/shared/ProgressBar.cpp2
-rw-r--r--src/shared/ProgressBar.h2
-rw-r--r--src/shared/ServiceWin32.cpp2
-rw-r--r--src/shared/ServiceWin32.h2
-rw-r--r--src/shared/Timer.h4
-rw-r--r--src/shared/Util.cpp4
-rw-r--r--src/shared/Util.h4
-rw-r--r--src/shared/WorldPacket.h2
-rw-r--r--src/shared/vmap/AABSPTree.h166
-rw-r--r--src/shared/vmap/BaseModel.cpp6
-rw-r--r--src/shared/vmap/BaseModel.h2
-rw-r--r--src/shared/vmap/CoordModelMapping.cpp2
-rw-r--r--src/shared/vmap/CoordModelMapping.h2
-rw-r--r--src/shared/vmap/DebugCmdLogger.cpp6
-rw-r--r--src/shared/vmap/DebugCmdLogger.h2
-rw-r--r--src/shared/vmap/IVMapManager.h2
-rw-r--r--src/shared/vmap/ManagedModelContainer.cpp2
-rw-r--r--src/shared/vmap/ManagedModelContainer.h2
-rw-r--r--src/shared/vmap/ModelContainer.cpp2
-rw-r--r--src/shared/vmap/ModelContainer.h2
-rw-r--r--src/shared/vmap/NodeValueAccess.h2
-rw-r--r--src/shared/vmap/ShortBox.h2
-rw-r--r--src/shared/vmap/ShortVector.h2
-rw-r--r--src/shared/vmap/SubModel.cpp2
-rw-r--r--src/shared/vmap/SubModel.h2
-rw-r--r--src/shared/vmap/TileAssembler.cpp2
-rw-r--r--src/shared/vmap/TileAssembler.h2
-rw-r--r--src/shared/vmap/TreeNode.cpp2
-rw-r--r--src/shared/vmap/TreeNode.h20
-rw-r--r--src/shared/vmap/VMapDefinitions.h2
-rw-r--r--src/shared/vmap/VMapFactory.cpp2
-rw-r--r--src/shared/vmap/VMapFactory.h2
-rw-r--r--src/shared/vmap/VMapManager.cpp2
-rw-r--r--src/shared/vmap/VMapManager.h2
-rw-r--r--src/shared/vmap/VMapTools.h4
83 files changed, 184 insertions, 185 deletions
diff --git a/src/shared/Auth/AuthCrypt.cpp b/src/shared/Auth/AuthCrypt.cpp
index 68a271e3c42..d103a903453 100644
--- a/src/shared/Auth/AuthCrypt.cpp
+++ b/src/shared/Auth/AuthCrypt.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Auth/AuthCrypt.h b/src/shared/Auth/AuthCrypt.h
index 366cce5635f..e809639a145 100644
--- a/src/shared/Auth/AuthCrypt.h
+++ b/src/shared/Auth/AuthCrypt.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Auth/BigNumber.cpp b/src/shared/Auth/BigNumber.cpp
index b39fe3ad189..2baba88e9e0 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 2294ade76a2..91c065d3640 100644
--- a/src/shared/Auth/Hmac.cpp
+++ b/src/shared/Auth/Hmac.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Auth/Hmac.h b/src/shared/Auth/Hmac.h
index 08d29cef962..1c19ec2238d 100644
--- a/src/shared/Auth/Hmac.h
+++ b/src/shared/Auth/Hmac.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Auth/Sha1.cpp b/src/shared/Auth/Sha1.cpp
index a50883ab785..73fcf90bfa8 100644
--- a/src/shared/Auth/Sha1.cpp
+++ b/src/shared/Auth/Sha1.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Auth/Sha1.h b/src/shared/Auth/Sha1.h
index 64e8eb64f95..d748dc6d747 100644
--- a/src/shared/Auth/Sha1.h
+++ b/src/shared/Auth/Sha1.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/ByteBuffer.h b/src/shared/ByteBuffer.h
index efd704a4904..6fae0b65524 100644
--- a/src/shared/ByteBuffer.h
+++ b/src/shared/ByteBuffer.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 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 5e24b0e6594..db039b93a82 100644
--- a/src/shared/Common.cpp
+++ b/src/shared/Common.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Common.h b/src/shared/Common.h
index 5c8fae4ef25..1663f774e1c 100644
--- a/src/shared/Common.h
+++ b/src/shared/Common.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 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 1693e0d0cd4..1dacb55b670 100644
--- a/src/shared/Config/Config.cpp
+++ b/src/shared/Config/Config.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Config/Config.h b/src/shared/Config/Config.h
index 04026d084fb..7347d3ee7a1 100644
--- a/src/shared/Config/Config.h
+++ b/src/shared/Config/Config.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Config/ConfigEnv.h b/src/shared/Config/ConfigEnv.h
index 1b823ccf8c8..09877cbd296 100644
--- a/src/shared/Config/ConfigEnv.h
+++ b/src/shared/Config/ConfigEnv.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp
index 0b0c90dd335..4623deacbed 100644
--- a/src/shared/Database/Database.cpp
+++ b/src/shared/Database/Database.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h
index dd6d02d36dd..c5d8dc9854c 100644
--- a/src/shared/Database/Database.h
+++ b/src/shared/Database/Database.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabaseEnv.h b/src/shared/Database/DatabaseEnv.h
index d984a838c90..fe565cde7a6 100644
--- a/src/shared/Database/DatabaseEnv.h
+++ b/src/shared/Database/DatabaseEnv.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabaseImpl.h b/src/shared/Database/DatabaseImpl.h
index 85ce1aa3ec1..244f52d0106 100644
--- a/src/shared/Database/DatabaseImpl.h
+++ b/src/shared/Database/DatabaseImpl.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp
index d11d29111be..0fae83caadf 100644
--- a/src/shared/Database/DatabaseMysql.cpp
+++ b/src/shared/Database/DatabaseMysql.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h
index 23d1e4c8ff3..ee800fdf22e 100644
--- a/src/shared/Database/DatabaseMysql.h
+++ b/src/shared/Database/DatabaseMysql.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabasePostgre.cpp b/src/shared/Database/DatabasePostgre.cpp
index bf8f4611555..6a172bb12a0 100644
--- a/src/shared/Database/DatabasePostgre.cpp
+++ b/src/shared/Database/DatabasePostgre.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabasePostgre.h b/src/shared/Database/DatabasePostgre.h
index f4f6c3882d4..7e541f84c73 100644
--- a/src/shared/Database/DatabasePostgre.h
+++ b/src/shared/Database/DatabasePostgre.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabaseSqlite.cpp b/src/shared/Database/DatabaseSqlite.cpp
index 002eeec8463..9de786bf739 100644
--- a/src/shared/Database/DatabaseSqlite.cpp
+++ b/src/shared/Database/DatabaseSqlite.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/DatabaseSqlite.h b/src/shared/Database/DatabaseSqlite.h
index d3df683ed37..325c3168acb 100644
--- a/src/shared/Database/DatabaseSqlite.h
+++ b/src/shared/Database/DatabaseSqlite.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/Field.cpp b/src/shared/Database/Field.cpp
index 3ec30cdfb64..20a88395b7e 100644
--- a/src/shared/Database/Field.cpp
+++ b/src/shared/Database/Field.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/Field.h b/src/shared/Database/Field.h
index a81c61e8516..430e262c39e 100644
--- a/src/shared/Database/Field.h
+++ b/src/shared/Database/Field.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/MySQLDelayThread.h b/src/shared/Database/MySQLDelayThread.h
index 3058a5da59f..b01d88b6f72 100644
--- a/src/shared/Database/MySQLDelayThread.h
+++ b/src/shared/Database/MySQLDelayThread.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/PGSQLDelayThread.h b/src/shared/Database/PGSQLDelayThread.h
index a6c97ce85b4..0525fb9f6d6 100644
--- a/src/shared/Database/PGSQLDelayThread.h
+++ b/src/shared/Database/PGSQLDelayThread.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h
index 5c26b04a2c0..ab87fda59be 100644
--- a/src/shared/Database/QueryResult.h
+++ b/src/shared/Database/QueryResult.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/QueryResultMysql.cpp b/src/shared/Database/QueryResultMysql.cpp
index c42bbe5a754..63808060b9f 100644
--- a/src/shared/Database/QueryResultMysql.cpp
+++ b/src/shared/Database/QueryResultMysql.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/QueryResultMysql.h b/src/shared/Database/QueryResultMysql.h
index 8107f4fe0cb..79f5439ed06 100644
--- a/src/shared/Database/QueryResultMysql.h
+++ b/src/shared/Database/QueryResultMysql.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/QueryResultPostgre.cpp b/src/shared/Database/QueryResultPostgre.cpp
index f1536e4192e..8ebe03ede64 100644
--- a/src/shared/Database/QueryResultPostgre.cpp
+++ b/src/shared/Database/QueryResultPostgre.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/QueryResultPostgre.h b/src/shared/Database/QueryResultPostgre.h
index a63ca334390..ac7f31223ba 100644
--- a/src/shared/Database/QueryResultPostgre.h
+++ b/src/shared/Database/QueryResultPostgre.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/QueryResultSqlite.cpp b/src/shared/Database/QueryResultSqlite.cpp
index 78057e7887f..2bf64ed49ab 100644
--- a/src/shared/Database/QueryResultSqlite.cpp
+++ b/src/shared/Database/QueryResultSqlite.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/QueryResultSqlite.h b/src/shared/Database/QueryResultSqlite.h
index 5fc3b87c62a..1416ac426cc 100644
--- a/src/shared/Database/QueryResultSqlite.h
+++ b/src/shared/Database/QueryResultSqlite.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp
index c3bc9f6be71..2ce87a6c6da 100644
--- a/src/shared/Database/SQLStorage.cpp
+++ b/src/shared/Database/SQLStorage.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/SQLStorage.h b/src/shared/Database/SQLStorage.h
index 2d154f4e1ca..5a429d185cb 100644
--- a/src/shared/Database/SQLStorage.h
+++ b/src/shared/Database/SQLStorage.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/SqlDelayThread.cpp b/src/shared/Database/SqlDelayThread.cpp
index 08bb5520d11..a265b48e622 100644
--- a/src/shared/Database/SqlDelayThread.cpp
+++ b/src/shared/Database/SqlDelayThread.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/SqlDelayThread.h b/src/shared/Database/SqlDelayThread.h
index 373b83604f1..d3b85846d53 100644
--- a/src/shared/Database/SqlDelayThread.h
+++ b/src/shared/Database/SqlDelayThread.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp
index 42094229b17..1a81c4c96a1 100644
--- a/src/shared/Database/SqlOperations.cpp
+++ b/src/shared/Database/SqlOperations.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/SqlOperations.h b/src/shared/Database/SqlOperations.h
index b06397e84d5..0ebff9868d9 100644
--- a/src/shared/Database/SqlOperations.h
+++ b/src/shared/Database/SqlOperations.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/dbcfile.cpp b/src/shared/Database/dbcfile.cpp
index c6c12a99b8b..9f570e72496 100644
--- a/src/shared/Database/dbcfile.cpp
+++ b/src/shared/Database/dbcfile.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Database/dbcfile.h b/src/shared/Database/dbcfile.h
index 8d0b2e45451..e0cef4dee5f 100644
--- a/src/shared/Database/dbcfile.h
+++ b/src/shared/Database/dbcfile.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Errors.h b/src/shared/Errors.h
index 0ebf05db491..0e8feb8424a 100644
--- a/src/shared/Errors.h
+++ b/src/shared/Errors.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Log.cpp b/src/shared/Log.cpp
index 518c91940dc..9e910a4fcbf 100644
--- a/src/shared/Log.cpp
+++ b/src/shared/Log.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Log.h b/src/shared/Log.h
index d68529a77a8..c4190264f3a 100644
--- a/src/shared/Log.h
+++ b/src/shared/Log.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/PacketLog.cpp b/src/shared/PacketLog.cpp
index 52fa4f7b0fb..0ae6f198640 100644
--- a/src/shared/PacketLog.cpp
+++ b/src/shared/PacketLog.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/PacketLog.h b/src/shared/PacketLog.h
index 5f856ba7776..3280d801261 100644
--- a/src/shared/PacketLog.h
+++ b/src/shared/PacketLog.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/ProgressBar.cpp b/src/shared/ProgressBar.cpp
index f4163a6133e..3cb09290485 100644
--- a/src/shared/ProgressBar.cpp
+++ b/src/shared/ProgressBar.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/ProgressBar.h b/src/shared/ProgressBar.h
index 98720c90385..77f1e4c43ec 100644
--- a/src/shared/ProgressBar.h
+++ b/src/shared/ProgressBar.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/ServiceWin32.cpp b/src/shared/ServiceWin32.cpp
index 34d5608da44..2a152513977 100644
--- a/src/shared/ServiceWin32.cpp
+++ b/src/shared/ServiceWin32.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/ServiceWin32.h b/src/shared/ServiceWin32.h
index 640077592a8..fdc9d7d4e9e 100644
--- a/src/shared/ServiceWin32.h
+++ b/src/shared/ServiceWin32.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/Timer.h b/src/shared/Timer.h
index 7bc0031a5de..848a8cfac4f 100644
--- a/src/shared/Timer.h
+++ b/src/shared/Timer.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 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 33bae61dfbc..7a89eb1a6eb 100644
--- a/src/shared/Util.cpp
+++ b/src/shared/Util.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 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 fed87fd0ff2..72f20f7b896 100644
--- a/src/shared/Util.h
+++ b/src/shared/Util.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 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 501c4b74269..ee17047a9ef 100644
--- a/src/shared/WorldPacket.h
+++ b/src/shared/WorldPacket.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
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 4a0d66ad6bb..1b7ad34d413 100644
--- a/src/shared/vmap/BaseModel.cpp
+++ b/src/shared/vmap/BaseModel.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 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 6a5ffdf0d0e..1601f367de7 100644
--- a/src/shared/vmap/BaseModel.h
+++ b/src/shared/vmap/BaseModel.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/CoordModelMapping.cpp b/src/shared/vmap/CoordModelMapping.cpp
index 10371365e0d..7c7c801d690 100644
--- a/src/shared/vmap/CoordModelMapping.cpp
+++ b/src/shared/vmap/CoordModelMapping.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/CoordModelMapping.h b/src/shared/vmap/CoordModelMapping.h
index 59766e5e7d5..34f1917f5b3 100644
--- a/src/shared/vmap/CoordModelMapping.h
+++ b/src/shared/vmap/CoordModelMapping.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/DebugCmdLogger.cpp b/src/shared/vmap/DebugCmdLogger.cpp
index 407290bc5b6..5e26b7ade8f 100644
--- a/src/shared/vmap/DebugCmdLogger.cpp
+++ b/src/shared/vmap/DebugCmdLogger.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 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 cd50b2e49b2..aa0df4d1e5c 100644
--- a/src/shared/vmap/DebugCmdLogger.h
+++ b/src/shared/vmap/DebugCmdLogger.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/IVMapManager.h b/src/shared/vmap/IVMapManager.h
index 8604e7f4a0b..60159ed8bea 100644
--- a/src/shared/vmap/IVMapManager.h
+++ b/src/shared/vmap/IVMapManager.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/ManagedModelContainer.cpp b/src/shared/vmap/ManagedModelContainer.cpp
index 3478bab72b7..08c58a60c8f 100644
--- a/src/shared/vmap/ManagedModelContainer.cpp
+++ b/src/shared/vmap/ManagedModelContainer.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/ManagedModelContainer.h b/src/shared/vmap/ManagedModelContainer.h
index 694e4a8c602..b193ef9d57f 100644
--- a/src/shared/vmap/ManagedModelContainer.h
+++ b/src/shared/vmap/ManagedModelContainer.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/ModelContainer.cpp b/src/shared/vmap/ModelContainer.cpp
index 993523cac6b..889ba4fc9bf 100644
--- a/src/shared/vmap/ModelContainer.cpp
+++ b/src/shared/vmap/ModelContainer.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/ModelContainer.h b/src/shared/vmap/ModelContainer.h
index b0c74bb284c..98b4c9ddcf3 100644
--- a/src/shared/vmap/ModelContainer.h
+++ b/src/shared/vmap/ModelContainer.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/NodeValueAccess.h b/src/shared/vmap/NodeValueAccess.h
index 2d00012be24..b8ec54e90be 100644
--- a/src/shared/vmap/NodeValueAccess.h
+++ b/src/shared/vmap/NodeValueAccess.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/ShortBox.h b/src/shared/vmap/ShortBox.h
index 1160dd60d4e..9c5472f4c3a 100644
--- a/src/shared/vmap/ShortBox.h
+++ b/src/shared/vmap/ShortBox.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/ShortVector.h b/src/shared/vmap/ShortVector.h
index 57ebdbc9bb6..8c4aec8a0b4 100644
--- a/src/shared/vmap/ShortVector.h
+++ b/src/shared/vmap/ShortVector.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/SubModel.cpp b/src/shared/vmap/SubModel.cpp
index 51eaf62c87c..3d1c0e29ff6 100644
--- a/src/shared/vmap/SubModel.cpp
+++ b/src/shared/vmap/SubModel.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/SubModel.h b/src/shared/vmap/SubModel.h
index b120a211c5a..bc8239b1568 100644
--- a/src/shared/vmap/SubModel.h
+++ b/src/shared/vmap/SubModel.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/TileAssembler.cpp b/src/shared/vmap/TileAssembler.cpp
index c8f0b10e76d..5251ea1c8dc 100644
--- a/src/shared/vmap/TileAssembler.cpp
+++ b/src/shared/vmap/TileAssembler.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/TileAssembler.h b/src/shared/vmap/TileAssembler.h
index 7c2e9929b68..3f0f9468172 100644
--- a/src/shared/vmap/TileAssembler.h
+++ b/src/shared/vmap/TileAssembler.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/TreeNode.cpp b/src/shared/vmap/TreeNode.cpp
index 7b81c89c96d..af7fe224fe5 100644
--- a/src/shared/vmap/TreeNode.cpp
+++ b/src/shared/vmap/TreeNode.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/TreeNode.h b/src/shared/vmap/TreeNode.h
index a957cfac33b..8f3fbd7a71a 100644
--- a/src/shared/vmap/TreeNode.h
+++ b/src/shared/vmap/TreeNode.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 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 5b038361f69..c3498ea9260 100644
--- a/src/shared/vmap/VMapDefinitions.h
+++ b/src/shared/vmap/VMapDefinitions.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/VMapFactory.cpp b/src/shared/vmap/VMapFactory.cpp
index a12c9e3e3a9..4c349cdaa62 100644
--- a/src/shared/vmap/VMapFactory.cpp
+++ b/src/shared/vmap/VMapFactory.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/VMapFactory.h b/src/shared/vmap/VMapFactory.h
index cd6471156bd..a8784a37219 100644
--- a/src/shared/vmap/VMapFactory.h
+++ b/src/shared/vmap/VMapFactory.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/VMapManager.cpp b/src/shared/vmap/VMapManager.cpp
index 337e553f38d..cf2bc080865 100644
--- a/src/shared/vmap/VMapManager.cpp
+++ b/src/shared/vmap/VMapManager.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/VMapManager.h b/src/shared/vmap/VMapManager.h
index efb9538408d..5b4064915e4 100644
--- a/src/shared/vmap/VMapManager.h
+++ b/src/shared/vmap/VMapManager.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
diff --git a/src/shared/vmap/VMapTools.h b/src/shared/vmap/VMapTools.h
index dd8ec861191..49a28d5272d 100644
--- a/src/shared/vmap/VMapTools.h
+++ b/src/shared/vmap/VMapTools.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
*
* Copyright (C) 2008 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;