*Merge.

--HG--
branch : trunk

1 files changed, 112 insertions, 112 deletions

diff --git a/src/game/World.cpp b/src/game/World.cpp
index 0ceb1aa7850..97938058d27 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -73,7 +73,7 @@ volatile bool World::m_stopEvent = false;
 uint8 World::m_ExitCode = SHUTDOWN_EXIT_CODE;
 volatile uint32 World::m_worldLoopCounter = 0;
 
-float World::m_MaxVisibleDistance			  = DEFAULT_VISIBILITY_DISTANCE;
+float World::m_MaxVisibleDistance             = DEFAULT_VISIBILITY_DISTANCE;
 float World::m_MaxVisibleDistanceForCreature  = DEFAULT_VISIBILITY_DISTANCE;
 float World::m_MaxVisibleDistanceForPlayer    = DEFAULT_VISIBILITY_DISTANCE;
 float World::m_MaxVisibleDistanceForObject    = DEFAULT_VISIBILITY_DISTANCE;
@@ -410,7 +410,7 @@ void World::LoadConfigSettings(bool reload)
     SetPlayerLimit( sConfig.GetIntDefault("PlayerLimit", DEFAULT_PLAYER_LIMIT), true );
     SetMotd( sConfig.GetStringDefault("Motd", "Welcome to the Massive Network Game Object Server." ) );
 
-	///- Get string for new logins (newly created characters)
+    ///- Get string for new logins (newly created characters)
     SetNewCharString(sConfig.GetStringDefault("PlayerStart.String", ""));
 
     ///- Send server info on login?
@@ -1359,10 +1359,10 @@ void World::SetInitialWorldSettings()
     sLog.outString();
     WaypointMgr.Load();
 
-	sLog.outString( "Loading Creature Formations..." );
-	formation_mgr.LoadCreatureFormations();
+    sLog.outString( "Loading Creature Formations..." );
+    formation_mgr.LoadCreatureFormations();
 
-	sLog.outString( "Loading GM tickets...");
+    sLog.outString( "Loading GM tickets...");
     ticketmgr.LoadGMTickets();
 
     ///- Handle outdated emails (delete/return)
@@ -1377,7 +1377,7 @@ void World::SetInitialWorldSettings()
     objmgr.LoadSpellScripts();                              // must be after load Creature/Gameobject(Template/Data)
     objmgr.LoadGameObjectScripts();                         // must be after load Creature/Gameobject(Template/Data)
     objmgr.LoadEventScripts();                              // must be after load Creature/Gameobject(Template/Data)
-	objmgr.LoadWaypointScripts();
+    objmgr.LoadWaypointScripts();
     sLog.outString( ">>> Scripts loaded" );
     sLog.outString();
 
@@ -1441,8 +1441,8 @@ void World::SetInitialWorldSettings()
     sLog.outString( "Loading Transports..." );
     MapManager::Instance().LoadTransports();
 
-	sLog.outString( "Loading Transports Events..." );
-	objmgr.LoadTransportEvents();
+    sLog.outString( "Loading Transports Events..." );
+    objmgr.LoadTransportEvents();
 
     sLog.outString("Deleting expired bans..." );
     LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate");
@@ -1740,7 +1740,7 @@ void World::ScriptsStart(ScriptMapMap const& scripts, uint32 id, Object* source,
         return;
 
     // prepare static data
-	uint64 sourceGUID = source ? source->GetGUID() : (uint64)0; //some script commands doesn't have source
+    uint64 sourceGUID = source ? source->GetGUID() : (uint64)0; //some script commands doesn't have source
     uint64 targetGUID = target ? target->GetGUID() : (uint64)0;
     uint64 ownerGUID  = (source->GetTypeId()==TYPEID_ITEM) ? ((Item*)source)->GetOwnerGUID() : (uint64)0;
 
@@ -1826,22 +1826,22 @@ void World::ScriptsProcess()
                     source = HashMapHolder<Player>::Find(step.sourceGUID);
                     break;
                 case HIGHGUID_GAMEOBJECT:
-					source = HashMapHolder<GameObject>::Find(step.sourceGUID);
+                    source = HashMapHolder<GameObject>::Find(step.sourceGUID);
                     break;
                 case HIGHGUID_CORPSE:
                     source = HashMapHolder<Corpse>::Find(step.sourceGUID);
                     break;
-				case HIGHGUID_MO_TRANSPORT:
-					for (MapManager::TransportSet::iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter)
-					{
-						if((*iter)->GetGUID() == step.sourceGUID)
-						{
-							source = reinterpret_cast<Object*>(*iter);
-							break;
-						}
-					}
-					break;
-				default:
+                case HIGHGUID_MO_TRANSPORT:
+                    for (MapManager::TransportSet::iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter)
+                    {
+                        if((*iter)->GetGUID() == step.sourceGUID)
+                        {
+                            source = reinterpret_cast<Object*>(*iter);
+                            break;
+                        }
+                    }
+                    break;
+                default:
                     sLog.outError("*_script source with unsupported high guid value %u",GUID_HIPART(step.sourceGUID));
                     break;
             }
@@ -2386,9 +2386,9 @@ void World::ScriptsProcess()
                 break;
             }
 
-			case SCRIPT_COMMAND_LOAD_PATH:
-			{
-				if(!source)
+            case SCRIPT_COMMAND_LOAD_PATH:
+            {
+                if(!source)
                 {
                     sLog.outError("SCRIPT_COMMAND_START_MOVE is tried to apply to NON-existing unit.");
                     break;
@@ -2400,98 +2400,98 @@ void World::ScriptsProcess()
                     break;
                 }
 
-				if(!WaypointMgr.GetPath(step.script->datalong))
-				{
+                if(!WaypointMgr.GetPath(step.script->datalong))
+                {
                     sLog.outError("SCRIPT_COMMAND_START_MOVE source mover has an invallid path, skipping.", step.script->datalong2);
                     break;
                 }
 
-				dynamic_cast<Unit*>(source)->GetMotionMaster()->MovePath(step.script->datalong, step.script->datalong2);
-				break;
-			}
-
-			case SCRIPT_COMMAND_CALLSCRIPT_TO_UNIT:
-			{
-				if(!step.script->datalong || !step.script->datalong2)
-				{
-					sLog.outError("SCRIPT_COMMAND_CALLSCRIPT calls invallid db_script_id or lowguid not present: skipping.");
-					break;
-				}
-				//our target
-				Creature* target = NULL;
-
-				if(source) //using grid searcher
-				{
-					CellPair p(Trinity::ComputeCellPair(((Unit*)source)->GetPositionX(), ((Unit*)source)->GetPositionY()));
-					Cell cell(p);
-					cell.data.Part.reserved = ALL_DISTRICT;
-
-					//sLog.outDebug("Attempting to find Creature: Db GUID: %i", step.script->datalong);
-					Trinity::CreatureWithDbGUIDCheck target_check(((Unit*)source), step.script->datalong);
-					Trinity::CreatureSearcher<Trinity::CreatureWithDbGUIDCheck> checker(((Unit*)source), target, target_check);
-
-					TypeContainerVisitor<Trinity::CreatureSearcher <Trinity::CreatureWithDbGUIDCheck>, GridTypeMapContainer > unit_checker(checker);
-					CellLock<GridReadGuard> cell_lock(cell, p);
-					cell_lock->Visit(cell_lock, unit_checker, *(((Unit*)source)->GetMap()));
-				}
-				else //check hashmap holders
-				{
-					if(CreatureData const* data = objmgr.GetCreatureData(step.script->datalong))
-						target = ObjectAccessor::GetObjectInWorld<Creature>(data->mapid, data->posX, data->posY, MAKE_NEW_GUID(step.script->datalong, data->id, HIGHGUID_UNIT), target);
-				}
-				//sLog.outDebug("attempting to pass target...");
-				if(!target)
-					break;
-				//sLog.outDebug("target passed");
-				//Lets choose our ScriptMap map
-				ScriptMapMap *datamap = NULL;
-				switch(step.script->dataint)
-				{
-					case 1://QUEST END SCRIPTMAP
-						datamap = &sQuestEndScripts;
-						break;
-					case 2://QUEST START SCRIPTMAP
-						datamap = &sQuestStartScripts;
-						break;
-					case 3://SPELLS SCRIPTMAP
-						datamap = &sSpellScripts;
-						break;
-					case 4://GAMEOBJECTS SCRIPTMAP
-						datamap = &sGameObjectScripts;
-						break;
-					case 5://EVENTS SCRIPTMAP
-						datamap = &sEventScripts;
-						break;
-					case 6://WAYPOINTS SCRIPTMAP
-						datamap = &sWaypointScripts;
-						break;
-					default:
-						sLog.outError("SCRIPT_COMMAND_CALLSCRIPT ERROR: no scriptmap present... ignoring");
-						break;
-				}
-				//if no scriptmap present...
-				if(!datamap)
-					break;
-
-				uint32 script_id = step.script->datalong2;
-				//delete iter and return it to begin pos(next one)
-				m_scriptSchedule.erase(iter);
-				iter = m_scriptSchedule.begin();
-
-				ScriptsStart(*datamap, script_id, target, NULL);
-				return;
-			}
-
-			case SCRIPT_COMMAND_PLAYSOUND:
-			{
-				if(!source)
-					break;
-				//datalong sound_id, datalong2 onlyself
-				((WorldObject*)source)->SendPlaySound(step.script->datalong, step.script->datalong2);
-				break;
-			}
-
-			default:
+                dynamic_cast<Unit*>(source)->GetMotionMaster()->MovePath(step.script->datalong, step.script->datalong2);
+                break;
+            }
+
+            case SCRIPT_COMMAND_CALLSCRIPT_TO_UNIT:
+            {
+                if(!step.script->datalong || !step.script->datalong2)
+                {
+                    sLog.outError("SCRIPT_COMMAND_CALLSCRIPT calls invallid db_script_id or lowguid not present: skipping.");
+                    break;
+                }
+                //our target
+                Creature* target = NULL;
+
+                if(source) //using grid searcher
+                {
+                    CellPair p(Trinity::ComputeCellPair(((Unit*)source)->GetPositionX(), ((Unit*)source)->GetPositionY()));
+                    Cell cell(p);
+                    cell.data.Part.reserved = ALL_DISTRICT;
+
+                    //sLog.outDebug("Attempting to find Creature: Db GUID: %i", step.script->datalong);
+                    Trinity::CreatureWithDbGUIDCheck target_check(((Unit*)source), step.script->datalong);
+                    Trinity::CreatureSearcher<Trinity::CreatureWithDbGUIDCheck> checker(((Unit*)source), target, target_check);
+
+                    TypeContainerVisitor<Trinity::CreatureSearcher <Trinity::CreatureWithDbGUIDCheck>, GridTypeMapContainer > unit_checker(checker);
+                    CellLock<GridReadGuard> cell_lock(cell, p);
+                    cell_lock->Visit(cell_lock, unit_checker, *(((Unit*)source)->GetMap()));
+                }
+                else //check hashmap holders
+                {
+                    if(CreatureData const* data = objmgr.GetCreatureData(step.script->datalong))
+                        target = ObjectAccessor::GetObjectInWorld<Creature>(data->mapid, data->posX, data->posY, MAKE_NEW_GUID(step.script->datalong, data->id, HIGHGUID_UNIT), target);
+                }
+                //sLog.outDebug("attempting to pass target...");
+                if(!target)
+                    break;
+                //sLog.outDebug("target passed");
+                //Lets choose our ScriptMap map
+                ScriptMapMap *datamap = NULL;
+                switch(step.script->dataint)
+                {
+                    case 1://QUEST END SCRIPTMAP
+                        datamap = &sQuestEndScripts;
+                        break;
+                    case 2://QUEST START SCRIPTMAP
+                        datamap = &sQuestStartScripts;
+                        break;
+                    case 3://SPELLS SCRIPTMAP
+                        datamap = &sSpellScripts;
+                        break;
+                    case 4://GAMEOBJECTS SCRIPTMAP
+                        datamap = &sGameObjectScripts;
+                        break;
+                    case 5://EVENTS SCRIPTMAP
+                        datamap = &sEventScripts;
+                        break;
+                    case 6://WAYPOINTS SCRIPTMAP
+                        datamap = &sWaypointScripts;
+                        break;
+                    default:
+                        sLog.outError("SCRIPT_COMMAND_CALLSCRIPT ERROR: no scriptmap present... ignoring");
+                        break;
+                }
+                //if no scriptmap present...
+                if(!datamap)
+                    break;
+
+                uint32 script_id = step.script->datalong2;
+                //delete iter and return it to begin pos(next one)
+                m_scriptSchedule.erase(iter);
+                iter = m_scriptSchedule.begin();
+
+                ScriptsStart(*datamap, script_id, target, NULL);
+                return;
+            }
+
+            case SCRIPT_COMMAND_PLAYSOUND:
+            {
+                if(!source)
+                    break;
+                //datalong sound_id, datalong2 onlyself
+                ((WorldObject*)source)->SendPlaySound(step.script->datalong, step.script->datalong2);
+                break;
+            }
+
+            default:
                 sLog.outError("Unknown script command %u called.",step.script->command);
                 break;
         }