nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-17 02:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

converted all tabs to 4 spaces

Browse Source
This commit is contained in:
Yehonal
2016-06-26 19:23:57 +02:00
parent 52f305111c
commit f6eefedcd5
717 changed files with 132388 additions and 132388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/shared/Common.cpp
View File

@@ -41,9 +41,9 @@ LocaleConstant GetLocaleByName(const std::string& name)
void CleanStringForMysqlQuery(std::string& str)
{
std::string::size_type n = 0;
while ((n=str.find('\\')) != str.npos) str.erase(n,1);
while ((n=str.find('"')) != str.npos) str.erase(n,1);
while ((n=str.find('\'')) != str.npos) str.erase(n,1);
std::string::size_type n = 0;
while ((n=str.find('\\')) != str.npos) str.erase(n,1);
while ((n=str.find('"')) != str.npos) str.erase(n,1);
while ((n=str.find('\'')) != str.npos) str.erase(n,1);
}

12
src/server/shared/Database/Implementation/CharacterDatabase.cpp
View File

@@ -106,7 +106,7 @@ void CharacterDatabaseConnection::DoPrepareStatements()
PrepareStatement(CHAR_SEL_CHARACTER_QUESTSTATUSREW, "SELECT quest FROM character_queststatus_rewarded WHERE guid = ? AND active = 1", CONNECTION_ASYNC);
PrepareStatement(CHAR_SEL_ACCOUNT_INSTANCELOCKTIMES, "SELECT instanceId, releaseTime FROM account_instance_times WHERE accountId = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_SEL_BREW_OF_THE_MONTH, "SELECT lastEventId FROM character_brew_of_the_month WHERE guid = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_REP_BREW_OF_THE_MONTH, "REPLACE INTO character_brew_of_the_month (guid, lastEventId) VALUES (?, ?)", CONNECTION_ASYNC);
PrepareStatement(CHAR_REP_BREW_OF_THE_MONTH, "REPLACE INTO character_brew_of_the_month (guid, lastEventId) VALUES (?, ?)", CONNECTION_ASYNC);
// End LoginQueryHolder content
PrepareStatement(CHAR_SEL_CHARACTER_ACTIONS_SPEC, "SELECT button, action, type FROM character_action WHERE guid = ? AND spec = ? ORDER BY button", CONNECTION_ASYNC);
@@ -212,8 +212,8 @@ void CharacterDatabaseConnection::DoPrepareStatements()
PrepareStatement(CHAR_UPD_CHANNEL_USAGE, "UPDATE channels SET lastUsed = UNIX_TIMESTAMP() WHERE channelId = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_DEL_OLD_CHANNELS, "DELETE FROM channels WHERE lastUsed + ? < UNIX_TIMESTAMP()", CONNECTION_ASYNC);
PrepareStatement(CHAR_DEL_OLD_CHANNELS_BANS, "DELETE cb.* FROM channels_bans cb LEFT JOIN channels cn ON cb.channelId=cn.channelId WHERE cn.channelId IS NULL OR cb.banTime <= UNIX_TIMESTAMP()", CONNECTION_ASYNC);
PrepareStatement(CHAR_INS_CHANNEL_BAN, "REPLACE INTO channels_bans VALUES (?, ?, ?)", CONNECTION_ASYNC);
PrepareStatement(CHAR_DEL_CHANNEL_BAN, "DELETE FROM channels_bans WHERE channelId = ? AND playerGUID = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_INS_CHANNEL_BAN, "REPLACE INTO channels_bans VALUES (?, ?, ?)", CONNECTION_ASYNC);
PrepareStatement(CHAR_DEL_CHANNEL_BAN, "DELETE FROM channels_bans WHERE channelId = ? AND playerGUID = ?", CONNECTION_ASYNC);
// Equipmentsets
PrepareStatement(CHAR_UPD_EQUIP_SET, "UPDATE character_equipmentsets SET name=?, iconname=?, ignore_mask=?, item0=?, item1=?, item2=?, item3=?, "
@@ -370,7 +370,7 @@ void CharacterDatabaseConnection::DoPrepareStatements()
PrepareStatement(CHAR_UPD_CHAR_INSTANCE_SET_NOT_EXTENDED, "UPDATE character_instance SET extended = 0 WHERE instance = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_DEL_CHAR_INSTANCE_BY_INSTANCE_GUID, "DELETE FROM character_instance WHERE guid = ? AND instance = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_UPD_CHAR_INSTANCE, "UPDATE character_instance SET instance = ?, permanent = ?, extended = 0 WHERE guid = ? AND instance = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_UPD_CHAR_INSTANCE_EXTENDED, "UPDATE character_instance SET extended = ? WHERE guid = ? AND instance = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_UPD_CHAR_INSTANCE_EXTENDED, "UPDATE character_instance SET extended = ? WHERE guid = ? AND instance = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_INS_CHAR_INSTANCE, "INSERT INTO character_instance (guid, instance, permanent, extended) VALUES (?, ?, ?, 0)", CONNECTION_ASYNC);
PrepareStatement(CHAR_INS_ARENA_LOG_FIGHT, "INSERT INTO log_arena_fights VALUES (?, NOW(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC);
PrepareStatement(CHAR_INS_ARENA_LOG_MEMBERSTATS, "INSERT INTO log_arena_memberstats VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC);
@@ -511,7 +511,7 @@ void CharacterDatabaseConnection::DoPrepareStatements()
PrepareStatement(CHAR_SEL_ITEMCONTAINER_ITEMS, "SELECT containerGUID, itemid, count, randomPropertyId, randomSuffix FROM item_loot_storage", CONNECTION_SYNCH);
PrepareStatement(CHAR_DEL_ITEMCONTAINER_SINGLE_ITEM, "DELETE FROM item_loot_storage WHERE containerGUID = ? AND itemid = ? AND count = ? LIMIT 1", CONNECTION_ASYNC);
PrepareStatement(CHAR_INS_ITEMCONTAINER_SINGLE_ITEM, "INSERT INTO item_loot_storage (containerGUID, itemid, count, randomPropertyId, randomSuffix) VALUES (?, ?, ?, ?, ?)", CONNECTION_ASYNC);
PrepareStatement(CHAR_DEL_ITEMCONTAINER_CONTAINER, "DELETE FROM item_loot_storage WHERE containerGUID = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_DEL_ITEMCONTAINER_CONTAINER, "DELETE FROM item_loot_storage WHERE containerGUID = ?", CONNECTION_ASYNC);
// Calendar
PrepareStatement(CHAR_REP_CALENDAR_EVENT, "REPLACE INTO calendar_events (id, creator, title, description, type, dungeon, eventtime, flags, time2) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC);
@@ -552,5 +552,5 @@ void CharacterDatabaseConnection::DoPrepareStatements()
PrepareStatement(CHAR_UPD_CHAR_PET_SLOT_BY_ID, "UPDATE character_pet SET slot = ? WHERE owner = ? AND id = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_DEL_CHAR_PET_BY_ID, "DELETE FROM character_pet WHERE id = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_DEL_CHAR_PET_BY_SLOT, "DELETE FROM character_pet WHERE owner = ? AND (slot = ? OR slot > ?)", CONNECTION_ASYNC);
PrepareStatement(CHAR_REP_CHAR_PET, "REPLACE INTO character_pet (id, entry, owner, modelid, CreatedBySpell, PetType, level, exp, Reactstate, name, renamed, slot, curhealth, curmana, curhappiness, savetime, abdata) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC);
PrepareStatement(CHAR_REP_CHAR_PET, "REPLACE INTO character_pet (id, entry, owner, modelid, CreatedBySpell, PetType, level, exp, Reactstate, name, renamed, slot, curhealth, curmana, curhappiness, savetime, abdata) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC);
}

20
src/server/shared/Database/Implementation/CharacterDatabase.h
View File

@@ -109,8 +109,8 @@ enum CharacterDatabaseStatements
CHAR_SEL_CHARACTER_QUESTSTATUSREW,
CHAR_SEL_ACCOUNT_INSTANCELOCKTIMES,
CHAR_SEL_MAILITEMS,
CHAR_SEL_BREW_OF_THE_MONTH,
CHAR_REP_BREW_OF_THE_MONTH,
CHAR_SEL_BREW_OF_THE_MONTH,
CHAR_REP_BREW_OF_THE_MONTH,
CHAR_SEL_AUCTION_ITEMS,
CHAR_INS_AUCTION,
CHAR_DEL_AUCTION,
@@ -192,9 +192,9 @@ enum CharacterDatabaseStatements
CHAR_UPD_CHANNEL,
CHAR_UPD_CHANNEL_USAGE,
CHAR_DEL_OLD_CHANNELS,
CHAR_DEL_OLD_CHANNELS_BANS,
CHAR_INS_CHANNEL_BAN,
CHAR_DEL_CHANNEL_BAN,
CHAR_DEL_OLD_CHANNELS_BANS,
CHAR_INS_CHANNEL_BAN,
CHAR_DEL_CHANNEL_BAN,
CHAR_UPD_EQUIP_SET,
CHAR_INS_EQUIP_SET,
@@ -217,7 +217,7 @@ enum CharacterDatabaseStatements
CHAR_INS_INSTANCE_SAVE,
CHAR_UPD_INSTANCE_SAVE_DATA,
CHAR_UPD_INSTANCE_SAVE_ENCOUNTERMASK,
CHAR_UPD_INSTANCE_SAVE_ENCOUNTERMASK,
CHAR_DEL_GAME_EVENT_SAVE,
CHAR_INS_GAME_EVENT_SAVE,
@@ -314,8 +314,8 @@ enum CharacterDatabaseStatements
CHAR_UPD_CHAR_INSTANCE,
CHAR_UPD_CHAR_INSTANCE_EXTENDED,
CHAR_INS_CHAR_INSTANCE,
CHAR_INS_ARENA_LOG_FIGHT,
CHAR_INS_ARENA_LOG_MEMBERSTATS,
CHAR_INS_ARENA_LOG_FIGHT,
CHAR_INS_ARENA_LOG_MEMBERSTATS,
CHAR_UPD_GENDER_PLAYERBYTES,
CHAR_DEL_CHARACTER_SKILL,
CHAR_UPD_ADD_CHARACTER_SOCIAL_FLAGS,
@@ -485,12 +485,12 @@ enum CharacterDatabaseStatements
CHAR_UPD_CHAR_PET_SLOT_BY_ID,
CHAR_DEL_CHAR_PET_BY_ID,
CHAR_DEL_CHAR_PET_BY_SLOT,
CHAR_REP_CHAR_PET,
CHAR_REP_CHAR_PET,
CHAR_SEL_ITEMCONTAINER_ITEMS,
CHAR_DEL_ITEMCONTAINER_SINGLE_ITEM,
CHAR_INS_ITEMCONTAINER_SINGLE_ITEM,
CHAR_DEL_ITEMCONTAINER_CONTAINER,
CHAR_DEL_ITEMCONTAINER_CONTAINER,
MAX_CHARACTERDATABASE_STATEMENTS
};

6
src/server/shared/Database/Implementation/LoginDatabase.cpp
View File

@@ -55,8 +55,8 @@ void LoginDatabaseConnection::DoPrepareStatements()
PrepareStatement(LOGIN_DEL_REALM_CHARACTERS, "DELETE FROM realmcharacters WHERE acctid = ?", CONNECTION_ASYNC);
PrepareStatement(LOGIN_INS_REALM_CHARACTERS, "INSERT INTO realmcharacters (numchars, acctid, realmid) VALUES (?, ?, ?)", CONNECTION_ASYNC);
PrepareStatement(LOGIN_SEL_SUM_REALM_CHARACTERS, "SELECT SUM(numchars) FROM realmcharacters WHERE acctid = ?", CONNECTION_ASYNC);
PrepareStatement(LOGIN_INS_ACCOUNT, "INSERT INTO account(username, sha_pass_hash, joindate) VALUES(?, ?, NOW())", CONNECTION_ASYNC);
PrepareStatement(LOGIN_INS_REALM_CHARACTERS_INIT, "INSERT INTO realmcharacters (realmid, acctid, numchars) SELECT realmlist.id, account.id, 0 FROM realmlist, account LEFT JOIN realmcharacters ON acctid=account.id WHERE acctid IS NULL", CONNECTION_ASYNC);
PrepareStatement(LOGIN_INS_ACCOUNT, "INSERT INTO account(username, sha_pass_hash, joindate) VALUES(?, ?, NOW())", CONNECTION_ASYNC);
PrepareStatement(LOGIN_INS_REALM_CHARACTERS_INIT, "INSERT INTO realmcharacters (realmid, acctid, numchars) SELECT realmlist.id, account.id, 0 FROM realmlist, account LEFT JOIN realmcharacters ON acctid=account.id WHERE acctid IS NULL", CONNECTION_ASYNC);
PrepareStatement(LOGIN_UPD_EXPANSION, "UPDATE account SET expansion = ? WHERE id = ?", CONNECTION_ASYNC);
PrepareStatement(LOGIN_UPD_ACCOUNT_LOCK, "UPDATE account SET locked = ? WHERE id = ?", CONNECTION_ASYNC);
PrepareStatement(LOGIN_UPD_USERNAME, "UPDATE account SET v = 0, s = 0, username = ?, sha_pass_hash = ? WHERE id = ?", CONNECTION_ASYNC);
@@ -85,5 +85,5 @@ void LoginDatabaseConnection::DoPrepareStatements()
PrepareStatement(LOGIN_SEL_ACCOUNT_WHOIS, "SELECT username, email, last_ip FROM account WHERE id = ?", CONNECTION_SYNCH);
PrepareStatement(LOGIN_SEL_REALMLIST_SECURITY_LEVEL, "SELECT allowedSecurityLevel from realmlist WHERE id = ?", CONNECTION_SYNCH);
PrepareStatement(LOGIN_DEL_ACCOUNT, "DELETE FROM account WHERE id = ?", CONNECTION_ASYNC);
PrepareStatement(LOGIN_SEL_AUTOBROADCAST, "SELECT id, weight, text FROM autobroadcast WHERE realmid = ? OR realmid = -1", CONNECTION_SYNCH);
PrepareStatement(LOGIN_SEL_AUTOBROADCAST, "SELECT id, weight, text FROM autobroadcast WHERE realmid = ? OR realmid = -1", CONNECTION_SYNCH);
}

4
src/server/shared/Database/Implementation/LoginDatabase.h
View File

@@ -76,7 +76,7 @@ enum LoginDatabaseStatements
LOGIN_INS_REALM_CHARACTERS,
LOGIN_SEL_SUM_REALM_CHARACTERS,
LOGIN_INS_ACCOUNT,
LOGIN_INS_REALM_CHARACTERS_INIT,
LOGIN_INS_REALM_CHARACTERS_INIT,
LOGIN_UPD_EXPANSION,
LOGIN_UPD_ACCOUNT_LOCK,
LOGIN_UPD_USERNAME,
@@ -105,7 +105,7 @@ enum LoginDatabaseStatements
LOGIN_SEL_ACCOUNT_WHOIS,
LOGIN_SEL_REALMLIST_SECURITY_LEVEL,
LOGIN_DEL_ACCOUNT,
LOGIN_SEL_AUTOBROADCAST,
LOGIN_SEL_AUTOBROADCAST,
MAX_LOGINDATABASE_STATEMENTS
};

2
src/server/shared/Logging/Log.cpp
View File

@@ -964,7 +964,7 @@ void Log::outMisc(const char * str, ...)
if (!str)
return;
if (m_enableLogDB)
if (m_enableLogDB)
{
va_list ap2;
va_start(ap2, str);

4
src/server/shared/Logging/Log.h
View File

@@ -67,8 +67,8 @@ enum LogTypes
LOG_TYPE_GM = 8,
LOG_TYPE_CRASH = 9,
LOG_TYPE_CHAT = 10,
LOG_TYPE_PERF = 11,
LOG_TYPE_MULTITH= 12,
LOG_TYPE_PERF = 11,
LOG_TYPE_MULTITH= 12,
MAX_LOG_TYPES
};

4
src/server/shared/Packets/ByteBuffer.cpp
View File

@@ -49,8 +49,8 @@ ByteBufferSourceException::ByteBufferSourceException(size_t pos, size_t size,
void ByteBuffer::hexlike(bool outString) const
{
if (!outString)
return;
if (!outString)
return;
uint32 j = 1, k = 1;

40
src/server/shared/Packets/ByteBuffer.h
View File

@@ -239,22 +239,22 @@ class ByteBuffer
ByteBuffer &operator>>(float &value)
{
value = read<float>();
if (!myisfinite(value))
{
value = 0.0f;
if (!myisfinite(value))
{
value = 0.0f;
//throw ByteBufferException();
}
}
return *this;
}
ByteBuffer &operator>>(double &value)
{
value = read<double>();
if (!myisfinite(value))
{
value = 0.0f;
if (!myisfinite(value))
{
value = 0.0f;
//throw ByteBufferException();
}
}
return *this;
}
@@ -435,19 +435,19 @@ class ByteBuffer
ASSERT(size() < 10000000);
size_t newsize = _wpos + cnt;
size_t newsize = _wpos + cnt;
if (_storage.capacity() < newsize) // pussywizard
{
if (newsize < 100)
_storage.reserve(300);
else if (newsize < 750)
_storage.reserve(2500);
else if (newsize < 6000)
_storage.reserve(10000);
else
_storage.reserve(400000);
}
if (_storage.capacity() < newsize) // pussywizard
{
if (newsize < 100)
_storage.reserve(300);
else if (newsize < 750)
_storage.reserve(2500);
else if (newsize < 6000)
_storage.reserve(10000);
else
_storage.reserve(400000);
}
if (_storage.size() < newsize)
_storage.resize(newsize);

18
src/server/shared/Threading/DelayExecutor.cpp
View File

@@ -79,11 +79,11 @@ int DelayExecutor::start(int num_threads, ACE_Method_Request* pre_svc_hook, ACE_
queue_.queue()->activate();
// pussywizard:
ACE_Based::ThreadPriority tp;
int _priority = tp.getPriority(ACE_Based::Highest);
if (ACE_Task_Base::activate(THR_NEW_LWP | THR_JOINABLE, num_threads, 0, _priority) == -1)
return -1;
// pussywizard:
ACE_Based::ThreadPriority tp;
int _priority = tp.getPriority(ACE_Based::Highest);
if (ACE_Task_Base::activate(THR_NEW_LWP | THR_JOINABLE, num_threads, 0, _priority) == -1)
return -1;
//if (ACE_Task_Base::activate(THR_NEW_LWP | THR_JOINABLE | THR_INHERIT_SCHED, num_threads) == -1)
// return -1;
@@ -98,10 +98,10 @@ int DelayExecutor::execute(ACE_Method_Request* new_req)
if (new_req == NULL)
return -1;
// pussywizard: NULL as param for enqueue - wait until the action is possible!
// new tasks are added to the queue during map update (schedule_update in MapInstanced::Update)
// the queue can be momentarily blocked by map threads constantly waiting for tasks (for (;;) { queue_.dequeue();... } in DelayExecutor::svc())
// so just wait a moment, don't drop the task xDddd
// pussywizard: NULL as param for enqueue - wait until the action is possible!
// new tasks are added to the queue during map update (schedule_update in MapInstanced::Update)
// the queue can be momentarily blocked by map threads constantly waiting for tasks (for (;;) { queue_.dequeue();... } in DelayExecutor::svc())
// so just wait a moment, don't drop the task xDddd
if (queue_.enqueue(new_req, /*(ACE_Time_Value*)&ACE_Time_Value::zero*/ NULL) == -1)
{
delete new_req;

2
src/server/shared/Utilities/EventProcessor.cpp
View File

@@ -99,5 +99,5 @@ uint64 EventProcessor::CalculateTime(uint64 t_offset) const
uint64 EventProcessor::CalculateQueueTime(uint64 delay) const
{
return CalculateTime(delay - (m_time % delay));
return CalculateTime(delay - (m_time % delay));
}

4
src/server/shared/Utilities/EventProcessor.h
View File

@@ -66,8 +66,8 @@ class EventProcessor
void AddEvent(BasicEvent* Event, uint64 e_time, bool set_addtime = true);
uint64 CalculateTime(uint64 t_offset) const;
// Xinef: calculates next queue tick time
uint64 CalculateQueueTime(uint64 delay) const;
// Xinef: calculates next queue tick time
uint64 CalculateQueueTime(uint64 delay) const;
protected:
uint64 m_time;

20
src/server/shared/Utilities/Util.h
View File

@@ -596,10 +596,10 @@ class EventMap
return _time;
}
void SetTimer(uint32 time)
{
_time = time;
}
void SetTimer(uint32 time)
{
_time = time;
}
/**
* @name GetPhaseMask
@@ -773,20 +773,20 @@ class EventMap
_time = delay < _time ? _time - delay : 0;
}
void DelayEventsToMax(uint32 delay, uint32 group)
{
for (EventStore::iterator itr = _eventMap.begin(); itr != _eventMap.end();)
void DelayEventsToMax(uint32 delay, uint32 group)
{
for (EventStore::iterator itr = _eventMap.begin(); itr != _eventMap.end();)
{
if (itr->first < _time+delay && (group == 0 || ((1 << (group + 15)) & itr->second)))
if (itr->first < _time+delay && (group == 0 || ((1 << (group + 15)) & itr->second)))
{
ScheduleEvent(itr->second, delay);
ScheduleEvent(itr->second, delay);
_eventMap.erase(itr);
itr = _eventMap.begin();
}
else
++itr;
}
}
}
/**
* @name DelayEvents