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

Cleanup/Core: Remove whitespace and tabs

Browse Source 
--HG--
branch : trunk
This commit is contained in:
click
2010-09-12 01:40:27 +02:00
parent 6fa05cfa3e
commit bf664b7a44
64 changed files with 261 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlegrounds/ArenaTeam.cpp
+2 -2
View File
@@ -615,7 +615,7 @@ uint32 ArenaTeam::GetAverageMMR(Group *group) const
matchmakerrating += itr->matchmaker_rating;
++player_divider;
}
//- x/0 = crash
if (player_divider == 0)
player_divider = 1;
@@ -645,7 +645,7 @@ int32 ArenaTeam::GetRatingMod(uint32 own_rating, uint32 enemy_rating, bool won,
// calculate the rating modification
// simulation on how it works. Not much info on how it really works
float mod;
if (won && !calculating_mmr)
{
if (own_rating < 1000)
src/server/game/Chat/Chat.cpp
+2 -2
View File
@@ -132,7 +132,7 @@ ChatCommand * ChatHandler::getCommandTable()
static ChatCommand characterCommandTable[] =
{
{ "customize", SEC_GAMEMASTER, true, &ChatHandler::HandleCharacterCustomizeCommand, "", NULL },
{ "changefaction", SEC_GAMEMASTER, true, &ChatHandler::HandleCharacterChangeFactionCommand, "", NULL },
{ "changefaction", SEC_GAMEMASTER, true, &ChatHandler::HandleCharacterChangeFactionCommand, "", NULL },
{ "changerace", SEC_GAMEMASTER, true, &ChatHandler::HandleCharacterChangeRaceCommand, "", NULL },
{ "deleted", SEC_GAMEMASTER, true, NULL, "", characterDeletedCommandTable},
{ "erase", SEC_CONSOLE, true, &ChatHandler::HandleCharacterEraseCommand, "", NULL },
@@ -663,7 +663,7 @@ ChatCommand * ChatHandler::getCommandTable()
{ NULL, 0, false, NULL, "", NULL }
};
static ChatCommand ticketResponseCommandTable[] =
static ChatCommand ticketResponseCommandTable[] =
{
{ "append", SEC_MODERATOR, false, &ChatHandler::HandleGMTicketResponseAppendCommand, "", NULL },
{ "appendln", SEC_MODERATOR, false, &ChatHandler::HandleGMTicketResponseAppendLnCommand, "", NULL },
src/server/game/DungeonFinding/LFGMgr.cpp
+2 -2
View File
@@ -814,7 +814,7 @@ bool LFGMgr::CheckCompatibility(LfgGuidList check, LfgProposalList *proposals)
sLog.outDebug("LFGMgr::CheckCompatibility: (%s): Size wrong - Not compatibles", strGuids.c_str());
return false;
}
// No previous check have been done, do it now
uint8 numPlayers = 0;
uint8 numLfgGroups = 0;
@@ -1244,7 +1244,7 @@ void LFGMgr::SetCompatibles(std::string key, bool compatibles)
/// Get the compatible dungeons between two groups from cache
/// </summary>
/// <param name="std::string">list of guids concatenated by |</param>
/// <returns>LfgAnswer,
/// <returns>LfgAnswer,
LfgAnswer LFGMgr::GetCompatibles(std::string key)
{
LfgAnswer answer = LFG_ANSWER_PENDING;
src/server/game/Entities/Creature/Creature.cpp
+1 -1
View File
@@ -144,7 +144,7 @@ m_PlayerDamageReq(0), m_lootMoney(0), m_lootRecipient(0), m_deathTimer(0), m_res
m_respawnDelay(300), m_corpseDelay(60), m_respawnradius(0.0f), m_reactState(REACT_AGGRESSIVE),
m_defaultMovementType(IDLE_MOTION_TYPE), m_DBTableGuid(0), m_equipmentId(0), m_AlreadyCallAssistance(false),
m_AlreadySearchedAssistance(false), m_regenHealth(true), m_AI_locked(false), m_isDeadByDefault(false),
m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL), m_creatureInfo(NULL), m_creatureData(NULL),
m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL), m_creatureInfo(NULL), m_creatureData(NULL),
m_formation(NULL)
{
m_regenTimer = CREATURE_REGEN_INTERVAL;
src/server/game/Entities/Creature/TemporarySummon.cpp
+2 -2
View File
@@ -25,8 +25,8 @@
#include "TemporarySummon.h"
TempSummon::TempSummon(SummonPropertiesEntry const *properties, Unit *owner) :
Creature(), m_Properties(properties), m_type(TEMPSUMMON_MANUAL_DESPAWN),
m_timer(0), m_lifetime(0)
Creature(), m_Properties(properties), m_type(TEMPSUMMON_MANUAL_DESPAWN),
m_timer(0), m_lifetime(0)
{
m_summonerGUID = owner ? owner->GetGUID() : 0;
m_unitTypeMask |= UNIT_MASK_SUMMON;
src/server/game/Entities/Object/Object.cpp
+2 -2
View File
@@ -1215,7 +1215,7 @@ void MovementInfo::OutDebug()
}
}
WorldObject::WorldObject(): WorldLocation(),
WorldObject::WorldObject(): WorldLocation(),
m_isWorldObject(false), m_name(""), m_isActive(false), m_zoneScript(NULL),
m_transport(NULL), m_currMap(NULL), m_InstanceId(0),
m_phaseMask(PHASEMASK_NORMAL), m_notifyflags(0), m_executed_notifies(0)
@@ -1436,7 +1436,7 @@ bool WorldObject::IsInRange3d(float x, float y, float z, float minRange, float m
return distsq < maxdist * maxdist;
}
void Position::RelocateOffset(const Position & offset)
void Position::RelocateOffset(const Position & offset)
{
m_positionX = GetPositionX() + (offset.GetPositionX() * cos(GetOrientation()) + offset.GetPositionY() * sin(GetOrientation() + M_PI));
m_positionY = GetPositionY() + (offset.GetPositionY() * cos(GetOrientation()) + offset.GetPositionX() * sin(GetOrientation()));
src/server/game/Entities/Pet/Pet.cpp
+2 -2
View File
@@ -43,8 +43,8 @@ char const* petTypeSuffix[MAX_PET_TYPE] =
#define PET_XP_FACTOR 0.05f
Pet::Pet(Player *owner, PetType type) : Guardian(NULL, owner),
m_resetTalentsCost(0), m_resetTalentsTime(0), m_usedTalentCount(0),
m_removed(false), m_owner(owner), m_happinessTimer(7500), m_petType(type),
m_resetTalentsCost(0), m_resetTalentsTime(0), m_usedTalentCount(0),
m_removed(false), m_owner(owner), m_happinessTimer(7500), m_petType(type),
m_duration(0), m_auraRaidUpdateMask(0), m_loading(false), m_declinedname(NULL)
{
m_unitTypeMask |= UNIT_MASK_PET;
src/server/game/Entities/Player/Player.cpp
+5 -5
View File
@@ -384,7 +384,7 @@ void TradeData::SetAccepted(bool state, bool crosssend /*= false*/)
UpdateMask Player::updateVisualBits;
// we can disable this warning for this since it only
// we can disable this warning for this since it only
// causes undefined behavior when passed to the base class constructor
#ifdef _MSC_VER
#pragma warning(disable:4355)
@@ -2503,7 +2503,7 @@ void Player::SetGameMaster(bool on)
SetPhaseMask(phases.front()->GetMiscValue(), false);
else
SetPhaseMask(PHASEMASK_NORMAL, false);
m_ExtraFlags &= ~ PLAYER_EXTRA_GM_ON;
setFactionForRace(getRace());
@@ -19615,7 +19615,7 @@ inline bool Player::_StoreOrEquipNewItem(uint32 vendorslot, uint32 item, uint8 c
{
ItemPosCountVec vDest;
uint16 uiDest;
uint8 msg = bStore ?
uint8 msg = bStore ?
CanStoreNewItem(bag, slot, vDest, item, pProto->BuyCount * count) :
CanEquipNewItem(slot, uiDest, item, false);
if (msg != EQUIP_ERR_OK)
@@ -21556,7 +21556,7 @@ void Player::AutoUnequipOffhandIfNeed(bool force /*= false*/)
SQLTransaction trans = CharacterDatabase.BeginTransaction();
offItem->DeleteFromInventoryDB(trans); // deletes item from character's inventory
offItem->SaveToDB(trans); // recursive and not have transaction guard into self, item not in inventory and can be save standalone
std::string subject = GetSession()->GetTrinityString(LANG_NOT_EQUIPPED_ITEM);
MailDraft(subject, "There were problems with equipping one or several items").AddItem(offItem).SendMailTo(trans, this, MailSender(this, MAIL_STATIONERY_GM), MAIL_CHECK_MASK_COPIED);
@@ -23834,7 +23834,7 @@ void Player::UpdateSpecCount(uint8 count)
trans->PAppend("DELETE FROM character_action WHERE spec<>'%u' AND guid='%u'",m_activeSpec, GetGUIDLow());
m_activeSpec = 0;
}
CharacterDatabase.CommitTransaction(trans);
SetSpecsCount(count);
src/server/game/Entities/Player/Player.h
+1 -1
View File
@@ -2251,7 +2251,7 @@ class Player : public Unit, public GridObject<Player>
void RemoveAtLoginFlag(AtLoginFlags f, bool in_db_also = false);
// Dungeon Finder
bool isLfgDungeonDone(const uint32 entry) { return m_LookingForGroup.donerandomDungeons.find(entry) != m_LookingForGroup.donerandomDungeons.end(); }
bool isLfgDungeonDone(const uint32 entry) { return m_LookingForGroup.donerandomDungeons.find(entry) != m_LookingForGroup.donerandomDungeons.end(); }
LfgDungeonSet *GetLfgDungeons() { return &m_LookingForGroup.applyDungeons; }
LfgDungeonSet *GetLfgDungeonsDone() { return &m_LookingForGroup.donerandomDungeons; }
void SetLfgDungeonDone(const uint32 entry) { m_LookingForGroup.donerandomDungeons.insert(entry); }
src/server/game/Entities/Unit/StatSystem.cpp
+2 -2
View File
@@ -27,7 +27,7 @@
#include "SpellAuraEffects.h"
#include "SpellMgr.h"
inline bool _ModifyUInt32(bool apply, uint32& baseValue, int32& amount)
inline bool _ModifyUInt32(bool apply, uint32& baseValue, int32& amount)
{
// If amount is negative, change sign and value of apply.
if (amount < 0)
@@ -37,7 +37,7 @@ inline bool _ModifyUInt32(bool apply, uint32& baseValue, int32& amount)
}
if (apply)
baseValue += amount;
else
else
{
// Make sure we do not get uint32 overflow.
if (amount > int32(baseValue))
src/server/game/Entities/Unit/Unit.cpp
+4 -4
View File
@@ -93,14 +93,14 @@ static bool isAlwaysTriggeredAura[TOTAL_AURAS];
// Prepare lists
static bool procPrepared = InitTriggerAuraData();
// we can disable this warning for this since it only
// we can disable this warning for this since it only
// causes undefined behavior when passed to the base class constructor
#ifdef _MSC_VER
#pragma warning(disable:4355)
#endif
Unit::Unit(): WorldObject(),
m_movedPlayer(NULL), IsAIEnabled(false), NeedChangeAI(false),
m_ControlledByPlayer(false), i_AI(NULL), i_disabledAI(NULL), m_procDeep(0),
m_movedPlayer(NULL), IsAIEnabled(false), NeedChangeAI(false),
m_ControlledByPlayer(false), i_AI(NULL), i_disabledAI(NULL), m_procDeep(0),
m_removedAurasCount(0), m_vehicle(NULL), i_motionMaster(this), m_vehicleKit(NULL),
m_ThreatManager(this), m_unitTypeMask(UNIT_MASK_NONE), m_HostileRefManager(this)
{
@@ -6494,7 +6494,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
break;
}
// Priest T10 Healer 2P Bonus
case 70770:
case 70770:
// Flash Heal
if (procSpell->SpellFamilyFlags[0] & 0x800)
{
src/server/game/Globals/ObjectMgr.cpp
+3 -3
View File
@@ -124,7 +124,7 @@ std::string GetScriptCommandName(ScriptCommands command)
case SCRIPT_COMMAND_MODEL: res = "SCRIPT_COMMAND_MODEL"; break;
case SCRIPT_COMMAND_CLOSE_GOSSIP: res = "SCRIPT_COMMAND_CLOSE_GOSSIP"; break;
case SCRIPT_COMMAND_PLAYMOVIE: res = "SCRIPT_COMMAND_PLAYMOVIE"; break;
default:
default:
{
char sz[32];
sprintf(sz, "Unknown command: %u", command);
@@ -6996,7 +6996,7 @@ void ObjectMgr::LoadReputationSpilloverTemplate()
void ObjectMgr::LoadPointsOfInterest()
{
mPointsOfInterest.clear(); // need for reload case
uint32 count = 0;
// 0 1 2 3 4 5 6
@@ -7048,7 +7048,7 @@ void ObjectMgr::LoadPointsOfInterest()
void ObjectMgr::LoadQuestPOI()
{
mQuestPOIMap.clear(); // need for reload case
uint32 count = 0;
// 0 1 2 3
src/server/game/Globals/ObjectMgr.h
+1 -1
View File
@@ -845,7 +845,7 @@ class ObjectMgr
void DeleteCorpseCellData(uint32 mapid, uint32 cellid, uint32 player_guid);
time_t GetCreatureRespawnTime(uint32 loguid, uint32 instance)
{
{
ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, m_CreatureRespawnTimesMtx, 0);
return mCreatureRespawnTimes[MAKE_PAIR64(loguid,instance)];
}
src/server/game/Grids/NGrid.h
+1 -1
View File
@@ -35,7 +35,7 @@ class GridInfo
{
public:
GridInfo()
: i_timer(0), vis_Update(0, irand(0,DEFAULT_VISIBILITY_NOTIFY_PERIOD)),
: i_timer(0), vis_Update(0, irand(0,DEFAULT_VISIBILITY_NOTIFY_PERIOD)),
i_unloadActiveLockCount(0), i_unloadExplicitLock(false), i_unloadReferenceLock(false) {}
GridInfo(time_t expiry, bool unload = true )
: i_timer(expiry), vis_Update(0, irand(0,DEFAULT_VISIBILITY_NOTIFY_PERIOD)),
src/server/game/Maps/Map.cpp
+10 -10
View File
@@ -99,7 +99,7 @@ bool Map::ExistMap(uint32 mapid,int gx,int gy)
sLog.outError("Map file '%s' is from an incompatible clientversion. Please recreate using the mapextractor.",tmp);
else
ret = true;
}
}
}
delete [] tmp;
fclose(pf); //close file before return
@@ -1181,7 +1181,7 @@ bool GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 /*size*/)
{
map_heightHeader header;
fseek(in, offset, SEEK_SET);
if (fread(&header, sizeof(header), 1, in) != 1 || header.fourcc != uint32(MAP_HEIGHT_MAGIC))
return false;
@@ -1227,7 +1227,7 @@ bool GridMap::loadLiquidData(FILE *in, uint32 offset, uint32 /*size*/)
{
map_liquidHeader header;
fseek(in, offset, SEEK_SET);
if (fread(&header, sizeof(header), 1, in) != 1 || header.fourcc != uint32(MAP_LIQUID_MAGIC))
return false;
@@ -2812,7 +2812,7 @@ inline Unit* Map::_GetScriptUnit(Object* obj, bool isSource, const ScriptInfo* s
{
pUnit = dynamic_cast<Unit*>(obj);
if (!pUnit)
sLog.outError("%s %s object could not be casted to unit.",
sLog.outError("%s %s object could not be casted to unit.",
scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target");
}
return pUnit;
@@ -2852,7 +2852,7 @@ inline WorldObject* Map::_GetScriptWorldObject(Object* obj, bool isSource, const
{
WorldObject* pWorldObject = NULL;
if (!obj)
sLog.outError("%s %s object is NULL.",
sLog.outError("%s %s object is NULL.",
scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target");
else
{
@@ -3086,7 +3086,7 @@ void Map::ScriptsProcess()
// Validate field number.
if (step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= cSource->GetValuesCount())
sLog.outError("%s wrong field %u (max count: %u) in object (TypeId: %u, Entry: %u, GUID: %u) specified, skipping.",
step.script->GetDebugInfo().c_str(), step.script->datalong,
step.script->GetDebugInfo().c_str(), step.script->datalong,
cSource->GetValuesCount(), cSource->GetTypeId(), cSource->GetEntry(), cSource->GetGUIDLow());
else
cSource->SetUInt32Value(step.script->datalong, step.script->datalong2);
@@ -3109,7 +3109,7 @@ void Map::ScriptsProcess()
// Validate field number.
if (step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= cSource->GetValuesCount())
sLog.outError("%s wrong field %u (max count: %u) in object (TypeId: %u, Entry: %u, GUID: %u) specified, skipping.",
step.script->GetDebugInfo().c_str(), step.script->datalong,
step.script->GetDebugInfo().c_str(), step.script->datalong,
source->GetValuesCount(), source->GetTypeId(), source->GetEntry(), source->GetGUIDLow());
else
cSource->SetFlag(step.script->datalong, step.script->datalong2);
@@ -3123,7 +3123,7 @@ void Map::ScriptsProcess()
// Validate field number.
if (step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= cSource->GetValuesCount())
sLog.outError("%s wrong field %u (max count: %u) in object (TypeId: %u, Entry: %u, GUID: %u) specified, skipping.",
step.script->GetDebugInfo().c_str(), step.script->datalong,
step.script->GetDebugInfo().c_str(), step.script->datalong,
source->GetValuesCount(), source->GetTypeId(), source->GetEntry(), source->GetGUIDLow());
else
cSource->RemoveFlag(step.script->datalong, step.script->datalong2);
@@ -3251,7 +3251,7 @@ void Map::ScriptsProcess()
}
worldObject = dynamic_cast<WorldObject*>(source);
}
else
else
{
pTarget = source->ToPlayer();
if (pTarget)
@@ -3267,7 +3267,7 @@ void Map::ScriptsProcess()
else
{
sLog.outError("%s neither source nor target is player (source: TypeId: %u, Entry: %u, GUID: %u; target: TypeId: %u, Entry: %u, GUID: %u), skipping.",
step.script->GetDebugInfo().c_str(),
step.script->GetDebugInfo().c_str(),
source ? source->GetTypeId() : 0, source ? source->GetEntry() : 0, source ? source->GetGUIDLow() : 0,
target ? target->GetTypeId() : 0, target ? target->GetEntry() : 0, target ? target->GetGUIDLow() : 0);
break;
src/server/game/Maps/MapInstanced.cpp
+1 -1
View File
@@ -212,7 +212,7 @@ BattlegroundMap* MapInstanced::CreateBattleground(uint32 InstanceId, Battlegroun
PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),bg->GetMinLevel());
uint8 spawnMode;
if (bracketEntry)
spawnMode = bracketEntry->difficulty;
else
src/server/game/Reputation/ReputationMgr.h
+2 -2
View File
@@ -102,8 +102,8 @@ class ReputationMgr
ReputationRank GetBaseRank(FactionEntry const* factionEntry) const;
uint32 GetReputationRankStrIndex(FactionEntry const* factionEntry)
{
return ReputationRankStrIndex[GetRank(factionEntry)];
};
return ReputationRankStrIndex[GetRank(factionEntry)];
};
ReputationRank const* GetForcedRankIfAny(FactionTemplateEntry const* factionTemplateEntry) const
{
src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp
+2 -2
View File
@@ -361,7 +361,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data)
SendAuctionCommandResult(auction->Id, AUCTION_PLACE_BID, AUCTION_OK);
auction->DeleteFromDB(trans);
uint32 item_template = auction->item_template;
sAuctionMgr.RemoveAItem(auction->item_guidlow);
auctionHouse->RemoveAuction(auction, item_template);
@@ -438,7 +438,7 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data)
SendAuctionCommandResult(auction->Id, AUCTION_CANCEL, AUCTION_OK);
// Now remove the auction
pl->SaveInventoryAndGoldToDB(trans);
auction->DeleteFromDB(trans);
CharacterDatabase.CommitTransaction(trans);
src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
+1 -1
View File
@@ -1387,7 +1387,7 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recv_data)
SendPacket( &data );
return;
}
if (GetSecurity() == SEC_PLAYER)
{
uint32 raceMaskDisabled = sWorld.getIntConfig(CONFIG_CHARACTER_CREATING_DISABLED_RACEMASK);
src/server/game/Server/Protocol/Handlers/NPCHandler.cpp
+4 -4
View File
@@ -38,7 +38,7 @@
#include "Guild.h"
#include "ScriptMgr.h"
enum StableResultCode
enum StableResultCode
{
STABLE_ERR_MONEY = 0x01, // "you don't have enough money"
STABLE_ERR_STABLE = 0x06, // currently used in most fail cases
@@ -554,7 +554,7 @@ void WorldSession::SendStablePetCallback(QueryResult result, uint64 guid)
data << uint8(1); // 1 = current, 2/3 = in stable (any from 4,5,... create problems with proper show)
++num;
}
if (result)
{
do
@@ -618,7 +618,7 @@ void WorldSession::HandleStablePet(WorldPacket & recv_data)
m_stablePetCallback = CharacterDatabase.AsyncPQuery("SELECT owner,slot,id FROM character_pet WHERE owner = '%u' AND slot >= '%u' AND slot <= '%u' ORDER BY slot ",
_player->GetGUIDLow(),PET_SAVE_FIRST_STABLE_SLOT,PET_SAVE_LAST_STABLE_SLOT);
}
void WorldSession::HandleStablePetCallback(QueryResult result)
@@ -797,7 +797,7 @@ void WorldSession::HandleStableSwapPet(WorldPacket & recv_data)
}
// find swapped pet slot in stable
m_stableSwapCallback.SetParam(pet_number);
m_stableSwapCallback.SetParam(pet_number);
m_stableSwapCallback.SetFutureResult(
CharacterDatabase.PQuery("SELECT slot,entry FROM character_pet WHERE owner = '%u' AND id = '%u'",
_player->GetGUIDLow(), pet_number)
src/server/game/Server/Protocol/Handlers/PetHandler.cpp
+1 -1
View File
@@ -415,7 +415,7 @@ bool WorldSession::CheckStableMaster(uint64 guid)
if (guid == GetPlayer()->GetGUID())
{
if (!GetPlayer()->isGameMaster() && !GetPlayer()->HasAuraType(SPELL_AURA_OPEN_STABLE))
{
{
sLog.outStaticDebug("Player (GUID:%u) attempt open stable in cheating way.", GUID_LOPART(guid));
return false;
}
src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
+1 -1
View File
@@ -60,7 +60,7 @@ void WorldSession::SendNameQueryOpcode(Player *p)
void WorldSession::SendNameQueryOpcodeFromDB(uint64 guid)
{
ACE_Future<QueryResult> lFutureResult =
ACE_Future<QueryResult> lFutureResult =
CharacterDatabase.AsyncPQuery(
!sWorld.getBoolConfig(CONFIG_DECLINED_NAMES_USED) ?
// ------- Query Without Declined Names --------
src/server/game/Server/Protocol/Handlers/TicketHandler.cpp
+1 -1
View File
@@ -233,7 +233,7 @@ void WorldSession::HandleGMSurveySubmit(WorldPacket& recv_data)
ss << nextSurveyID << ", ";
ss << mainSurvey << ", ";
// sub_survey1, r1, comment1, sub_survey2, r2, comment2, sub_survey3, r3, comment3, sub_survey4, r4, comment4, sub_survey5, r5, comment5, sub_survey6, r6, comment6, sub_survey7, r7, comment7, sub_survey8, r8, comment8, sub_survey9, r9, comment9, sub_survey10, r10, comment10,
// sub_survey1, r1, comment1, sub_survey2, r2, comment2, sub_survey3, r3, comment3, sub_survey4, r4, comment4, sub_survey5, r5, comment5, sub_survey6, r6, comment6, sub_survey7, r7, comment7, sub_survey8, r8, comment8, sub_survey9, r9, comment9, sub_survey10, r10, comment10,
for (uint8 i = 0; i < 10; i++)
{
src/server/game/Server/WorldSession.cpp
+3 -3
View File
@@ -968,11 +968,11 @@ void WorldSession::ProcessQueryCallbacks()
ACE_Time_Value timeout = ACE_Time_Value::zero;
if (m_nameQueryCallbacks.next_readable(lResult, &timeout) != 1)
break;
lResult.get(result);
SendNameQueryOpcodeFromDBCallBack(result);
}
//! HandleCharEnumOpcode
if (m_charEnumCallback.ready())
{
@@ -1007,7 +1007,7 @@ void WorldSession::ProcessQueryCallbacks()
HandleChangePlayerNameOpcodeCallBack(result, param);
m_charRenameCallback.FreeResult();
}
//- HandleCharAddIgnoreOpcode
if (m_addIgnoreCallback.ready())
{
src/server/game/Server/WorldSession.h
+1 -1
View File
@@ -818,7 +818,7 @@ class WorldSession
private:
void ProcessQueryCallbacks();
ACE_Future_Set<QueryResult> m_nameQueryCallbacks;
ACE_Future_Set<QueryResult> m_nameQueryCallbacks;
QueryResultFuture m_charEnumCallback;
QueryResultFuture m_addIgnoreCallback;
QueryResultFuture m_stablePetCallback;
src/server/game/Spells/Auras/SpellAuraEffects.cpp
+3 -3
View File
@@ -376,7 +376,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]=
AuraEffect::AuraEffect(Aura * base, uint8 effIndex, int32 *baseAmount, Unit * caster):
m_base(base), m_spellProto(base->GetSpellProto()), m_effIndex(effIndex),
m_baseAmount(baseAmount ? *baseAmount : m_spellProto->EffectBasePoints[m_effIndex]),
m_canBeRecalculated(true), m_spellmod(NULL), m_isPeriodic(false),
m_canBeRecalculated(true), m_spellmod(NULL), m_isPeriodic(false),
m_periodicTimer(0), m_tickNumber(0)
{
CalculatePeriodic(caster, true);
@@ -2928,7 +2928,7 @@ void AuraEffect::HandlePhase(AuraApplication const * aurApp, uint8 mode, bool ap
else
target->SetPhaseMask(PHASEMASK_NORMAL, false);
}
if (apply)
target->ToPlayer()->GetSession()->SendSetPhaseShift(GetMiscValue());
else
@@ -4095,7 +4095,7 @@ void AuraEffect::HandleModPossessPet(AuraApplication const * aurApp, uint8 mode,
if (!pet->IsWithinDistInMap(caster, pet->GetMap()->GetVisibilityDistance()))
pet->Remove(PET_SAVE_NOT_IN_SLOT, true);
else
else
{
// Reinitialize the pet bar and make the pet come back to the owner
caster->ToPlayer()->PetSpellInitialize();
src/server/game/Spells/Spell.cpp
+1 -1
View File
@@ -4165,7 +4165,7 @@ void Spell::SendLogExecute()
data << uint32(m_spellInfo->Effect[i]); // spell effect
data.append(*m_effectExecuteData[i]);
delete m_effectExecuteData[i];
m_effectExecuteData[i] = NULL;
}
src/server/game/Spells/SpellScript.cpp
+1 -1
View File
@@ -280,7 +280,7 @@ Item * SpellScript::GetCastItem()
return m_spell->m_CastItem;
}
void SpellScript::CreateItem(uint32 effIndex, uint32 itemId)
void SpellScript::CreateItem(uint32 effIndex, uint32 itemId)
{
m_spell->DoCreateItem(effIndex, itemId);
}
src/server/game/Tickets/TicketMgr.cpp
+1 -1
View File
@@ -158,7 +158,7 @@ void TicketMgr::_AddOrUpdateGMTicket(GM_Ticket &ticket)
ss << (ticket.completed ? 1 : 0) << ", ";
ss << uint32(ticket.escalated) << ", ";
ss << (ticket.viewed ? 1 : 0) << ");";
SQLTransaction trans = CharacterDatabase.BeginTransaction();
trans->Append(ss.str().c_str());
CharacterDatabase.CommitTransaction(trans);
src/server/game/Tickets/TicketMgr.h
+3 -3
View File
@@ -47,9 +47,9 @@ enum GMTicketResponse
};
// from Blizzard LUA:
// GMTICKET_ASSIGNEDTOGM_STATUS_NOT_ASSIGNED = 0; -- ticket is not currently assigned to a gm
// GMTICKET_ASSIGNEDTOGM_STATUS_ASSIGNED = 1; -- ticket is assigned to a normal gm
// GMTICKET_ASSIGNEDTOGM_STATUS_ESCALATED = 2; -- ticket is in the escalation queue
// GMTICKET_ASSIGNEDTOGM_STATUS_NOT_ASSIGNED = 0; -- ticket is not currently assigned to a gm
// GMTICKET_ASSIGNEDTOGM_STATUS_ASSIGNED = 1; -- ticket is assigned to a normal gm
// GMTICKET_ASSIGNEDTOGM_STATUS_ESCALATED = 2; -- ticket is in the escalation queue
// 3 is a custom value and should never actually be sent
enum GMTicketEscalationStatus
{
src/server/game/World/World.cpp
+3 -3
View File
@@ -707,7 +707,7 @@ void World::LoadConfigSettings(bool reload)
m_int_configs[CONFIG_CHARACTER_CREATING_DISABLED] = sConfig.GetIntDefault("CharacterCreating.Disabled", 0);
m_int_configs[CONFIG_CHARACTER_CREATING_DISABLED_RACEMASK] = sConfig.GetIntDefault("CharacterCreating.Disabled.RaceMask", 0);
m_int_configs[CONFIG_CHARACTER_CREATING_DISABLED_CLASSMASK] = sConfig.GetIntDefault("CharacterCreating.Disabled.ClassMask", 0);
m_int_configs[CONFIG_CHARACTER_CREATING_DISABLED_CLASSMASK] = sConfig.GetIntDefault("CharacterCreating.Disabled.ClassMask", 0);
m_int_configs[CONFIG_CHARACTERS_PER_REALM] = sConfig.GetIntDefault("CharactersPerRealm", 10);
if (m_int_configs[CONFIG_CHARACTERS_PER_REALM] < 1 || m_int_configs[CONFIG_CHARACTERS_PER_REALM] > 10)
@@ -1233,7 +1233,7 @@ void World::SetInitialWorldSettings()
///- Initialize config settings
LoadConfigSettings();
///- Initialize Allowed Security Level
LoadDBAllowedSecurityLevel();
@@ -1248,7 +1248,7 @@ void World::SetInitialWorldSettings()
|| !MapManager::ExistMapAndVMap(1, 10311.3f, 832.463f)
|| !MapManager::ExistMapAndVMap(1,-2917.58f,-257.98f)
|| (m_int_configs[CONFIG_EXPANSION] && (
!MapManager::ExistMapAndVMap(530,10349.6f,-6357.29f) ||
!MapManager::ExistMapAndVMap(530,10349.6f,-6357.29f) ||
!MapManager::ExistMapAndVMap(530,-3961.64f,-13931.2f))))
{
sLog.outError("Correct *.map files not found in path '%smaps' or *.vmtree/*.vmtile files in '%svmaps'. Please place *.map/*.vmtree/*.vmtile files in appropriate directories or correct the DataDir value in the worldserver.conf file.",m_dataPath.c_str(),m_dataPath.c_str());