Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Core/Misc: Some changes to minimize differences with 4.3.4 branch

  • Loading branch information...
commit 8cd408ae6cb2a7f9eb84c9e2a57fc65a15ce6faf 1 parent c4e4cb1
@Spp- Spp- authored
View
4 src/server/game/Chat/Channels/Channel.h
@@ -49,8 +49,8 @@ enum ChatNotify
CHAT_MODE_CHANGE_NOTICE = 0x0C, //?
CHAT_ANNOUNCEMENTS_ON_NOTICE = 0x0D, //+ "[%s] Channel announcements enabled by %s.";
CHAT_ANNOUNCEMENTS_OFF_NOTICE = 0x0E, //+ "[%s] Channel announcements disabled by %s.";
- // CHAT_MODERATION_ON_NOTICE = 0x0F, //+ "[%s] Channel moderation enabled by %s.";
- // CHAT_MODERATION_OFF_NOTICE = 0x10, //+ "[%s] Channel moderation disabled by %s.";
+ CHAT_MODERATION_ON_NOTICE = 0x0F, //+ "[%s] Channel moderation enabled by %s.";
+ CHAT_MODERATION_OFF_NOTICE = 0x10, //+ "[%s] Channel moderation disabled by %s.";
CHAT_MUTED_NOTICE = 0x11, //+ "[%s] You do not have permission to speak.";
CHAT_PLAYER_KICKED_NOTICE = 0x12, //? "[%s] Player %s kicked by %s.";
CHAT_BANNED_NOTICE = 0x13, //+ "[%s] You are bannedStore from that channel.";
View
2  src/server/game/Conditions/ConditionMgr.cpp
@@ -777,7 +777,7 @@ void ConditionMgr::LoadConditions(bool isReload)
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 conditions. DB table `conditions` is empty!");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 conditions. DB table `conditions` is empty!");
return;
}
View
2  src/server/game/DungeonFinding/LFGMgr.cpp
@@ -282,7 +282,7 @@ void LFGMgr::LoadLFGDungeons(bool reload /* = false */)
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 lfg entrance positions. DB table `lfg_entrances` is empty!");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 lfg entrance positions. DB table `lfg_entrances` is empty!");
return;
}
View
2  src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
@@ -74,7 +74,7 @@ void LoadRandomEnchantmentsTable()
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u Item Enchantment definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
else
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 Item Enchantment definitions. DB table `item_enchantment_template` is empty.");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 Item Enchantment definitions. DB table `item_enchantment_template` is empty.");
}
uint32 GetItemEnchantMod(int32 entry)
View
6 src/server/game/Entities/Transport/Transport.cpp
@@ -680,9 +680,9 @@ uint32 Transport::AddNPCPassenger(uint32 tguid, uint32 entry, float x, float y,
void Transport::UpdatePosition(MovementInfo* mi)
{
- float transport_o = mi->pos.m_orientation - mi->t_pos.m_orientation;
- float transport_x = mi->pos.m_positionX - (mi->t_pos.m_positionX * std::cos(transport_o) - mi->t_pos.m_positionY* std::sin(transport_o));
- float transport_y = mi->pos.m_positionY - (mi->t_pos.m_positionY * std::cos(transport_o) + mi->t_pos.m_positionX* std::sin(transport_o));
+ float transport_o = mi->pos.GetOrientation() - mi->t_pos.GetOrientation();
+ float transport_x = mi->pos.m_positionX - (mi->t_pos.m_positionX * std::cos(transport_o) - mi->t_pos.m_positionY * std::sin(transport_o));
+ float transport_y = mi->pos.m_positionY - (mi->t_pos.m_positionY * std::cos(transport_o) + mi->t_pos.m_positionX * std::sin(transport_o));
float transport_z = mi->pos.m_positionZ - mi->t_pos.m_positionZ;
Relocate(transport_x, transport_y, transport_z, transport_o);
View
7 src/server/game/Entities/Unit/StatSystem.cpp
@@ -229,8 +229,7 @@ void Player::UpdateArmor()
float Player::GetHealthBonusFromStamina()
{
float stamina = GetStat(STAT_STAMINA);
-
- float baseStam = stamina < 20 ? stamina : 20;
+ float baseStam = std::min(20.0f, stamina);
float moreStam = stamina - baseStam;
return baseStam + (moreStam*10.0f);
@@ -240,10 +239,10 @@ float Player::GetManaBonusFromIntellect()
{
float intellect = GetStat(STAT_INTELLECT);
- float baseInt = intellect < 20 ? intellect : 20;
+ float baseInt = std::min(20.0f, intellect);
float moreInt = intellect - baseInt;
- return baseInt + (moreInt*15.0f);
+ return baseInt + (moreInt * 15.0f);
}
void Player::UpdateMaxHealth()
View
2  src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -380,7 +380,7 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId)
if (_me->IsInWorld())
{
unit->SendClearTarget(); // SMSG_BREAK_TARGET
- unit->SetControlled(true, UNIT_STATE_ROOT); // SMSG_FORCE_ROOT - In some cases we send SMSG_SPLINE_MOVE_ROOT here (for creatures)
+ unit->SetControlled(true, UNIT_STATE_ROOT); // SMSG_FORCE_ROOT - In some cases we send SMSG_SPLINE_MOVE_ROOT here (for creatures)
// also adds MOVEMENTFLAG_ROOT
Movement::MoveSplineInit init(unit);
init.DisableTransportPathTransformations();
View
3  src/server/game/Events/GameEventMgr.cpp
@@ -210,8 +210,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
mGameEvent.clear();
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 game events. DB table `game_event` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 game events. DB table `game_event` is empty.");
return;
}
View
81 src/server/game/Globals/ObjectMgr.cpp
@@ -1189,8 +1189,7 @@ void ObjectMgr::LoadLinkedRespawn()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 linked respawns. DB table `linked_respawn` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 linked respawns. DB table `linked_respawn` is empty.");
return;
}
@@ -1420,8 +1419,7 @@ void ObjectMgr::LoadCreatures()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 creatures. DB table `creature` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 creatures. DB table `creature` is empty.");
return;
}
@@ -1729,7 +1727,7 @@ void ObjectMgr::LoadGameobjects()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 gameobjects. DB table `gameobject` is empty.");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 gameobjects. DB table `gameobject` is empty.");
return;
}
@@ -2754,8 +2752,7 @@ void ObjectMgr::LoadVehicleTemplateAccessories()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 vehicle template accessories. DB table `vehicle_template_accessory` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 vehicle template accessories. DB table `vehicle_template_accessory` is empty.");
return;
}
@@ -2849,8 +2846,7 @@ void ObjectMgr::LoadPetLevelInfo()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 level pet stats definitions. DB table `pet_levelstats` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 level pet stats definitions. DB table `pet_levelstats` is empty.");
return;
}
@@ -2988,8 +2984,7 @@ void ObjectMgr::LoadPlayerInfo()
if (!result)
{
-
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 player create definitions. DB table `playercreateinfo` is empty.");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 player create definitions. DB table `playercreateinfo` is empty.");
exit(1);
}
else
@@ -3146,8 +3141,7 @@ void ObjectMgr::LoadPlayerInfo()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 player create spells. DB table `%s` is empty.", sWorld->getBoolConfig(CONFIG_START_ALL_SPELLS) ? "playercreateinfo_spell_custom" : "playercreateinfo_spell");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 player create spells. DB table `%s` is empty.", sWorld->getBoolConfig(CONFIG_START_ALL_SPELLS) ? "playercreateinfo_spell_custom" : "playercreateinfo_spell");
}
else
{
@@ -3208,8 +3202,7 @@ void ObjectMgr::LoadPlayerInfo()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 player create actions. DB table `playercreateinfo_action` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 player create actions. DB table `playercreateinfo_action` is empty.");
}
else
{
@@ -3254,7 +3247,7 @@ void ObjectMgr::LoadPlayerInfo()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 level health/mana definitions. DB table `game_event_condition` is empty.");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 level health/mana definitions. DB table `game_event_condition` is empty.");
exit(1);
}
@@ -3336,8 +3329,7 @@ void ObjectMgr::LoadPlayerInfo()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 level stats definitions. DB table `player_levelstats` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 level stats definitions. DB table `player_levelstats` is empty.");
exit(1);
}
@@ -3449,8 +3441,7 @@ void ObjectMgr::LoadPlayerInfo()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 xp for level definitions. DB table `player_xp_for_level` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 xp for level definitions. DB table `player_xp_for_level` is empty.");
exit(1);
}
@@ -3647,7 +3638,7 @@ void ObjectMgr::LoadQuests()
" FROM quest_template");
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 quests definitions. DB table `quest_template` is empty.");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 quests definitions. DB table `quest_template` is empty.");
return;
}
@@ -4999,8 +4990,7 @@ void ObjectMgr::LoadInstanceEncounters()
QueryResult result = WorldDatabase.Query("SELECT entry, creditType, creditEntry, lastEncounterDungeon FROM instance_encounters");
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 instance encounters, table is empty!");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 instance encounters, table is empty!");
return;
}
@@ -6453,8 +6443,7 @@ void ObjectMgr::LoadExplorationBaseXP()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 BaseXP definitions. DB table `exploration_basexp` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 BaseXP definitions. DB table `exploration_basexp` is empty.");
return;
}
@@ -6601,7 +6590,7 @@ void ObjectMgr::LoadReputationRewardRate()
QueryResult result = WorldDatabase.Query("SELECT faction, quest_rate, quest_daily_rate, quest_weekly_rate, quest_monthly_rate, creature_rate, spell_rate FROM reputation_reward_rate");
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded `reputation_reward_rate`, table is empty!");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded `reputation_reward_rate`, table is empty!");
return;
}
@@ -6689,8 +6678,7 @@ void ObjectMgr::LoadReputationOnKill()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 creature award reputation definitions. DB table `creature_onkill_reputation` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 creature award reputation definitions. DB table `creature_onkill_reputation` is empty.");
return;
}
@@ -6868,8 +6856,7 @@ void ObjectMgr::LoadPointsOfInterest()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 Points of Interest definitions. DB table `points_of_interest` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 Points of Interest definitions. DB table `points_of_interest` is empty.");
return;
}
@@ -6914,8 +6901,7 @@ void ObjectMgr::LoadQuestPOI()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 quest POI definitions. DB table `quest_poi` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 quest POI definitions. DB table `quest_poi` is empty.");
return;
}
@@ -6982,8 +6968,7 @@ void ObjectMgr::LoadNPCSpellClickSpells()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 spellclick spells. DB table `npc_spellclick_spells` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 spellclick spells. DB table `npc_spellclick_spells` is empty.");
return;
}
@@ -7085,7 +7070,7 @@ void ObjectMgr::LoadQuestRelationsHelper(QuestRelations& map, std::string const&
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 quest relations from `%s`, table is empty.", table.c_str());
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 quest relations from `%s`, table is empty.", table.c_str());
return;
}
@@ -7460,7 +7445,7 @@ bool ObjectMgr::LoadTrinityStrings(const char* table, int32 min_value, int32 max
if (!result)
{
if (min_value == MIN_TRINITY_STRING_ID) // error only in case internal strings
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 trinity strings. DB table `%s` is empty. Cannot continue.", table);
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 trinity strings. DB table `%s` is empty. Cannot continue.", table);
else
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 string templates. DB table `%s` is empty.", table);
@@ -7536,8 +7521,7 @@ void ObjectMgr::LoadFishingBaseSkillLevel()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 areas for fishing base skill level. DB table `skill_fishing_base_level` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 areas for fishing base skill level. DB table `skill_fishing_base_level` is empty.");
return;
}
@@ -7665,8 +7649,7 @@ void ObjectMgr::LoadGameTele()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 GameTeleports. DB table `game_tele` is empty!");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 GameTeleports. DB table `game_tele` is empty!");
return;
}
@@ -7805,8 +7788,7 @@ void ObjectMgr::LoadMailLevelRewards()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 level dependent mail rewards. DB table `mail_level_reward` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 level dependent mail rewards. DB table `mail_level_reward` is empty.");
return;
}
@@ -8072,8 +8054,7 @@ void ObjectMgr::LoadGossipMenu()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 gossip_menu entries. DB table `gossip_menu` is empty!");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 gossip_menu entries. DB table `gossip_menu` is empty!");
return;
}
@@ -8118,8 +8099,7 @@ void ObjectMgr::LoadGossipMenuItems()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 gossip_menu_option entries. DB table `gossip_menu_option` is empty!");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 gossip_menu_option entries. DB table `gossip_menu_option` is empty!");
return;
}
@@ -8326,8 +8306,7 @@ void ObjectMgr::LoadScriptNames()
if (!result)
{
-
- sLog->outError(LOG_FILTER_SQL, ">> Loaded empty set of Script Names!");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded empty set of Script Names!");
return;
}
@@ -8503,8 +8482,7 @@ void ObjectMgr::LoadFactionChangeAchievements()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 faction change achievement pairs. DB table `player_factionchange_achievement` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 faction change achievement pairs. DB table `player_factionchange_achievement` is empty.");
return;
}
@@ -8574,8 +8552,7 @@ void ObjectMgr::LoadFactionChangeSpells()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 faction change spell pairs. DB table `player_factionchange_spells` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 faction change spell pairs. DB table `player_factionchange_spells` is empty.");
return;
}
View
4 src/server/game/Handlers/LootHandler.cpp
@@ -99,7 +99,7 @@ void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket& recvData)
player->GetSession()->DoLootRelease(lguid);
}
-void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recvData*/)
+void WorldSession::HandleLootMoneyOpcode(WorldPacket& /*recvData*/)
{
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_LOOT_MONEY");
@@ -188,7 +188,7 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recvData*/)
WorldPacket data(SMSG_LOOT_MONEY_NOTIFY, 4 + 1);
data << uint32(goldPerPlayer);
- data << uint8(playersNear.size() > 1 ? 0 : 1); // Controls the text displayed in chat. 0 is "Your share is..." and 1 is "You loot..."
+ data << uint8(playersNear.size() <= 1); // Controls the text displayed in chat. 0 is "Your share is..." and 1 is "You loot..."
(*i)->GetSession()->SendPacket(&data);
}
}
View
26 src/server/game/Loot/LootMgr.cpp
@@ -1206,14 +1206,10 @@ void LootTemplate::LootGroup::Verify(LootStore const& lootstore, uint32 id, uint
{
float chance = RawTotalChance();
if (chance > 101.0f) // TODO: replace with 100% when DBs will be ready
- {
sLog->outError(LOG_FILTER_SQL, "Table '%s' entry %u group %d has total chance > 100%% (%f)", lootstore.GetName(), id, group_id, chance);
- }
if (chance >= 100.0f && !EqualChanced.empty())
- {
sLog->outError(LOG_FILTER_SQL, "Table '%s' entry %u group %d has items with chance=0%% but group total chance >= 100%% (%f)", lootstore.GetName(), id, group_id, chance);
- }
}
void LootTemplate::LootGroup::CheckLootRefs(LootTemplateMap const& /*store*/, LootIdSet* ref_set) const
@@ -1521,7 +1517,7 @@ void LoadLootTemplates_Creature()
if (count)
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u creature loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
else
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 creature loot templates. DB table `creature_loot_template` is empty");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 creature loot templates. DB table `creature_loot_template` is empty");
}
void LoadLootTemplates_Disenchant()
@@ -1554,7 +1550,7 @@ void LoadLootTemplates_Disenchant()
if (count)
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u disenchanting loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
else
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 disenchanting loot templates. DB table `disenchant_loot_template` is empty");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 disenchanting loot templates. DB table `disenchant_loot_template` is empty");
}
void LoadLootTemplates_Fishing()
@@ -1578,7 +1574,7 @@ void LoadLootTemplates_Fishing()
if (count)
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u fishing loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
else
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 fishing loot templates. DB table `fishing_loot_template` is empty");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 fishing loot templates. DB table `fishing_loot_template` is empty");
}
void LoadLootTemplates_Gameobject()
@@ -1612,7 +1608,7 @@ void LoadLootTemplates_Gameobject()
if (count)
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u gameobject loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
else
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 gameobject loot templates. DB table `gameobject_loot_template` is empty");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 gameobject loot templates. DB table `gameobject_loot_template` is empty");
}
void LoadLootTemplates_Item()
@@ -1636,7 +1632,7 @@ void LoadLootTemplates_Item()
if (count)
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u item loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
else
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 item loot templates. DB table `item_loot_template` is empty");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 item loot templates. DB table `item_loot_template` is empty");
}
void LoadLootTemplates_Milling()
@@ -1665,7 +1661,7 @@ void LoadLootTemplates_Milling()
if (count)
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u milling loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
else
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 milling loot templates. DB table `milling_loot_template` is empty");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 milling loot templates. DB table `milling_loot_template` is empty");
}
void LoadLootTemplates_Pickpocketing()
@@ -1699,7 +1695,7 @@ void LoadLootTemplates_Pickpocketing()
if (count)
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u pickpocketing loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
else
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 pickpocketing loot templates. DB table `pickpocketing_loot_template` is empty");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 pickpocketing loot templates. DB table `pickpocketing_loot_template` is empty");
}
void LoadLootTemplates_Prospecting()
@@ -1728,7 +1724,7 @@ void LoadLootTemplates_Prospecting()
if (count)
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u prospecting loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
else
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 prospecting loot templates. DB table `prospecting_loot_template` is empty");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 prospecting loot templates. DB table `prospecting_loot_template` is empty");
}
void LoadLootTemplates_Mail()
@@ -1752,7 +1748,7 @@ void LoadLootTemplates_Mail()
if (count)
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u mail loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
else
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 mail loot templates. DB table `mail_loot_template` is empty");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 mail loot templates. DB table `mail_loot_template` is empty");
}
void LoadLootTemplates_Skinning()
@@ -1786,7 +1782,7 @@ void LoadLootTemplates_Skinning()
if (count)
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u skinning loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
else
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 skinning loot templates. DB table `skinning_loot_template` is empty");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 skinning loot templates. DB table `skinning_loot_template` is empty");
}
void LoadLootTemplates_Spell()
@@ -1828,7 +1824,7 @@ void LoadLootTemplates_Spell()
if (count)
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u spell loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
else
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 spell loot templates. DB table `spell_loot_template` is empty");
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 spell loot templates. DB table `spell_loot_template` is empty");
}
void LoadLootTemplates_Reference()
View
7 src/server/game/Miscellaneous/Formulas.h
@@ -39,7 +39,8 @@ namespace Trinity
{
return uint32(ceil(hk_honor_at_level_f(level, multiplier)));
}
- }
+ } // namespace Trinity::Honor
+
namespace XP
{
inline uint8 GetGrayLevel(uint8 pl_level)
@@ -219,7 +220,7 @@ namespace Trinity
sScriptMgr->OnGroupRateCalculation(rate, count, isRaid);
return rate;
}
- }
-}
+ } // namespace Trinity::XP
+} // namespace Trinity
#endif
View
226 src/server/game/Miscellaneous/SharedDefines.h
@@ -3162,119 +3162,119 @@ enum EventId
enum ResponseCodes
{
- RESPONSE_SUCCESS = 0x00,
- RESPONSE_FAILURE = 0x01,
- RESPONSE_CANCELLED = 0x02,
- RESPONSE_DISCONNECTED = 0x03,
- RESPONSE_FAILED_TO_CONNECT = 0x04,
- RESPONSE_CONNECTED = 0x05,
- RESPONSE_VERSION_MISMATCH = 0x06,
-
- CSTATUS_CONNECTING = 0x07,
- CSTATUS_NEGOTIATING_SECURITY = 0x08,
- CSTATUS_NEGOTIATION_COMPLETE = 0x09,
- CSTATUS_NEGOTIATION_FAILED = 0x0A,
- CSTATUS_AUTHENTICATING = 0x0B,
-
- AUTH_OK = 0x0C,
- AUTH_FAILED = 0x0D,
- AUTH_REJECT = 0x0E,
- AUTH_BAD_SERVER_PROOF = 0x0F,
- AUTH_UNAVAILABLE = 0x10,
- AUTH_SYSTEM_ERROR = 0x11,
- AUTH_BILLING_ERROR = 0x12,
- AUTH_BILLING_EXPIRED = 0x13,
- AUTH_VERSION_MISMATCH = 0x14,
- AUTH_UNKNOWN_ACCOUNT = 0x15,
- AUTH_INCORRECT_PASSWORD = 0x16,
- AUTH_SESSION_EXPIRED = 0x17,
- AUTH_SERVER_SHUTTING_DOWN = 0x18,
- AUTH_ALREADY_LOGGING_IN = 0x19,
- AUTH_LOGIN_SERVER_NOT_FOUND = 0x1A,
- AUTH_WAIT_QUEUE = 0x1B,
- AUTH_BANNED = 0x1C,
- AUTH_ALREADY_ONLINE = 0x1D,
- AUTH_NO_TIME = 0x1E,
- AUTH_DB_BUSY = 0x1F,
- AUTH_SUSPENDED = 0x20,
- AUTH_PARENTAL_CONTROL = 0x21,
- AUTH_LOCKED_ENFORCED = 0x22,
-
- REALM_LIST_IN_PROGRESS = 0x23,
- REALM_LIST_SUCCESS = 0x24,
- REALM_LIST_FAILED = 0x25,
- REALM_LIST_INVALID = 0x26,
- REALM_LIST_REALM_NOT_FOUND = 0x27,
-
- ACCOUNT_CREATE_IN_PROGRESS = 0x28,
- ACCOUNT_CREATE_SUCCESS = 0x29,
- ACCOUNT_CREATE_FAILED = 0x2A,
-
- CHAR_LIST_RETRIEVING = 0x2B,
- CHAR_LIST_RETRIEVED = 0x2C,
- CHAR_LIST_FAILED = 0x2D,
-
- CHAR_CREATE_IN_PROGRESS = 0x2E,
- CHAR_CREATE_SUCCESS = 0x2F,
- CHAR_CREATE_ERROR = 0x30,
- CHAR_CREATE_FAILED = 0x31,
- CHAR_CREATE_NAME_IN_USE = 0x32,
- CHAR_CREATE_DISABLED = 0x33,
- CHAR_CREATE_PVP_TEAMS_VIOLATION = 0x34,
- CHAR_CREATE_SERVER_LIMIT = 0x35,
- CHAR_CREATE_ACCOUNT_LIMIT = 0x36,
- CHAR_CREATE_SERVER_QUEUE = 0x37,
- CHAR_CREATE_ONLY_EXISTING = 0x38,
- CHAR_CREATE_EXPANSION = 0x39,
- CHAR_CREATE_EXPANSION_CLASS = 0x3A,
- CHAR_CREATE_LEVEL_REQUIREMENT = 0x3B,
- CHAR_CREATE_UNIQUE_CLASS_LIMIT = 0x3C,
- CHAR_CREATE_CHARACTER_IN_GUILD = 0x3D,
- CHAR_CREATE_RESTRICTED_RACECLASS = 0x3E,
- CHAR_CREATE_CHARACTER_CHOOSE_RACE = 0x3F,
- CHAR_CREATE_CHARACTER_ARENA_LEADER = 0x40,
- CHAR_CREATE_CHARACTER_DELETE_MAIL = 0x41,
- CHAR_CREATE_CHARACTER_SWAP_FACTION = 0x42,
- CHAR_CREATE_CHARACTER_RACE_ONLY = 0x43,
- CHAR_CREATE_CHARACTER_GOLD_LIMIT = 0x44,
- CHAR_CREATE_FORCE_LOGIN = 0x45,
-
- CHAR_DELETE_IN_PROGRESS = 0x46,
- CHAR_DELETE_SUCCESS = 0x47,
- CHAR_DELETE_FAILED = 0x48,
- CHAR_DELETE_FAILED_LOCKED_FOR_TRANSFER = 0x49,
- CHAR_DELETE_FAILED_GUILD_LEADER = 0x4A,
- CHAR_DELETE_FAILED_ARENA_CAPTAIN = 0x4B,
-
- CHAR_LOGIN_IN_PROGRESS = 0x4C,
- CHAR_LOGIN_SUCCESS = 0x4D,
- CHAR_LOGIN_NO_WORLD = 0x4E,
- CHAR_LOGIN_DUPLICATE_CHARACTER = 0x4F,
- CHAR_LOGIN_NO_INSTANCES = 0x50,
- CHAR_LOGIN_FAILED = 0x51,
- CHAR_LOGIN_DISABLED = 0x52,
- CHAR_LOGIN_NO_CHARACTER = 0x53,
- CHAR_LOGIN_LOCKED_FOR_TRANSFER = 0x54,
- CHAR_LOGIN_LOCKED_BY_BILLING = 0x55,
- CHAR_LOGIN_LOCKED_BY_MOBILE_AH = 0x56,
-
- CHAR_NAME_SUCCESS = 0x57,
- CHAR_NAME_FAILURE = 0x58,
- CHAR_NAME_NO_NAME = 0x59,
- CHAR_NAME_TOO_SHORT = 0x5A,
- CHAR_NAME_TOO_LONG = 0x5B,
- CHAR_NAME_INVALID_CHARACTER = 0x5C,
- CHAR_NAME_MIXED_LANGUAGES = 0x5D,
- CHAR_NAME_PROFANE = 0x5E,
- CHAR_NAME_RESERVED = 0x5F,
- CHAR_NAME_INVALID_APOSTROPHE = 0x60,
- CHAR_NAME_MULTIPLE_APOSTROPHES = 0x61,
- CHAR_NAME_THREE_CONSECUTIVE = 0x62,
- CHAR_NAME_INVALID_SPACE = 0x63,
- CHAR_NAME_CONSECUTIVE_SPACES = 0x64,
- CHAR_NAME_RUSSIAN_CONSECUTIVE_SILENT_CHARACTERS = 0x65,
- CHAR_NAME_RUSSIAN_SILENT_CHARACTER_AT_BEGINNING_OR_END = 0x66,
- CHAR_NAME_DECLENSION_DOESNT_MATCH_BASE_NAME = 0x67
+ RESPONSE_SUCCESS = 0,
+ RESPONSE_FAILURE = 1,
+ RESPONSE_CANCELLED = 2,
+ RESPONSE_DISCONNECTED = 3,
+ RESPONSE_FAILED_TO_CONNECT = 4,
+ RESPONSE_CONNECTED = 5,
+ RESPONSE_VERSION_MISMATCH = 6,
+
+ CSTATUS_CONNECTING = 7,
+ CSTATUS_NEGOTIATING_SECURITY = 8,
+ CSTATUS_NEGOTIATION_COMPLETE = 9,
+ CSTATUS_NEGOTIATION_FAILED = 10,
+ CSTATUS_AUTHENTICATING = 11,
+
+ AUTH_OK = 12,
+ AUTH_FAILED = 13,
+ AUTH_REJECT = 14,
+ AUTH_BAD_SERVER_PROOF = 15,
+ AUTH_UNAVAILABLE = 16,
+ AUTH_SYSTEM_ERROR = 17,
+ AUTH_BILLING_ERROR = 18,
+ AUTH_BILLING_EXPIRED = 19,
+ AUTH_VERSION_MISMATCH = 20,
+ AUTH_UNKNOWN_ACCOUNT = 21,
+ AUTH_INCORRECT_PASSWORD = 22,
+ AUTH_SESSION_EXPIRED = 23,
+ AUTH_SERVER_SHUTTING_DOWN = 24,
+ AUTH_ALREADY_LOGGING_IN = 25,
+ AUTH_LOGIN_SERVER_NOT_FOUND = 26,
+ AUTH_WAIT_QUEUE = 27,
+ AUTH_BANNED = 28,
+ AUTH_ALREADY_ONLINE = 29,
+ AUTH_NO_TIME = 30,
+ AUTH_DB_BUSY = 31,
+ AUTH_SUSPENDED = 32,
+ AUTH_PARENTAL_CONTROL = 33,
+ AUTH_LOCKED_ENFORCED = 34,
+
+ REALM_LIST_IN_PROGRESS = 35,
+ REALM_LIST_SUCCESS = 36,
+ REALM_LIST_FAILED = 37,
+ REALM_LIST_INVALID = 38,
+ REALM_LIST_REALM_NOT_FOUND = 39,
+
+ ACCOUNT_CREATE_IN_PROGRESS = 40,
+ ACCOUNT_CREATE_SUCCESS = 41,
+ ACCOUNT_CREATE_FAILED = 42,
+
+ CHAR_LIST_RETRIEVING = 43,
+ CHAR_LIST_RETRIEVED = 44,
+ CHAR_LIST_FAILED = 45,
+
+ CHAR_CREATE_IN_PROGRESS = 46,
+ CHAR_CREATE_SUCCESS = 47,
+ CHAR_CREATE_ERROR = 48,
+ CHAR_CREATE_FAILED = 49,
+ CHAR_CREATE_NAME_IN_USE = 50,
+ CHAR_CREATE_DISABLED = 51,
+ CHAR_CREATE_PVP_TEAMS_VIOLATION = 52,
+ CHAR_CREATE_SERVER_LIMIT = 53,
+ CHAR_CREATE_ACCOUNT_LIMIT = 54,
+ CHAR_CREATE_SERVER_QUEUE = 55,
+ CHAR_CREATE_ONLY_EXISTING = 56,
+ CHAR_CREATE_EXPANSION = 57,
+ CHAR_CREATE_EXPANSION_CLASS = 58,
+ CHAR_CREATE_LEVEL_REQUIREMENT = 59,
+ CHAR_CREATE_UNIQUE_CLASS_LIMIT = 60,
+ CHAR_CREATE_CHARACTER_IN_GUILD = 61,
+ CHAR_CREATE_RESTRICTED_RACECLASS = 62,
+ CHAR_CREATE_CHARACTER_CHOOSE_RACE = 63,
+ CHAR_CREATE_CHARACTER_ARENA_LEADER = 64,
+ CHAR_CREATE_CHARACTER_DELETE_MAIL = 65,
+ CHAR_CREATE_CHARACTER_SWAP_FACTION = 66,
+ CHAR_CREATE_CHARACTER_RACE_ONLY = 67,
+ CHAR_CREATE_CHARACTER_GOLD_LIMIT = 68,
+ CHAR_CREATE_FORCE_LOGIN = 69,
+
+ CHAR_DELETE_IN_PROGRESS = 70,
+ CHAR_DELETE_SUCCESS = 71,
+ CHAR_DELETE_FAILED = 72,
+ CHAR_DELETE_FAILED_LOCKED_FOR_TRANSFER = 73,
+ CHAR_DELETE_FAILED_GUILD_LEADER = 74,
+ CHAR_DELETE_FAILED_ARENA_CAPTAIN = 75,
+
+ CHAR_LOGIN_IN_PROGRESS = 76,
+ CHAR_LOGIN_SUCCESS = 77,
+ CHAR_LOGIN_NO_WORLD = 78,
+ CHAR_LOGIN_DUPLICATE_CHARACTER = 79,
+ CHAR_LOGIN_NO_INSTANCES = 80,
+ CHAR_LOGIN_FAILED = 81,
+ CHAR_LOGIN_DISABLED = 82,
+ CHAR_LOGIN_NO_CHARACTER = 83,
+ CHAR_LOGIN_LOCKED_FOR_TRANSFER = 84,
+ CHAR_LOGIN_LOCKED_BY_BILLING = 85,
+ CHAR_LOGIN_LOCKED_BY_MOBILE_AH = 86,
+
+ CHAR_NAME_SUCCESS = 87,
+ CHAR_NAME_FAILURE = 88,
+ CHAR_NAME_NO_NAME = 89,
+ CHAR_NAME_TOO_SHORT = 90,
+ CHAR_NAME_TOO_LONG = 91,
+ CHAR_NAME_INVALID_CHARACTER = 92,
+ CHAR_NAME_MIXED_LANGUAGES = 93,
+ CHAR_NAME_PROFANE = 94,
+ CHAR_NAME_RESERVED = 95,
+ CHAR_NAME_INVALID_APOSTROPHE = 96,
+ CHAR_NAME_MULTIPLE_APOSTROPHES = 97,
+ CHAR_NAME_THREE_CONSECUTIVE = 98,
+ CHAR_NAME_INVALID_SPACE = 99,
+ CHAR_NAME_CONSECUTIVE_SPACES = 100,
+ CHAR_NAME_RUSSIAN_CONSECUTIVE_SILENT_CHARACTERS = 101,
+ CHAR_NAME_RUSSIAN_SILENT_CHARACTER_AT_BEGINNING_OR_END = 102,
+ CHAR_NAME_DECLENSION_DOESNT_MATCH_BASE_NAME = 103
};
/// Ban function modes
View
4 src/server/game/Movement/Waypoints/WaypointManager.cpp
@@ -48,8 +48,7 @@ void WaypointMgr::Load()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 waypoints. DB table `waypoint_data` is empty!");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 waypoints. DB table `waypoint_data` is empty!");
return;
}
@@ -87,7 +86,6 @@ void WaypointMgr::Load()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u waypoints in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
}
void WaypointMgr::ReloadPath(uint32 id)
View
4 src/server/game/Skills/SkillDiscovery.cpp
@@ -55,8 +55,7 @@ void LoadSkillDiscoveryTable()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 skill discovery definitions. DB table `skill_discovery_template` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 skill discovery definitions. DB table `skill_discovery_template` is empty.");
return;
}
@@ -154,7 +153,6 @@ void LoadSkillDiscoveryTable()
}
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u skill discovery definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
}
uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player)
View
12 src/server/game/Skills/SkillExtraItems.cpp
@@ -60,8 +60,7 @@ void LoadSkillExtraItemTable()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 spell specialization definitions. DB table `skill_extra_item_template` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 spell specialization definitions. DB table `skill_extra_item_template` is empty.");
return;
}
@@ -75,28 +74,28 @@ void LoadSkillExtraItemTable()
if (!sSpellMgr->GetSpellInfo(spellId))
{
- sLog->outError(LOG_FILTER_GENERAL, "Skill specialization %u has non-existent spell id in `skill_extra_item_template`!", spellId);
+ sLog->outError(LOG_FILTER_SQL, "Skill specialization %u has non-existent spell id in `skill_extra_item_template`!", spellId);
continue;
}
uint32 requiredSpecialization = fields[1].GetUInt32();
if (!sSpellMgr->GetSpellInfo(requiredSpecialization))
{
- sLog->outError(LOG_FILTER_GENERAL, "Skill specialization %u have not existed required specialization spell id %u in `skill_extra_item_template`!", spellId, requiredSpecialization);
+ sLog->outError(LOG_FILTER_SQL, "Skill specialization %u have not existed required specialization spell id %u in `skill_extra_item_template`!", spellId, requiredSpecialization);
continue;
}
float additionalCreateChance = fields[2].GetFloat();
if (additionalCreateChance <= 0.0f)
{
- sLog->outError(LOG_FILTER_GENERAL, "Skill specialization %u has too low additional create chance in `skill_extra_item_template`!", spellId);
+ sLog->outError(LOG_FILTER_SQL, "Skill specialization %u has too low additional create chance in `skill_extra_item_template`!", spellId);
continue;
}
uint8 additionalMaxNum = fields[3].GetUInt8();
if (!additionalMaxNum)
{
- sLog->outError(LOG_FILTER_GENERAL, "Skill specialization %u has 0 max number of extra items in `skill_extra_item_template`!", spellId);
+ sLog->outError(LOG_FILTER_SQL, "Skill specialization %u has 0 max number of extra items in `skill_extra_item_template`!", spellId);
continue;
}
@@ -111,7 +110,6 @@ void LoadSkillExtraItemTable()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u spell specialization definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
}
bool canCreateExtraItems(Player* player, uint32 spellId, float &additionalChance, uint8 &additionalMax)
View
14 src/server/game/Warden/WardenCheckMgr.cpp
@@ -44,7 +44,6 @@ void WardenCheckMgr::LoadWardenChecks()
if (!sWorld->getBoolConfig(CONFIG_WARDEN_ENABLED))
{
sLog->outInfo(LOG_FILTER_WARDEN, ">> Warden disabled, loading checks skipped.");
-
return;
}
@@ -52,8 +51,7 @@ void WardenCheckMgr::LoadWardenChecks()
if (!result)
{
- sLog->outInfo(LOG_FILTER_WARDEN, ">> Loaded 0 Warden checks. DB table `warden_checks` is empty!");
-
+ sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 Warden checks. DB table `warden_checks` is empty!");
return;
}
@@ -145,8 +143,7 @@ void WardenCheckMgr::LoadWardenChecks()
}
while (result->NextRow());
- sLog->outInfo(LOG_FILTER_WARDEN, ">> Loaded %u warden checks.", count);
-
+ sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u warden checks.", count);
}
void WardenCheckMgr::LoadWardenOverrides()
@@ -155,7 +152,6 @@ void WardenCheckMgr::LoadWardenOverrides()
if (!sWorld->getBoolConfig(CONFIG_WARDEN_ENABLED))
{
sLog->outInfo(LOG_FILTER_WARDEN, ">> Warden disabled, loading check overrides skipped.");
-
return;
}
@@ -164,8 +160,7 @@ void WardenCheckMgr::LoadWardenOverrides()
if (!result)
{
- sLog->outInfo(LOG_FILTER_WARDEN, ">> Loaded 0 Warden action overrides. DB table `warden_action` is empty!");
-
+ sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 Warden action overrides. DB table `warden_action` is empty!");
return;
}
@@ -194,8 +189,7 @@ void WardenCheckMgr::LoadWardenOverrides()
}
while (result->NextRow());
- sLog->outInfo(LOG_FILTER_WARDEN, ">> Loaded %u warden action overrides.", count);
-
+ sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u warden action overrides.", count);
}
WardenCheck* WardenCheckMgr::GetWardenDataById(uint16 Id)
View
4 src/server/game/Weather/WeatherMgr.cpp
@@ -96,8 +96,7 @@ void LoadWeatherData()
if (!result)
{
- sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 weather definitions. DB table `game_weather` is empty.");
-
+ sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 weather definitions. DB table `game_weather` is empty.");
return;
}
@@ -141,7 +140,6 @@ void LoadWeatherData()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u weather definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
}
void SendFineWeatherUpdateToPlayer(Player* player)
View
2  src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
@@ -314,7 +314,7 @@ class npc_harrison_jones : public CreatureScript
me->SetEntry(NPC_HARRISON_JONES_2);
me->SetDisplayId(MODEL_HARRISON_JONES_2);
me->SetTarget(0);
- me->SetByteValue(UNIT_FIELD_BYTES_1, 0,UNIT_STAND_STATE_DEAD);
+ me->SetByteValue(UNIT_FIELD_BYTES_1, 0, UNIT_STAND_STATE_DEAD);
me->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);
if (instance)
instance->SetData(DATA_GONGEVENT, DONE);
View
2  src/server/shared/Common.h
@@ -116,7 +116,7 @@
#define I32FMT "%08I32X"
#define I64FMT "%016I64X"
#define snprintf _snprintf
-#define atoll __atoi64
+#define atoll _atoi64
#define vsnprintf _vsnprintf
#define finite(X) _finite(X)
#define llabs _abs64
Please sign in to comment.
Something went wrong with that request. Please try again.