Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace is the root of all evil

Browse Source
This commit is contained in:
Nay
2012-08-03 22:39:04 +01:00
parent 3577afcfaf
commit 12307c7d06
23 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/authserver/Server/AuthSocket.cpp
View File

@@ -868,10 +868,10 @@ bool AuthSocket::_HandleRealmList()
++RealmListSize;
}
pkt << uint8(0x10);
pkt << uint8(0x00);
// make a ByteBuffer which stores the RealmList's size
ByteBuffer RealmListSizeBuffer;

2
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
View File

@@ -211,7 +211,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
sLog->outErrorDb("CreatureEventAI: Event %u has script for non-existing creature entry (%u), skipping.", i, creature_id);
continue;
}
// Only on the first script
if (cInfo->AIName != "EventAI" && m_CreatureEventAI_Event_Map[creature_id].empty())
sLog->outErrorDb("Creature entry %u has EventAI scripts, but its AIName is not 'EventAI' - possible AI-mismatch?", temp.creature_id);

2
src/server/game/Battlegrounds/BattlegroundMgr.cpp
View File

@@ -772,7 +772,7 @@ void BattlegroundMgr::CreateInitialBattlegrounds()
}
data.StartMaxDist = fields[9].GetFloat();
selectionWeight = fields[10].GetUInt8();
data.scriptId = sObjectMgr->GetScriptId(fields[11].GetCString());

2
src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
View File

@@ -245,6 +245,6 @@ void BattlegroundRV::TogglePillarCollision()
gob->SendUpdateToPlayer(player);
}
}
SetPillarCollision(!apply);
}

2
src/server/game/Chat/Chat.h
View File

@@ -123,7 +123,7 @@ class ChatHandler
void SetSentErrorMessage(bool val){ sentErrorMessage = val; }
static bool LoadCommandTable() { return load_command_table; }
static void SetLoadCommandTable(bool val) { load_command_table = val; }
// cs_character
void HandleCharacterLevel(Player* player, uint64 playerGuid, uint32 oldLevel, uint32 newLevel);

2
src/server/game/Entities/Creature/GossipDef.cpp
View File

@@ -339,7 +339,7 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, uint64 npcGUID,
data << uint32(quest->GetRequiredSpell()); // 4.x
quest->BuildExtraQuestInfo(data, _session->GetPlayer());
data << uint32(QUEST_EMOTE_COUNT);
for (uint8 i = 0; i < QUEST_EMOTE_COUNT; ++i)
{

6
src/server/game/Entities/Item/Item.cpp
View File

@@ -1435,7 +1435,7 @@ uint32 Item::GetTransmogrifyCost() const
{
bool normalPrice;
cost = GetSellPrice(normalPrice);
if (!normalPrice)
{
if (proto->BuyCount <= 1)
@@ -1452,9 +1452,9 @@ uint32 Item::GetTransmogrifyCost() const
else
cost = proto->SellPrice;
}
if (cost < 10000)
cost = 10000;
return cost;
}

8
src/server/game/Handlers/VoidStorageHandler.cpp
View File

@@ -161,7 +161,7 @@ void WorldSession::HandleVoidStorageQuery(WorldPacket& recvData)
itemData.WriteByteSeq(itemId[0]);
itemData.WriteByteSeq(itemId[6]);
itemData.WriteByteSeq(creatorGuid[0]);
itemData << uint32(item->ItemRandomPropertyId);
itemData.WriteByteSeq(itemId[4]);
@@ -196,7 +196,7 @@ void WorldSession::HandleVoidStorageTransfer(WorldPacket& recvData)
npcGuid[1] = recvData.ReadBit();
uint32 countDeposit = recvData.ReadBits(26);
if (countDeposit > 9)
{
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleVoidStorageTransfer - Player (GUID: %u, name: %s) wants to deposit more than 9 items (%u).", player->GetGUIDLow(), player->GetName(), countDeposit);
@@ -462,7 +462,7 @@ void WorldSession::HandleVoidStorageTransfer(WorldPacket& recvData)
data.WriteByteSeq(itemId[1]);
data << uint32(depositItems[i].second); // slot
data.WriteByteSeq(creatorGuid[2]);
data.WriteByteSeq(itemId[7]);
@@ -518,7 +518,7 @@ void WorldSession::HandleVoidSwapItem(WorldPacket& recvData)
recvData.ReadByteSeq(npcGuid[7]);
recvData.ReadByteSeq(npcGuid[4]);
recvData.ReadByteSeq(itemId[7]);
Creature* unit = player->GetNPCIfCanInteractWith(npcGuid, UNIT_NPC_FLAG_VAULTKEEPER);
if (!unit)
{

2
src/server/game/Miscellaneous/SharedDefines.h
View File

@@ -3530,7 +3530,7 @@ enum TradeStatus
// 28 - nonexistent
TRADE_STATUS_TARGET_STUNNED = 29,
// 30 - nonexistent
TRADE_STATUS_CLOSE_WINDOW = 31,
TRADE_STATUS_CLOSE_WINDOW = 31,
};
enum XPColorChar

2
src/server/game/Scripting/ScriptSystem.cpp
View File

@@ -30,7 +30,7 @@ void SystemMgr::LoadScriptTexts()
sLog->outString("TSCR: Loading Script Texts additional data...");
uint32 oldMSTime = getMSTime();
// 0 1 2 3
QueryResult result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM script_texts");

2
src/server/game/Server/Protocol/Opcodes.cpp
View File

@@ -1098,7 +1098,7 @@ void InitOpcodes()
//DEFINE_OPCODE_HANDLER(SMSG_LOTTERY_RESULT_OBSOLETE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_MAIL_LIST_RESULT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_MEETINGSTONE_MEMBER_ADDED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_MEETINGSTONE_SETQUEUE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_MEETINGSTONE_SETQUEUE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_MESSAGECHAT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_MINIGAME_MOVE_FAILED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_MINIGAME_SETUP, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );

2
src/server/scripts/Commands/cs_cast.cpp
View File

@@ -33,7 +33,7 @@ public:
ChatCommand* GetCommands() const
{
static ChatCommand castCommandTable[] =
{
{
{ "back", SEC_ADMINISTRATOR, false, &HandleCastBackCommand, "", NULL },
{ "dist", SEC_ADMINISTRATOR, false, &HandleCastDistCommand, "", NULL },
{ "self", SEC_ADMINISTRATOR, false, &HandleCastSelfCommand, "", NULL },

2
src/server/scripts/Commands/cs_guild.cpp
View File

@@ -51,7 +51,7 @@ public:
};
return commandTable;
}
/** \brief GM command level 3 - Create a guild.
*
* This command allows a GM (level 3) to create a guild.

20
src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
View File

@@ -218,25 +218,25 @@ public:
{
switch (identifier)
{
case DATA_SELIN:
case DATA_SELIN:
return SelinGUID;
case DATA_DELRISSA:
case DATA_DELRISSA:
return DelrissaGUID;
case DATA_VEXALLUS_DOOR:
case DATA_VEXALLUS_DOOR:
return VexallusDoorGUID;
case DATA_SELIN_DOOR:
case DATA_SELIN_DOOR:
return SelinDoorGUID;
case DATA_SELIN_ENCOUNTER_DOOR:
case DATA_SELIN_ENCOUNTER_DOOR:
return SelinEncounterDoorGUID;
case DATA_DELRISSA_DOOR:
case DATA_DELRISSA_DOOR:
return DelrissaDoorGUID;
case DATA_KAEL_DOOR:
case DATA_KAEL_DOOR:
return KaelDoorGUID;
case DATA_KAEL_STATUE_LEFT:
case DATA_KAEL_STATUE_LEFT:
return KaelStatue[0];
case DATA_KAEL_STATUE_RIGHT:
case DATA_KAEL_STATUE_RIGHT:
return KaelStatue[1];
case DATA_ESCAPE_ORB:
case DATA_ESCAPE_ORB:
return EscapeOrbGUID;
case DATA_FEL_CRYSTAL:

10
src/server/scripts/EasternKingdoms/undercity.cpp
View File

@@ -173,13 +173,13 @@ public:
if (me->GetDistance(victim) > 10.0f)
DoCast(victim, SPELL_MULTI_SHOT);
} else FadeTimer -= diff;
if (SummonSkeletonTimer <= diff)
{
DoCast(me, SPELL_SUMMON_SKELETON);
SummonSkeletonTimer = 20000 + rand()%10000;
} else SummonSkeletonTimer -= diff;
if (BlackArrowTimer <= diff)
{
if (Unit* victim = me->getVictim())
@@ -188,7 +188,7 @@ public:
BlackArrowTimer = 15000 + rand()%5000;
}
} else BlackArrowTimer -= diff;
if (ShotTimer <= diff)
{
if (Unit* victim = me->getVictim())
@@ -197,7 +197,7 @@ public:
ShotTimer = 8000 + rand()%2000;
}
} else ShotTimer -= diff;
if (MultiShotTimer <= diff)
{
if (Unit* victim = me->getVictim())
@@ -205,7 +205,7 @@ public:
DoCast(victim, SPELL_MULTI_SHOT);
MultiShotTimer = 10000 + rand()%3000;
}
} else MultiShotTimer -= diff;
} else MultiShotTimer -= diff;
DoMeleeAttackIfReady();
}

2
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
View File

@@ -38,7 +38,7 @@ enum Spells
SPELL_BANSHEE_CURSE = 31651,
SPELL_BANSHEE_WAIL = 38183,
SPELL_ANTI_MAGIC_SHELL = 31662,
SPELL_WEB = 28991,
SPELL_WEB = 28991,
SPELL_MANA_BURN = 31729,
SPELL_FROST_BREATH = 31688,
SPELL_GARGOYLE_STRIKE = 31664,

2
src/server/scripts/Kalimdor/ashenvale.cpp
View File

@@ -174,7 +174,7 @@ enum RuulSnowhoof
NPC_THISTLEFUR_URSA = 3921,
NPC_THISTLEFUR_TOTEMIC = 3922,
NPC_THISTLEFUR_PATHFINDER = 3926,
QUEST_FREEDOM_TO_RUUL = 6482,
GO_CAGE = 178147

6
src/server/scripts/Kalimdor/azshara.cpp
View File

@@ -182,9 +182,9 @@ public:
enum RizzleSprysprocketData
{
QUEST_CHASING_THE_MOONSTONE = 10994,
MOB_DEPTH_CHARGE = 23025,
SPELL_RIZZLE_BLACKJACK = 39865,
SPELL_RIZZLE_ESCAPE = 39871,
SPELL_RIZZLE_FROST_GRENADE = 40525,
@@ -490,7 +490,7 @@ public:
{
if (WeMustDieTimer <= diff)
me->DespawnOrUnsummon();
else
else
WeMustDieTimer -= diff;
}
return;

4
src/server/scripts/Kalimdor/azuremyst_isle.cpp
View File

@@ -549,7 +549,7 @@ public:
(*itr)->Respawn();
}
}
else
else
sLog->outError("SD2 ERROR: FlagList is empty!");
}
@@ -560,7 +560,7 @@ public:
if (EventStarted)
SayTimer = NextStep(Step++);
}
else
else
SayTimer -= diff;
}
};

4
src/server/scripts/Kalimdor/felwood.cpp
View File

@@ -40,10 +40,10 @@ EndContentData */
enum RiverbreezeAndSilversky
{
SPELL_CENARION_BEACON = 15120,
NPC_ARATHANDRIS_SILVERSKY = 9528,
NPC_MAYBESS_RIVERBREEZE = 9529,
QUEST_CLEASING_FELWOOD_A = 4101,
QUEST_CLEASING_FELWOOD_H = 4102
};

4
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
View File

@@ -199,7 +199,7 @@ public:
JustCreated = false;
} else CanAttack = true;
for (uint8 i = 0; i < 4; ++i)
if (Unit* remo = Unit::GetUnit(*me, ShieldGeneratorChannel[i]))
remo->setDeathState(JUST_DIED);
@@ -353,7 +353,7 @@ public:
// Static Charge
// Used on random people (only 1 person at any given time) in Phases 1 and 3, it's a debuff doing 2775 to 3225 Nature damage to the target and everybody in about 5 yards around it, every 1 seconds for 30 seconds. It can be removed by Cloak of Shadows, Iceblock, Divine Shield, etc, but not by Cleanse or Dispel Magic.
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true);
if (target && !target->HasAura(SPELL_STATIC_CHARGE_TRIGGER))
if (target && !target->HasAura(SPELL_STATIC_CHARGE_TRIGGER))
DoCast(target, SPELL_STATIC_CHARGE_TRIGGER); // cast Static Charge every 2 seconds for 20 seconds
StaticChargeTimer = 10000+rand()%20000;

2
src/server/shared/AutoPtr.h
View File

@@ -27,7 +27,7 @@ namespace Trinity
{
public:
AutoPtr() : ACE_Strong_Bound_Ptr<Pointer, Lock>() {}
AutoPtr(Pointer* x)
{
ACE_Strong_Bound_Ptr<Pointer, Lock>::reset(x);

8
src/server/worldserver/worldserver.conf.dist
View File

@@ -1490,7 +1490,7 @@ Warden.ClientCheckHoldOff = 30
#
# Warden.ClientCheckFailAction
# Description: Default action being taken if a client check failed. Actions can be
# overwritten for each single check via warden_action table in characters
# overwritten for each single check via warden_action table in characters
# database.
# Default: 0 - (Disabled, Logging only)
# 1 - (Kick)
@@ -2253,9 +2253,9 @@ Rate.MoveSpeed = 1
#
# Rate.InstanceResetTime
# Description: Multiplier for the rate between global raid/heroic instance resets
# (dbc value). Higher value increases the time between resets,
# lower value lowers the time, you need clean instance_reset in
# Description: Multiplier for the rate between global raid/heroic instance resets
# (dbc value). Higher value increases the time between resets,
# lower value lowers the time, you need clean instance_reset in
# characters db in order to let new values work.
# Default: 1