*Merge.

--HG--
branch : trunk

1 files changed, 12 insertions, 12 deletions

diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 97eed337799..7c27864bc31 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -7906,35 +7906,35 @@ CreatureInfo const *GetCreatureInfo(uint32 id)
 void ObjectMgr::LoadTransportEvents()
 {
 
-	QueryResult *result = WorldDatabase.Query("SELECT entry, waypoint_id, event_id FROM transport_events");
+    QueryResult *result = WorldDatabase.Query("SELECT entry, waypoint_id, event_id FROM transport_events");
 
     if( !result )
     {
         barGoLink bar1( 1 );
         bar1.step();
-		sLog.outString( "\n>> Transport events table is empty \n" );
+        sLog.outString( "\n>> Transport events table is empty \n" );
         return;
     }
 
-	barGoLink bar1( result->GetRowCount() );
+    barGoLink bar1( result->GetRowCount() );
 
     do
     {
         bar1.step();
 
-		Field *fields = result->Fetch();
+        Field *fields = result->Fetch();
 
-		//Load event values
+        //Load event values
         uint32 entry = fields[0].GetUInt32();
         uint32 waypoint_id = fields[1].GetUInt32();
-		uint32 event_id = fields[2].GetUInt32();
+        uint32 event_id = fields[2].GetUInt32();
 
-		uint32 event_count = (entry*100)+waypoint_id;
-		TransportEventMap[event_count] = event_id;
-	}
-	while(result->NextRow());
+        uint32 event_count = (entry*100)+waypoint_id;
+        TransportEventMap[event_count] = event_id;
+    }
+    while(result->NextRow());
 
-	sLog.outString( "\n>> Loaded %u transport events \n", result->GetRowCount() );
+    sLog.outString( "\n>> Loaded %u transport events \n", result->GetRowCount() );
 
-	delete result;
+    delete result;
 }