josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Tabs to spaces cleanup

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Machiavelli
2009-04-19 18:48:20 +02:00
parent 60736b1f7d
commit 99fc17d44f
19 changed files with 139 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/BattleGround.cpp
+17 -17
View File
@@ -524,10 +524,10 @@ void BattleGround::EndBattleGround(uint32 winner)
if(!isArena()){
if(m_score[GetTeamIndexByTeamId(ALLIANCE)] == m_score[GetTeamIndexByTeamId(HORDE)])
almost_winning_team = 0; //no real winner
if(m_score[GetTeamIndexByTeamId(ALLIANCE)] > m_score[GetTeamIndexByTeamId(HORDE)])
almost_winning_team = ALLIANCE;
if(m_score[GetTeamIndexByTeamId(ALLIANCE)] == m_score[GetTeamIndexByTeamId(HORDE)])
almost_winning_team = 0; //no real winner
if(m_score[GetTeamIndexByTeamId(ALLIANCE)] > m_score[GetTeamIndexByTeamId(HORDE)])
almost_winning_team = ALLIANCE;
}
@@ -572,19 +572,19 @@ void BattleGround::EndBattleGround(uint32 winner)
}
else if(winner !=0)
{
RewardMark(plr,ITEM_LOSER_COUNT);
RewardMark(plr,ITEM_LOSER_COUNT);
}
else if(winner == 0)
{
if(sWorld.getConfig(CONFIG_PREMATURE_BG_REWARD)) // We're feeling generous, giving rewards to people who not earned them ;)
{ //nested ifs for the win! its boring writing that, forgive me my unfunniness
if(almost_winning_team == team) //player's team had more points
RewardMark(plr,ITEM_WINNER_COUNT);
else
RewardMark(plr,ITEM_LOSER_COUNT); // if scores were the same, each team gets 1 mark.
}
}
else if(winner == 0)
{
if(sWorld.getConfig(CONFIG_PREMATURE_BG_REWARD)) // We're feeling generous, giving rewards to people who not earned them ;)
{ //nested ifs for the win! its boring writing that, forgive me my unfunniness
if(almost_winning_team == team) //player's team had more points
RewardMark(plr,ITEM_WINNER_COUNT);
else
RewardMark(plr,ITEM_LOSER_COUNT); // if scores were the same, each team gets 1 mark.
}
}
plr->CombatStopWithPets(true);
@@ -610,7 +610,7 @@ void BattleGround::EndBattleGround(uint32 winner)
// this way all arena team members will get notified, not only the ones who participated in this match
winner_arena_team->NotifyStatsChanged();
loser_arena_team->NotifyStatsChanged();
sLog.outDebug("Rated arena match between %s and %s finished, winner: %s", loser_arena_team->GetName().c_str(),winner_arena_team->GetName().c_str(),winner_arena_team->GetName().c_str());
sLog.outDebug("Rated arena match between %s and %s finished, winner: %s", loser_arena_team->GetName().c_str(),winner_arena_team->GetName().c_str(),winner_arena_team->GetName().c_str());
}
// inform invited players about the removal
src/game/BattleGround.h
+2 -2
View File
@@ -489,7 +489,7 @@ class BattleGround
uint8 m_Events;
bool m_BuffChange;
uint32 m_score[2]; //array that keeps general team scores, used to determine who gets most marks when bg ends prematurely
uint32 m_score[2]; //array that keeps general team scores, used to determine who gets most marks when bg ends prematurely
BGHonorMode m_HonorMode;
private:
@@ -514,7 +514,7 @@ class BattleGround
bool m_PrematureCountDown;
uint32 m_PrematureCountDownTimer;
char const *m_Name;
/* Player lists */
std::vector<uint64> m_ResurrectQueue; // Player GUID
src/game/BattleGroundAB.cpp
+1 -1
View File
@@ -195,7 +195,7 @@ void BattleGroundAB::Update(time_t diff)
{
m_lastTick[team] -= BG_AB_TickIntervals[points];
m_TeamScores[team] += BG_AB_TickPoints[points];
m_score[team] = m_TeamScores[team];
m_score[team] = m_TeamScores[team];
m_HonorScoreTics[team] += BG_AB_TickPoints[points];
m_ReputationScoreTics[team] += BG_AB_TickPoints[points];
if( m_ReputationScoreTics[team] >= BG_AB_ReputationScoreTicks[m_HonorMode] )
src/game/Chat.cpp
+5 -8
View File
@@ -871,9 +871,6 @@ int ChatHandler::ParseCommands(const char* text)
std::string fullcmd = text;
//if(m_session->GetSecurity() == 0)
// return 0;
/// chat case (.command or !command format)
if(m_session)
{
@@ -895,11 +892,11 @@ int ChatHandler::ParseCommands(const char* text)
++text;
if(!ExecuteCommandInTable(getCommandTable(), text, fullcmd))
{
if(m_session && m_session->GetSecurity() == SEC_PLAYER)
return 0;
SendSysMessage(LANG_NO_CMD);
}
{
if(m_session && m_session->GetSecurity() == SEC_PLAYER)
return 0;
SendSysMessage(LANG_NO_CMD);
}
return 1;
}
src/game/Creature.cpp
+1 -1
View File
@@ -205,7 +205,7 @@ void Creature::SearchFormation()
uint32 lowguid = GetDBTableGUIDLow();
if(!lowguid)
return;
return;
CreatureGroupInfoType::iterator frmdata = CreatureGroupMap.find(lowguid);
if(frmdata != CreatureGroupMap.end())
src/game/Map.h
+1 -1
View File
@@ -277,7 +277,7 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O
template<class NOTIFIER> void VisitAll(const float &x, const float &y, float radius, NOTIFIER &notifier);
template<class NOTIFIER> void VisitWorld(const float &x, const float &y, float radius, NOTIFIER &notifier);
template<class NOTIFIER> void VisitGrid(const float &x, const float &y, float radius, NOTIFIER &notifier);
CreatureGroupHolderType CreatureGroupHolder;
CreatureGroupHolderType CreatureGroupHolder;
private:
void LoadVMap(int pX, int pY);
void LoadMap(uint32 mapid, uint32 instanceid, int x,int y);
src/game/ObjectMgr.cpp
+10 -10
View File
@@ -4922,9 +4922,9 @@ void ObjectMgr::LoadAccessRequirements()
uint32 count = 0;
// 0 1 2 3 4 5 6 7 8 9 10
// 0 1 2 3 4 5 6 7 8 9 10
QueryResult *result = WorldDatabase.Query("SELECT id, level_min, level_max, item, item2, heroic_key, heroic_key2, quest_done, quest_failed_text, heroic_quest_done, heroic_quest_failed_text FROM access_requirement");
if( !result )
if( !result )
{
barGoLink bar( 1 );
@@ -5001,14 +5001,14 @@ void ObjectMgr::LoadAccessRequirements()
}
}
if(ar.heroicQuest)
{
if(!mQuestTemplates[ar.heroicQuest])
{
sLog.outErrorDb("Required Heroic Quest %u not exist for trigger %u, remove heroic quest done requirement.",ar.heroicQuest,requiremt_ID);
ar.heroicQuest = 0;
}
}
if(ar.heroicQuest)
{
if(!mQuestTemplates[ar.heroicQuest])
{
sLog.outErrorDb("Required Heroic Quest %u not exist for trigger %u, remove heroic quest done requirement.",ar.heroicQuest,requiremt_ID);
ar.heroicQuest = 0;
}
}
if(ar.quest)
{
src/game/Player.cpp
+1 -1
View File
@@ -17817,7 +17817,7 @@ template<class T>
void Player::UpdateVisibilityOf(T* target, UpdateData& data, std::set<WorldObject*>& visibleNow)
{
if(!target)
return;
return;
if(HaveAtClient(target))
{
if(!target->isVisibleForInState(this,true))
src/game/Player.h
+1 -1
View File
@@ -840,7 +840,7 @@ struct AccessRequirement
uint32 heroicKey2;
uint32 quest;
std::string questFailedText;
uint32 heroicQuest;
uint32 heroicQuest;
std::string heroicQuestFailedText;
};
src/game/SpellEffects.cpp
+1 -1
View File
@@ -4171,7 +4171,7 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
{
if(itr->second->GetSpellProto()->Dispel == DISPEL_POISON)
{
totalDamagePercentMod *= 1.5f; // 150% if poisoned
totalDamagePercentMod *= 1.5f; // 150% if poisoned
break;
}
}
src/game/SpellMgr.cpp
+1 -1
View File
@@ -2209,7 +2209,7 @@ void SpellMgr::LoadSpellCustomAttr()
case 45027: // Revitalize
case 45976: // Muru Portal Channel
case 39365: // Thundering Storm
case 41071: // Raise Dead
case 41071: // Raise Dead
spellInfo->MaxAffectedTargets = 1;
break;
case 41376: // Spite