Changeset 186 for trunk/src/game/Map.cpp

Timestamp:

11/19/08 13:44:25 (17 years ago)

Author:

yumileroy

Message:

[svn] Remove isVisible function. Check stealth and invisible in canAttack();
Use new remove aura by interrupt flag function.

Original author: megamage
Date: 2008-11-07 09:36:46-06:00

Files:

• trunk/src/game/Map.cpp (modified) (10 diffs)

trunk/src/game/Map.cpp

@@ -11 +11 @@
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
@@ -91 +91 @@
         if(vmgr->isMapLoadingEnabled())
         {
-                                                            // x and y are swaped !! => fixed now
+                                                            // x and y are swapped !! => fixed now
             bool exists = vmgr->existsMap((sWorld.GetDataPath()+ "vmaps").c_str(),  mapid, x,y);
             if(!exists)
@@ -107 +107 @@
 void Map::LoadVMap(int x,int y)
 {
-                                                            // x and y are swaped !!
+                                                            // x and y are swapped !!
     int vmapLoadResult = VMAP::VMapFactory::createOrGetVMapManager()->loadMap((sWorld.GetDataPath()+ "vmaps").c_str(),  GetId(), x,y);
     switch(vmapLoadResult)
@@ -145 +145 @@
     }
 
-    //map already load, delete it before reloading (Is it neccessary? Do we really need the abilty the reload maps during runtime?)
+    //map already load, delete it before reloading (Is it necessary? Do we really need the ability the reload maps during runtime?)
     if(GridMaps[x][y])
     {
@@ -335 +335 @@
 void Map::DeleteFromWorld(T* obj)
 {
-    // Note: In case resurrectable corpse and pet its removed from gloabal lists in own destructors
+    // Note: In case resurrectable corpse and pet its removed from global lists in own destructor
     delete obj;
 }
@@ -442 +442 @@
 bool Map::Add(Player *player)
 {
-    player->SetInstanceId(this->GetInstanceId());
+    player->SetInstanceId(GetInstanceId());
 
     // update player state for other player and visa-versa
@@ -671 +671 @@
 
     obj->RemoveFromWorld();
-
     RemoveFromGrid(obj,grid,cell);
 
@@ -1391 +1390 @@
             break;
         case TYPEID_UNIT:
-            // in case triggred sequence some spell can continue casting after prev CleanupsBeforeDelete call
+            // in case triggered sequence some spell can continue casting after prev CleanupsBeforeDelete call
             // make sure that like sources auras/etc removed before destructor start
             ((Creature*)obj)->CleanupsBeforeDelete ();
@@ -1470 +1469 @@
         return false;
     }
-
-    /*if(!player->isGameMaster() && i_data && i_data->IsEncounterInProgress())
-    {
-        sLog.outDebug("InstanceMap::CanEnter - Player '%s' can't enter instance '%s' while an encounter is in progress.", player->GetName(), GetMapName());
-        player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT);
-        return false;
-    }*/
 
     return Map::CanEnter(player);
@@ -1587 +1579 @@
 void InstanceMap::Update(const uint32& t_diff)
 {
-        Map::Update(t_diff);
-
-        if(i_data)
-                i_data->Update(t_diff);
+    Map::Update(t_diff);
+
+    if(i_data)
+        i_data->Update(t_diff);
 }