server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Cleanup] Remove tabs which have crept into the source

Browse Source
This commit is contained in:
Antz 2019-01-10 09:39:47 +00:00 committed by Antz
parent 368b8e8147
commit b5c8fd1b54
No known key found for this signature in database
GPG Key ID: 0DF907270598C85F
9 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/ChatCommands/Level2.cpp
View File

@ -1977,8 +1977,8 @@ bool ChatHandler::HandleNpcSpawnDistCommand(char* args)
Creature* pCreature = getSelectedCreature();
if (!pCreature)
{ return false; }
if (!pCreature)
{ return false; }
pCreature->SetRespawnRadius((float)option);
pCreature->SetDefaultMovementType(mtype);

46
src/game/Object/Unit.cpp
View File

@ -1767,35 +1767,35 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
DealDamage(pVictim, damageInfo->damage, &cleanDamage, DIRECT_DAMAGE, SpellSchoolMask(damageInfo->damageSchoolMask), NULL, durabilityLoss);
// If this is a creature and it attacks from behind it has a probability to daze it's victim
if ((!damageInfo->absorb) && (damageInfo->hitOutCome == MELEE_HIT_CRIT || damageInfo->hitOutCome == MELEE_HIT_CRUSHING || damageInfo->hitOutCome == MELEE_HIT_NORMAL || damageInfo->hitOutCome == MELEE_HIT_GLANCING) &&
GetTypeId() != TYPEID_PLAYER && !((Creature*)this)->GetCharmerOrOwnerGuid() && !pVictim->HasInArc(M_PI_F, this))
{
// -probability is between 0% and 40%
// 20% base chance
float Probability = 20.0f;
if ((!damageInfo->absorb) && (damageInfo->hitOutCome == MELEE_HIT_CRIT || damageInfo->hitOutCome == MELEE_HIT_CRUSHING || damageInfo->hitOutCome == MELEE_HIT_NORMAL || damageInfo->hitOutCome == MELEE_HIT_GLANCING) &&
GetTypeId() != TYPEID_PLAYER && !((Creature*)this)->GetCharmerOrOwnerGuid() && !pVictim->HasInArc(M_PI_F, this))
{
// -probability is between 0% and 40%
// 20% base chance
float Probability = 20.0f;
// there is a newbie protection, at level 10 just 7% base chance; assuming linear function
if (pVictim->getLevel() < 30)
{
Probability = 0.65f * pVictim->getLevel() + 0.5f;
}
// there is a newbie protection, at level 10 just 7% base chance; assuming linear function
if (pVictim->getLevel() < 30)
{
Probability = 0.65f * pVictim->getLevel() + 0.5f;
}
uint32 VictimDefense = pVictim->GetDefenseSkillValue();
uint32 AttackerMeleeSkill = GetUnitMeleeSkill();
uint32 VictimDefense = pVictim->GetDefenseSkillValue();
uint32 AttackerMeleeSkill = GetUnitMeleeSkill();
Probability *= AttackerMeleeSkill / (float)VictimDefense;
Probability *= AttackerMeleeSkill / (float)VictimDefense;
if (Probability > 40.0f)
{
Probability = 40.0f;
}
if (Probability > 40.0f)
{
Probability = 40.0f;
}
if (roll_chance_f(Probability))
{
CastSpell(pVictim, 1604, true);
}
if (roll_chance_f(Probability))
{
CastSpell(pVictim, 1604, true);
}
}
}
// update at damage Judgement aura duration that applied by attacker at victim
if (damageInfo->damage)

6
src/game/WorldHandlers/Map.cpp
View File

@ -2340,7 +2340,7 @@ bool Map::GetReachableRandomPosition(Unit* unit, float& x, float& y, float& z, f
float i_y = y;
float i_z = z;
bool isFlying;
bool isFlying;
bool isSwimming = true;
switch (unit->GetTypeId())
{
@ -2362,8 +2362,8 @@ bool Map::GetReachableRandomPosition(Unit* unit, float& x, float& y, float& z, f
return false;
}
bool newDestAssigned;
if (isFlying)
bool newDestAssigned;
if (isFlying)
{
newDestAssigned = GetRandomPointInTheAir(i_x, i_y, i_z, radius);
}

4
src/game/WorldHandlers/MapManager.cpp
View File

@ -106,8 +106,8 @@ Map* MapManager::CreateMap(uint32 id, const WorldObject* obj)
if (!entry)
{ return NULL; }
Map* m;
if (entry->Instanceable())
Map* m;
if (entry->Instanceable())
{
MANGOS_ASSERT(obj && obj->GetTypeId() == TYPEID_PLAYER);
// create DungeonMap object

6
src/game/WorldHandlers/ScriptMgr.cpp
View File

@ -1334,7 +1334,7 @@ bool ScriptAction::HandleScriptStep()
}
case SCRIPT_COMMAND_RESPAWN_GO: // 9
{
GameObject* pGo;
GameObject* pGo;
if (m_script->respawnGo.goGuid)
{
GameObjectData const* goData = sObjectMgr.GetGOData(m_script->respawnGo.goGuid);
@ -1367,8 +1367,8 @@ bool ScriptAction::HandleScriptStep()
if (pGo->isSpawned())
{ break; } // gameobject already spawned
uint32 time_to_despawn = m_script->respawnGo.despawnDelay < 5 ? 5 : m_script->respawnGo.despawnDelay;
uint32 time_to_despawn = m_script->respawnGo.despawnDelay < 5 ? 5 : m_script->respawnGo.despawnDelay;
pGo->SetLootState(GO_READY);
pGo->SetRespawnTime(time_to_despawn); // despawn object in ? seconds

4
src/game/WorldHandlers/Spell.cpp
View File

@ -1575,7 +1575,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
Cell::VisitAllObjects(m_caster, searcher, max_range);
break;
}
case TARGET_RANDOM_UNIT_CHAIN_IN_AREA: // This works the same as Target_random_friend_chain_in_area but is named differently for some reason
case TARGET_RANDOM_UNIT_CHAIN_IN_AREA: // This works the same as Target_random_friend_chain_in_area but is named differently for some reason
case TARGET_RANDOM_FRIEND_CHAIN_IN_AREA:
{
MaNGOS::AnyFriendlyUnitInObjectRangeCheck u_check(m_caster, max_range);
@ -6515,7 +6515,7 @@ bool Spell::IsLockInRange(GameObject* go)
{
const SpellRangeEntry* srange = sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex);
// This check is not related to bounding radius
float dx = m_caster->GetPositionX() - go->GetPositionX();
float dy = m_caster->GetPositionY() - go->GetPositionY();

8
src/game/vmap/BIH.cpp
View File

@ -49,10 +49,10 @@ void BIH::subdivide(int left, int right, std::vector<uint32>& tempTree, buildDat
}
// calculate extents
int axis = -1, rightOrig;
float clipL;
float clipR;
float prevClip = G3D::fnan();
float split = G3D::fnan();
float clipL;
float clipR;
float prevClip = G3D::fnan();
float split = G3D::fnan();
bool wasLeft = true;
while (true)
{

4
src/game/vmap/MapTree.cpp
View File

@ -211,8 +211,8 @@ namespace VMAP
pResultHitPos = pResultHitPos + dir * pModifyDist;
}
}
pResultHitPos = pPos2;
return false;
pResultHitPos = pPos2;
return false;
}
//=========================================================

2
src/game/vmap/TileAssembler.cpp
View File

@ -328,7 +328,7 @@ namespace VMAP
model.SetGroupModels(groupsArray);
}
return model.WriteFile(iDestDir + "/" + pModelFilename + ".vmo");
return model.WriteFile(iDestDir + "/" + pModelFilename + ".vmo");
}
void TileAssembler::exportGameobjectModels(const char *RAW_VMAP_MAGIC)