araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-15 04:32:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

*Moved CanUnload function to header files - by Zor

Browse Source 
*Move flycheck under function - by Zor

--HG--
branch : trunk
This commit is contained in:
Blaymoira
2009-01-24 20:04:43 +01:00
parent 3129217dfa
commit 6be2cfeeed
5 changed files with 68 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/Map.cpp
View File

@@ -1642,14 +1642,6 @@ void Map::RemoveAllObjectsInRemoveList()
//sLog.outDebug("Object remover 2 check.");
}
bool Map::CanUnload(const uint32 &diff)
{
if(!m_unloadTimer) return false;
if(m_unloadTimer < diff) return true;
m_unloadTimer -= diff;
return false;
}
uint32 Map::GetPlayersCountExceptGMs() const
{
uint32 count = 0;

10
src/game/Map.h
View File

@@ -133,7 +133,15 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O
virtual ~Map();
// currently unused for normal maps
virtual bool CanUnload(const uint32& diff);
bool CanUnload(uint32 diff)
{
if(!m_unloadTimer)
return false;
if(m_unloadTimer <= diff)
return true;
m_unloadTimer -= diff;
return false;
}
virtual bool Add(Player *);
virtual void Remove(Player *, bool);

55
src/game/Player.cpp
View File

@@ -18753,8 +18753,7 @@ void Player::SetClientControl(Unit* target, uint8 allowMove)
void Player::UpdateZoneDependentAuras( uint32 newZone )
{
// remove new continent flight forms
if( !isGameMaster() &&
GetVirtualMapForMapAndZone(GetMapId(),newZone) != 530)
if(!CanFlyInMap(GetVirtualMapForMapAndZone(GetMapId(),newZone)))
{
RemoveSpellsCausingAura(SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED);
RemoveSpellsCausingAura(SPELL_AURA_FLY);
@@ -19219,3 +19218,55 @@ void Player::UpdateCharmedAI()
Attack(target, true);
}
}
bool Player::CanFlyInMap(const uint32 mapID) const
{
// we return false if the map doesn't even exist
MapEntry const *entry = sMapStore.LookupEntry(mapID);
if(!entry)
{
sLog.outDebug("Unknown mapID handed to Player::CanFlyInMap; disallowing flying.");
return false;
}
// GMs can always fly
if( isGameMaster() )
{
return true;
}
// check whether we can fly here depending on map/config
switch(mapID)
{
// kalimdor/eastern kingdoms
case 0:
case 1:
{
return sWorld.getConfig(CONFIG_FLYING_MOUNTS_AZEROTH);
}
// outland
case 530:
{
return sWorld.getConfig(CONFIG_FLYING_MOUNTS_OUTLAND);
}
// all other maps
default:
{
return sWorld.getConfig(CONFIG_FLYING_MOUNTS_OTHERS);
}
}
}
// this is just a dummy function that does the same as CanFlyInMap, but based on area ID
bool Player::CanFlyInArea(const uint32 areaID) const
{
// we return false if the area doesn't even exist
AreaTableEntry const *entry = sAreaStore.LookupEntry(areaID);
if(!entry)
{
sLog.outDebug("Unknown areaID handed to Player::CanFlyInArea; disallowing flying.");
return false;
}
return CanFlyInMap(entry->mapid);
}

4
src/game/Player.h
View File

@@ -2036,6 +2036,10 @@ class TRINITY_DLL_SPEC Player : public Unit
uint32 GetOldPetSpell() const { return m_oldpetspell; }
void SetOldPetSpell(uint32 petspell) { m_oldpetspell = petspell; }
// check if player can fly in map/area according to config
bool CanFlyInMap(const uint32 mapID) const;
bool CanFlyInArea(const uint32 areaID) const;
/*********************************************************/
/*** INSTANCE SYSTEM ***/
/*********************************************************/

27
src/game/Spell.cpp
View File

@@ -4172,34 +4172,11 @@ uint8 Spell::CanCast(bool strict)
case SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED:
case SPELL_AURA_FLY:
{
// not allow cast fly spells at old maps by players (all spells is self target)
if(m_caster->GetTypeId()==TYPEID_PLAYER)
{
if(!((Player*)m_caster)->isGameMaster())
{
uint32 v_map = GetVirtualMapForMapAndZone(m_caster->GetMapId(),m_caster->GetZoneId());
switch(v_map)
{
case 0:
case 1:
{
if (!sWorld.getConfig(CONFIG_FLYING_MOUNTS_AZEROTH))
return SPELL_FAILED_NOT_HERE;
} break;
case 530:
{
if (!sWorld.getConfig(CONFIG_FLYING_MOUNTS_OUTLAND))
return SPELL_FAILED_NOT_HERE;
} break;
default:
{
if (!sWorld.getConfig(CONFIG_FLYING_MOUNTS_OTHERS))
return SPELL_FAILED_NOT_HERE;
} break;
}
}
if(!((Player*)m_caster)->CanFlyInMap(GetVirtualMapForMapAndZone(m_caster->GetMapId(),m_caster->GetZoneId())))
return SPELL_FAILED_NOT_HERE;
}
break;
}
case SPELL_AURA_PERIODIC_MANA_LEECH: