*Merge.

--HG--
branch : trunk

src/game/Object.cpp

@@ -1629,8 +1629,8 @@ Creature* WorldObject::SummonCreature(uint32 id, float x, float y, float z, floa
         return NULL;
     }
 
-	pCreature->SetHomePosition(x, y, z, ang);
-	pCreature->Summon(spwtype, despwtime);
+    pCreature->SetHomePosition(x, y, z, ang);
+    pCreature->Summon(spwtype, despwtime);
 
     if(GetTypeId()==TYPEID_UNIT && ((Creature*)this)->AI())
         ((Creature*)this)->AI()->JustSummoned(pCreature);
@@ -1703,9 +1703,9 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y,
 {
     GetNearPoint2D(x,y,distance2d+searcher_size,absAngle);
 
-	z = GetPositionZ();
+    z = GetPositionZ();
 
-	UpdateGroundPositionZ(x,y,z);
+    UpdateGroundPositionZ(x,y,z);
 }
 
 void WorldObject::GetGroundPoint(float &x, float &y, float &z, float dist, float angle)