[8067] Fixed tabs and trailing whitespaces in code. Author: VladimirMangos

--HG--
branch : trunk

sql/mangos.sql

@@ -23,7 +23,11 @@ DROP TABLE IF EXISTS `db_version`;
 CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
   `creature_ai_version` varchar(120) default NULL,
+<<<<<<< HEAD:sql/mangos.sql
   `required_8053_01_mangos_command` bit(1) default NULL
+=======
+  `required_8065_01_mangos_spell_proc_event` bit(1) default NULL
+>>>>>>> fda6c4804e4f8718648d82cf43237be33fac3dd3:sql/mangos.sql
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -16151,6 +16155,10 @@ INSERT INTO spell_chain VALUES
 (27681,0,27681,1,14752),
 (32999,27681,27681,2,0),
 (48074,32999,27681,3,0),
+/*Rapture*/
+(47535,0,47535,1,0),
+(47536,47535,47535,2,0),
+(47537,47536,47535,3,0),
 /*ShackleUndead*/
 (9484,0,9484,1,0),
 (9485,9484,9484,2,0),
@@ -17349,9 +17357,6 @@ INSERT INTO `spell_proc_event` VALUES
 (47515, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (47516, 0x00000000,  6, 0x00001800, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (47517, 0x00000000,  6, 0x00001800, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(47535, 0x00000000,  6, 0x00001800, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(47536, 0x00000000,  6, 0x00001800, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(47537, 0x00000000,  6, 0x00001800, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (47580, 0x00000000,  6, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0x00010000, 0.000000, 0.000000,  0),
 (47581, 0x00000000,  6, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0x00010000, 0.000000, 0.000000,  0),
 (47582, 0x00000000,  6, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0x00010000, 0.000000, 0.000000,  0),
@@ -17550,7 +17555,6 @@ INSERT INTO `spell_proc_event` VALUES
 (58364, 0x00000000,  4, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (58372, 0x00000000,  4, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (58386, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000020, 0.000000, 0.000000,  0),
-(58435, 0x00000000,  5, 0x00000002, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (58616, 0x00000000, 15, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (58620, 0x00000000, 15, 0x00000000, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (58626, 0x00000000, 15, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),

src/game/AchievementMgr.h

@@ -51,8 +51,8 @@ enum AchievementCriteriaDataType
     ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AREA              = 6, // area id        0
     ACHIEVEMENT_CRITERIA_DATA_TYPE_T_AURA              = 7, // spell_id       effect_idx
     ACHIEVEMENT_CRITERIA_DATA_TYPE_VALUE               = 8, // minvalue                     value provided with achievement update must be not less that limit
-    ACHIEVEMENT_CRITERIA_DATA_TYPE_T_LEVEL             = 9, // minlevel						minlevel of target
-    ACHIEVEMENT_CRITERIA_DATA_TYPE_T_GENDER            = 10,// gender						0=male; 1=female	
+    ACHIEVEMENT_CRITERIA_DATA_TYPE_T_LEVEL             = 9, // minlevel                     minlevel of target
+    ACHIEVEMENT_CRITERIA_DATA_TYPE_T_GENDER            = 10,// gender                       0=male; 1=female
     ACHIEVEMENT_CRITERIA_DATA_TYPE_DISABLED            = 11,//                              used to prevent achievement creteria complete if not all requirement implemented and listed in table
     ACHIEVEMENT_CRITERIA_DATA_TYPE_MAP_DIFFICULTY      = 12,// difficulty                   normal/heroic difficulty for current event map
     ACHIEVEMENT_CRITERIA_DATA_TYPE_MAP_PLAYER_COUNT    = 13,// count                        "with less than %u people in the zone"

src/shared/LockedQueue.h

@@ -58,7 +58,7 @@ namespace ACE_Based
                 ACE_Guard<LockType> g(_lock);
 
                 ASSERT(!_canceled);
-                //	throw Cancellation_Exception();
+                // throw Cancellation_Exception();
 
                 _queue.push_back(item);
 
@@ -73,7 +73,7 @@ namespace ACE_Based
                 ACE_Guard<LockType> g(_lock);
 
                 ASSERT (!_queue.empty() || !_canceled);
-                //	throw Cancellation_Exception();
+                // throw Cancellation_Exception();
 
                 T item = _queue.front();
                 _queue.pop_front();
@@ -87,7 +87,7 @@ namespace ACE_Based
                 ACE_Guard<LockType> g(_lock);
 
                 ASSERT (!_queue.empty());
-                //	throw NoSuchElement_Exception();
+                // throw NoSuchElement_Exception();
 
                 return _queue.front();
             }

src/trinitycore/Master.cpp

@@ -182,7 +182,7 @@ public:
         {
             while (!World::IsStopped())
             {
-                ACE_Based::Thread::Sleep (static_cast<unsigned long> (socketSelecttime / 1000));
+                ACE_Based::Thread::Sleep(static_cast<unsigned long> (socketSelecttime / 1000));
                 checkping ();
             }
         }

src/trinityrealm/AuthSocket.cpp

@@ -946,7 +946,7 @@ bool AuthSocket::_HandleXferAccept()
     ibuf.Remove(1);                                         //clear input buffer
     fseek(pPatch,0,0);
 
-	ACE_Based::Thread u(*new PatcherRunnable(this));
+    ACE_Based::Thread u(*new PatcherRunnable(this));
     return true;
 }