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

Core: Generic cleanup (tab2spaces/whitespace removal)

Browse Source 
--HG--
branch : trunk
This commit is contained in:
click
2010-09-25 22:03:57 +02:00
parent a596cae1d9
commit 461590832a
21 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/SmartAI/SmartAI.h
+3 -3
View File
@@ -81,7 +81,7 @@ enum SMARTAI_EVENT
SMART_EVENT_BUFFED = 23, // Param1 = SpellID, Param2 = Number of Time STacked, Param3/4 Repeat Min/Max
SMART_EVENT_TARGET_BUFFED = 24, // Param1 = SpellID, Param2 = Number of Time STacked, Param3/4 Repeat Min/Max
SMART_EVENT_RESET = 35, // Is it called after combat, when the creature respawn and spawn. -- TRINITY ONLY
SMART_EVENT_END = 36,
};
@@ -201,7 +201,7 @@ struct SMARTAI_EVENT_HOLDER
uint32 event_flags;
int32 event_param[SMARTAI_EVENT_PARAM_COUNT];
SMARTAI_ACTION action_type;
SMARTAI_ACTION action_type;
int32 action_param[SMARTAI_ACTION_PARAM_COUNT];
float param_x;
@@ -253,7 +253,7 @@ class SmartAI : public CreatureAI
public:
~SmartAI(){};
explicit SmartAI(Creature *c);
// Called when creature is spawned or respawned
void JustRespawned();
src/server/game/Achievements/AchievementMgr.cpp
+1 -1
View File
@@ -600,7 +600,7 @@ void AchievementMgr::LoadFromDB(PreparedQueryResult achievementResult, PreparedQ
progress.counter = counter;
progress.date = date;
progress.changed = false;
}
}
while (criteriaResult->NextRow());
}
}
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+1 -1
View File
@@ -324,7 +324,7 @@ void AuctionHouseMgr::LoadAuctionItems()
do
{
bar.step();
Field* fields = result->Fetch();
uint32 item_guid = fields[11].GetUInt32();
src/server/game/Chat/Commands/Level3.cpp
+1 -1
View File
@@ -5918,7 +5918,7 @@ bool ChatHandler::HandleBanInfoCharacterCommand(const char *args)
std::string bantime = permanent ? GetTrinityString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[1].GetUInt64(), true);
PSendSysMessage(LANG_BANINFO_HISTORYENTRY,
fields[0].GetCString(), bantime.c_str(), active ? GetTrinityString(LANG_BANINFO_YES) : GetTrinityString(LANG_BANINFO_NO), fields[4].GetCString(), fields[5].GetCString());
}
}
while (result->NextRow());
return true;
src/server/game/DungeonFinding/LFGMgr.cpp
+3 -3
View File
@@ -660,7 +660,7 @@ void LFGMgr::Join(Player* plr)
LfgRolesMap roles;
roles[plr->GetGUIDLow()] = plr->GetLfgRoles();
// Expand random dungeons
// Expand random dungeons
LfgLockStatusMap* playersLockMap = NULL;
if (plr->GetLfgDungeons()->size() == 1 && isRandomDungeon(*plr->GetLfgDungeons()->begin()))
{
@@ -671,7 +671,7 @@ void LFGMgr::Join(Player* plr)
}
else
dungeons = plr->GetLfgDungeons();
if (!dungeons || !dungeons->size())
{
if (dungeons)
@@ -940,7 +940,7 @@ bool LFGMgr::CheckCompatibility(LfgGuidList check, LfgProposalList* proposals)
guid1 = playerguid;
}
playerguid = MAKE_NEW_GUID(itRoles->first, 0, HIGHGUID_PLAYER);
sLog.outError("LFGMgr::CheckCompatibility: check(%s) player [" UI64FMTD "] in queue with [" UI64FMTD "] and OBSOLETE! [" UI64FMTD "]",
sLog.outError("LFGMgr::CheckCompatibility: check(%s) player [" UI64FMTD "] in queue with [" UI64FMTD "] and OBSOLETE! [" UI64FMTD "]",
strGuids.c_str(), playerguid, guid1, guid2);
}
rolesMap[itRoles->first] = itRoles->second;
src/server/game/Entities/Player/Player.cpp
+1 -1
View File
@@ -15951,7 +15951,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder)
sLog.outError("Player (GUID: %u) not found in table `characters`, can't load. ",guid);
return false;
}
Field* fields = result->Fetch();
uint32 dbAccountId = fields[1].GetUInt32();
src/server/game/Globals/ObjectMgr.cpp
+1 -1
View File
@@ -3572,7 +3572,7 @@ void ObjectMgr::LoadGuildEvents(std::vector<Guild*>& GuildVector, QueryResult& r
uint32 guildid = fields[6].GetUInt32();
if (guildid >= GuildVector.size() || GuildVector[guildid] == NULL)
return;
if (!GuildVector[guildid]->m_GuildEventLogNextGuid)
GuildVector[guildid]->m_GuildEventLogNextGuid = fields[0].GetUInt32();
src/server/game/Pools/PoolMgr.cpp
+1 -1
View File
@@ -909,7 +909,7 @@ void PoolMgr::LoadQuestPools()
}
while (result->NextRow());
sLog.outString();
sLog.outString(">> Loaded %u quests in pools", count);
}
src/server/game/Scripting/MapScripts.cpp
+2 -2
View File
@@ -755,8 +755,8 @@ void Map::ScriptsProcess()
break;
}
bool triggered = (step.script->CastSpell.Flags != 4) ?
step.script->CastSpell.CreatureEntry & SF_CASTSPELL_TRIGGERED :
bool triggered = (step.script->CastSpell.Flags != 4) ?
step.script->CastSpell.CreatureEntry & SF_CASTSPELL_TRIGGERED :
step.script->CastSpell.CreatureEntry < 0;
uSource->CastSpell(uTarget, step.script->CastSpell.SpellID, triggered);
break;
src/server/game/Scripting/ScriptMgr.cpp
+5 -5
View File
@@ -1221,31 +1221,31 @@ void ScriptMgr::OnGuildDisband(Guild *guild)
void ScriptMgr::OnGroupAddMember(Group* group, uint64 guid)
{
ASSERT(group);
ASSERT(group);
FOREACH_SCRIPT(GroupScript)->OnAddMember(group, guid);
}
void ScriptMgr::OnGroupInviteMember(Group* group, uint64 guid)
{
ASSERT(group);
ASSERT(group);
FOREACH_SCRIPT(GroupScript)->OnInviteMember(group, guid);
}
void ScriptMgr::OnGroupRemoveMember(Group* group, uint64 guid, RemoveMethod method)
{
ASSERT(group);
ASSERT(group);
FOREACH_SCRIPT(GroupScript)->OnRemoveMember(group, guid, method);
}
void ScriptMgr::OnGroupChangeLeader(Group* group, uint64 newLeaderGuid, uint64 oldLeaderGuid)
{
ASSERT(group);
ASSERT(group);
FOREACH_SCRIPT(GroupScript)->OnChangeLeader(group, newLeaderGuid, oldLeaderGuid);
}
void ScriptMgr::OnGroupDisband(Group* group)
{
ASSERT(group);
ASSERT(group);
FOREACH_SCRIPT(GroupScript)->OnDisband(group);
}
src/server/game/Scripting/ScriptMgr.h
+2 -2
View File
@@ -690,7 +690,7 @@ class PlayerScript : public ScriptObject
// Called when a duel starts (after 3s countdown)
virtual void OnDuelStart(Player* /*player1*/, Player* /*player2*/) { }
// Called when a duel ends
virtual void OnDuelEnd(Player* /*winner*/, Player* /*looser*/, DuelCompleteType /*type*/) { }
@@ -737,7 +737,7 @@ class GuildScript : public ScriptObject
class GroupScript : public ScriptObject
{
protected:
GroupScript(const char* name);
GroupScript(const char* name);
public:
bool IsDatabaseBound() const { return false; }
src/server/game/Server/Protocol/Handlers/LFGHandler.cpp
+1 -1
View File
@@ -548,7 +548,7 @@ void WorldSession::SendLfgBootPlayer(LfgPlayerBoot* pBoot)
}
uint64 victimguid = MAKE_NEW_GUID(pBoot->victimLowGuid, 0, HIGHGUID_PLAYER);
sLog.outDebug("SMSG_LFG_BOOT_PLAYER [" UI64FMTD "] inProgress: %u - didVote: %u - agree: %u - victim: [" UI64FMTD "] votes: %u - agrees: %u - left: %u - needed: %u - reason %s",
sLog.outDebug("SMSG_LFG_BOOT_PLAYER [" UI64FMTD "] inProgress: %u - didVote: %u - agree: %u - victim: [" UI64FMTD "] votes: %u - agrees: %u - left: %u - needed: %u - reason %s",
GetPlayer()->GetGUID(), uint8(pBoot->inProgress), uint8(playerVote != LFG_ANSWER_PENDING), uint8(playerVote == LFG_ANSWER_AGREE), victimguid, votesNum, agreeNum, secsleft, pBoot->votedNeeded, pBoot->reason.c_str());
WorldPacket data(SMSG_LFG_BOOT_PLAYER, 1 + 1 + 1 + 8 + 4 + 4 + 4 + 4 + pBoot->reason.length());
data << uint8(pBoot->inProgress); // Vote in progress
src/server/game/Texts/CreatureTextMgr.cpp
+3 -3
View File
@@ -29,7 +29,7 @@ void CreatureTextMgr::LoadCreatureTexts()
PreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_LOAD_CRETEXT);
PreparedQueryResult result = WorldDatabase.Query(stmt);
if (!result)
{
barGoLink bar(1);
@@ -38,7 +38,7 @@ void CreatureTextMgr::LoadCreatureTexts()
sLog.outString(">> Loaded 0 Creature Texts. DB table `creature_texts` is empty.");
return;
}
barGoLink bar(result->GetRowCount());
uint32 TextCount = 0;
uint32 CreatureCount = 0;
@@ -100,7 +100,7 @@ void CreatureTextMgr::LoadCreatureTexts()
}
//add the text into our entry's group
mTextMap[temp.entry][temp.group].push_back(temp);
++TextCount;
} while (result->NextRow());