diff options
484 files changed, 3940 insertions, 2162 deletions
diff --git a/contrib/valgrind/helgrind.supp b/contrib/valgrind/helgrind.supp new file mode 100644 index 00000000000..930a264faf7 --- /dev/null +++ b/contrib/valgrind/helgrind.supp @@ -0,0 +1,116 @@ +{ + [1] ACE_Future::ready() race in WorldSession::ProcessQueryCallbacks(), a lock is used anyway in ACE_Future::get()/set() + Helgrind:Race + ... + fun:_ZN14ACE_Future_RepIN7Trinity7AutoPtrI17PreparedResultSet16ACE_Thread_MutexEEE3setERKS4_R10ACE_FutureIS4_E + fun:_ZN10ACE_FutureIN7Trinity7AutoPtrI17PreparedResultSet16ACE_Thread_MutexEEE3setERKS4_ + fun:_ZN21PreparedStatementTask7ExecuteEv +} +{ + [1] ACE_Future::ready() race in WorldSession::ProcessQueryCallbacks(), a lock is used anyway in ACE_Future::get()/set() + Helgrind:Race + ... + fun:_ZN14ACE_Future_RepIP14SQLQueryHolderE3setERKS1_R10ACE_FutureIS1_E + fun:_ZN10ACE_FutureIP14SQLQueryHolderE3setERKS1_ + fun:_ZN18SQLQueryHolderTask7ExecuteEv +} +{ + [2] ACE_Future::ready() race in WorldSession::ProcessQueryCallbacks(), a lock is used anyway in ACE_Future::get()/set() + Helgrind:Race + ... + fun:_ZNK14ACE_Future_RepIP14SQLQueryHolderE5readyEv + fun:_ZNK10ACE_FutureIP14SQLQueryHolderE5readyEv + fun:_ZN12WorldSession21ProcessQueryCallbacksEv +} +{ + [3] ACE_Future::attach()/detach() false positive in WorldSession::HandleCharEnumOpcode() + Helgrind:Race + ... + fun:_ZN14ACE_Future_RepIN7Trinity7AutoPtrI17PreparedResultSet16ACE_Thread_MutexEEE6attachERPS5_ +} +{ + [4] ACE_Future::get() race in WorldSession::ProcessQueryCallbacks() , a lock is used anyway in ACE_Future::get()/set(), the only case when this is a race is if the same ACE_Future is reused by another thread + Helgrind:Race + ... + fun:_ZNK14ACE_Future_RepIP14SQLQueryHolderE3getERS1_P14ACE_Time_Value + fun:_ZNK10ACE_FutureIP14SQLQueryHolderE3getERS1_P14ACE_Time_Value + fun:_ZN12WorldSession21ProcessQueryCallbacksEv +} +{ + [4] ACE_Future::get() race in WorldSession::ProcessQueryCallbacks() , a lock is used anyway in ACE_Future::get()/set(), the only case when this is a race is if the same ACE_Future is reused by another thread + Helgrind:Race + ... + fun:_ZNK10ACE_FutureIN7Trinity7AutoPtrI17PreparedResultSet16ACE_Thread_MutexEEE5readyEv + fun:_ZN12WorldSession21ProcessQueryCallbacksEv +} +{ + [5] Race in WorldSession::ProcessQueryCallbacks(), added ASSERT(!m_result.ready()) + Helgrind:Race + ... + fun:_ZN6Player10LoadFromDBEjP14SQLQueryHolder + fun:_ZN12WorldSession17HandlePlayerLoginEP16LoginQueryHolder + fun:_ZN12WorldSession21ProcessQueryCallbacksEv +} +{ + [5] Race in WorldSession::ProcessQueryCallbacks(), added ASSERT(!m_result.ready()) + Helgrind:Race + ... + fun:_ZN14SQLQueryHolder17GetPreparedResultEm + fun:_ZN12WorldSession17HandlePlayerLoginEP16LoginQueryHolder + fun:_ZN12WorldSession21ProcessQueryCallbacksEv +} +{ + [5] Race in WorldSession::ProcessQueryCallbacks(), added ASSERT(!m_result.ready()) + Helgrind:Race + ... + fun:_ZN12WorldSession15LoadAccountDataEN7Trinity7AutoPtrI17PreparedResultSet16ACE_Thread_MutexEEj + fun:_ZN12WorldSession17HandlePlayerLoginEP16LoginQueryHolder + fun:_ZN12WorldSession21ProcessQueryCallbacksEv +} +{ + [5] Race in WorldSession::ProcessQueryCallbacks(), added ASSERT(!m_result.ready()) + Helgrind:Race + ... + fun:_ZNK17PreparedResultSet5FetchEv + fun:_ZN12WorldSession17HandlePlayerLoginEP16LoginQueryHolder + fun:_ZN12WorldSession21ProcessQueryCallbacksEv +} +{ + [5] Race in WorldSession::ProcessQueryCallbacks(), added ASSERT(!m_result.ready()) + Helgrind:Race + ... + fun:_ZNK5Field9GetUInt32Ev + fun:_ZN12WorldSession17HandlePlayerLoginEP16LoginQueryHolder + fun:_ZN12WorldSession21ProcessQueryCallbacksEv +} +{ + [5] Race in WorldSession::ProcessQueryCallbacks(), added ASSERT(!m_result.ready()) + Helgrind:Race + ... + fun:_ZNK5Field8GetUInt8Ev + fun:_ZN12WorldSession17HandlePlayerLoginEP16LoginQueryHolder + fun:_ZN12WorldSession21ProcessQueryCallbacksEv +} +{ + [6] False positive of possible race about ACE_Strong_Bound_Ptr + Helgrind:Race + ... + fun:_ZN17PreparedResultSetD1Ev + fun:_ZN20ACE_Strong_Bound_PtrI17PreparedResultSet16ACE_Thread_MutexED1Ev + fun:_ZN7Trinity7AutoPtrI17PreparedResultSet16ACE_Thread_MutexED1Ev + fun:_ZN12WorldSession17HandlePlayerLoginEP16LoginQueryHolder + fun:_ZN12WorldSession21ProcessQueryCallbacksEv +} +{ + [7] Race condition on bool in ACE, ignore + Helgrind:Race + fun:_ZN11WorldSocket12handle_closeEim + fun:_ZN20ACE_Dev_Poll_Reactor16remove_handler_iEimP17ACE_Event_Handler +} +{ + [7] Race condition on bool in ACE, ignore + Helgrind:Race + fun:_ZNK11WorldSocket8IsClosedEv + fun:_ZN12WorldSession6UpdateEjR12PacketFilter + fun:_ZN5World14UpdateSessionsEj +} diff --git a/doc/LoggingHOWTO.txt b/doc/LoggingHOWTO.txt index 79b03d3dd2f..a4d29f7928b 100644 --- a/doc/LoggingHOWTO.txt +++ b/doc/LoggingHOWTO.txt @@ -13,13 +13,23 @@ disable certain log statements while allowing others to print unhindered. This capability assumes that the loggers are categorized according to some developer-chosen criteria. -Loggers follow hierarchy, if a logger is not defined a root logger will be used +Loggers are named entitites. Logger names are case-sensitive and they follow +the hierarchical naming rule: + + A Logger is said to be an ancestor of another logger if its name followed + by a dot is a prefix of the descendant logger name. A logger is salid to be + a parent of a child logger if there are no ancestors between itself and the + descendant logger. + +For example, the logger named "entities.player" is a parent of the logger named +"entities.player.character". Similarly, "entities" is a parent of "entities.player" +and an ancestor of "entities.player.character". Loggers may be assigned levels. The set of possible levels are TRACE, DEBUG, INFO, WARN, ERROR AND FATAL, or be disabled using level DISABLED. By definition the printing method determines the level of a logging request. -For example, sLog->outInfo(...) is a logging request of level INFO. +For example, TC_LOG_INFO(...) is a logging request of level INFO. A logging request is said to be enabled if its level is higher than or equal to the level of its logger. Otherwise, the request is said to be disabled. A logger @@ -28,9 +38,9 @@ without an assigned level will inherit one from the hierarchy Example Logger Name Assigned Level Inherited Level root Proot Proot -Network None Proot +server None Proot -As Network is not defined, it uses the root logger and it's log level. +As "server" is not defined, it uses the root logger and it's log level. TRACE < DEBUG < INFO < WARN < ERROR < FATAL. @@ -50,12 +60,15 @@ logger CONFIGURATION -System will read "Loggers" and "Appenders" to know the list of loggers and -appenders to read from config file. Both are a list of elements separated -by space. +System will read all config elements with prefix "Logger." and "Appender." +and configure the logging system. If "root" can not be properly configured the core +will remove all loggers and appenders and create a default set: +- Logger "root" with log level Error +- Logger "server" with log level Info +- Appender "Console" to log to console -Once we have the list of appenders to read, system will try to configure a new -appender from its config line. Appender config line follows the format: + +Appender config line follows the format: Type,LogLevel,Flags,optional1,optional2 @@ -131,53 +144,9 @@ legal but redundant. Once we have the list of loggers to read, system will try to configure a new logger from its config line. Logger config line follows the format: - Type,LogLevel,AppenderList + LogLevel,AppenderList Its a list of elements separated by comma where each element has its own meaning - Type: Type of the logger ( - 0 - Default. Each type that has no config will - rely on this one. Core will create this logger - (disabled) if it's not configured - 1 - Units that doesn't fit in other categories - 2 - Pets - 3 - Vehicles - 4 - C++ AI, instance scripts, etc. - 5 - DB AI, such as SAI, EAI, CreatureAI - 6 - DB map scripts - 7 - Network input/output, - such as packet handlers and netcode logs - 8 - Spellsystem and aurasystem - 9 - Achievement system - 10 - Condition system - 11 - Pool system - 12 - Auction house - 13 - Arena's and battlegrounds - 14 - Outdoor PVP - 15 - Chat system - 16 - LFG system - 17 - Maps, instances (not scripts), - grids, cells, visibility, etc. - 18 - Player that doesn't fit in other categories. - 19 - Player loading from DB - (Player::_LoadXXX functions) - 20 - Items - 21 - Player skills (do not confuse with spells) - 22 - Player chat logs - 23 - loot - 24 - guilds - 25 - transports - 26 - SQL. DB errors - 27 - GM Commands - 28 - Remote Access Commands - 29 - Warden - 30 - Authserver - 31 - Worldserver - 32 - Game Events - 33 - Calendar - 34 - Character (Exclusive to login, logout, create, rename and delete) - 35 - Arenas - 36 - SQL Driver - 37 - SQL Dev LogLevel 0 - (Disabled) 1 - (Trace) @@ -197,14 +166,12 @@ Log errors to console and a file called server.log that only contain logs for this server run. File should prefix timestamp, type and log level to the messages. Console should prefix type and log level. - Appenders=Console Server - Loggers=Root Appender.Console=1,5,6 Appender.Server=2,5,7,Server.log,w - Logger.Root=0,5,Console Server + Logger.root=5,Console Server Lets trace how system will log two different messages: - 1) sLog->outError(LOG_FILTER_GUILD, "Guild 1 created"); + 1) TC_LOG_ERROR(LOG_FILTER_GUILD, "Guild 1 created"); System will try to find logger of type GUILD, as no logger is configured for GUILD it will use Root logger. As message Log Level is equal or higher than the Log level of logger the message is sent to the Appenders @@ -212,7 +179,7 @@ Lets trace how system will log two different messages: Console will write: "ERROR [GUILD ] Guild 1 created" Server will write to file "2012-08-15 ERROR [GUILD ] Guild 1 created" - 2) sLog->outInfo(LOG_FILTER_CHARACTER, "Player Name Logged in"); + 2) TC_LOG_INFO(LOG_FILTER_CHARACTER, "Player Name Logged in"); System will try to find logger of type CHARACTER, as no logger is configured for CHARACTER it will use Root logger. As message Log Level is not equal or higher than the Log level of logger the message its discarted. @@ -222,16 +189,14 @@ EXAMPLE 2 Same example that above, but now i want to see all messages of level INFO on file and server file should add timestamp on creation. - Appenders=Console Server - Loggers=Root Appender.Console=1,5,6 Appender.Server=2,4,15,Server.log - Logger.Root=0,4,Console Server + Logger.root=4,Console Server Lets trace how system will log two different messages: - 1) sLog->outError(LOG_FILTER_GUILD, "Guild 1 created"); + 1) TC_LOG_ERROR(LOG_FILTER_GUILD, "Guild 1 created"); Performs exactly as example 1. - 2) sLog->outInfo(LOG_FILTER_CHARACTER, "Player Name Logged in"); + 2) TC_LOG_INFO(LOG_FILTER_CHARACTER, "Player Name Logged in"); System will try to find logger of type CHARACTER, as no logger is configured for CHARACTER it will use Root logger. As message Log Level is equal or higher than the Log level of logger the message is sent to the @@ -248,13 +213,11 @@ and also some CHARACTER events to some point. Also im checking some Waypoints so i want SQLDEV to be logged to file without prefixes. All other messages should only be logged to console, GUILD to TRACE and CHARACTER to INFO - Appenders=Console SQLDev - Loggers=Guild Characters SQLDev Appender.Console=1,1 Appender.SQLDev=2,2,0,SQLDev.log - Logger.Guild=24,1,Console - Logger.Characters=34,3,Console - Logger.SQLDev=37,3,SQLDev + Logger.guild=1,Console + Logger.entities.player.character=3,Console + Logger.sql.dev=3,SQLDev With this config, any message logger with a Log type different to GUILD, CHARACTER or SQLDEV will be ignored, as we didn't define a logger Root and @@ -262,13 +225,3 @@ system created a default Root disabled. Appender Console, log level should be defined to allow all possible messages of its loggers, in this case GUILD uses TRACE (1), so Appender should allow it. Logger Characters will limit it's own messages to INFO (3) - ---- SOME EXTRA COMMENTS --- -why this system is better than previous one? -- Can be extended: Anyone can easily create new appenders to log to new - systems as syslog or IRC, having all code related to that system in particular - files -- It's asyncronous: Uses threads to write messages, so core performance wont be - affected by IO operations -- Lets us select "What to log" and "Where to log" on the fly. You can log to a - dozen of files without having to change a single line of code diff --git a/sql/updates/world/2013_10_27_00_world_conditions.sql b/sql/updates/world/2013_10_27_00_world_conditions.sql new file mode 100644 index 00000000000..401053b80c7 --- /dev/null +++ b/sql/updates/world/2013_10_27_00_world_conditions.sql @@ -0,0 +1,6 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry` IN(66661,66642,30015,3678); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(17, 0, 66661, 0, 0, 29, 0, 35012, 40, 0, 1, 0, 0, '', 'Cant use Captured Kvaldir Banner within 40 yards of Ornolf The Scarred'), +(17, 0, 66642, 0, 0, 29, 0, 34980, 40, 0, 1, 0, 0, '', 'Cant use Kvaldir War Horn within 40 yards of Drottinn Hrothgar'), +(17, 0, 30015, 0, 0, 29, 0, 17207, 100, 0, 1, 0, 0, '', 'Cant use Gift of Naias within 100 yards of Naias'), +(17, 0, 3678, 0, 0, 29, 0, 2624, 100, 0, 1, 0, 0, '', 'Cant use Catelyns Blade within 100 yards of Gazban'); diff --git a/sql/updates/world/2013_10_28_00_world_sai.sql b/sql/updates/world/2013_10_28_00_world_sai.sql new file mode 100644 index 00000000000..42eea3dfefa --- /dev/null +++ b/sql/updates/world/2013_10_28_00_world_sai.sql @@ -0,0 +1,6 @@ +DELETE FROM `smart_scripts` WHERE `entryorguid` = 23030 AND `source_type` = 0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23030, 0, 0, 0, 6, 0, 100, 2, 0, 0, 0, 0, 43, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Dragonmaw Sky Stalker - On Creature Death - Dismount"), +(23030, 0, 1, 0, 0, 0, 100, 2, 0, 0, 0, 0, 19, 0x02000000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Dragonmaw Sky Stalker - In Combat - Remove unit flag"), +(23030, 0, 2, 0, 9, 0, 100, 2, 5, 41, 15800, 15800, 11, 40872, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Dragonmaw Sky Stalker - At 5 - 41 Range - Cast Immolation Arrow"), +(23030, 0, 3, 0, 9, 0, 100, 2, 5, 41, 9800, 9800, 11, 40873, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Dragonmaw Sky Stalker - At 5 - 41 Range - Cast Shoot"); diff --git a/sql/updates/world/2013_11_02_00_world_creature_template.sql b/sql/updates/world/2013_11_02_00_world_creature_template.sql new file mode 100644 index 00000000000..7f647e5c046 --- /dev/null +++ b/sql/updates/world/2013_11_02_00_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Make invisible some visible Triggers +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry` IN (21052,21403,21334,21436,21437,21438,21439,21440); diff --git a/sql/updates/world/2013_11_02_01_world_misc.sql b/sql/updates/world/2013_11_02_01_world_misc.sql new file mode 100644 index 00000000000..80e13dac3ac --- /dev/null +++ b/sql/updates/world/2013_11_02_01_world_misc.sql @@ -0,0 +1,9 @@ +-- +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=21215; + +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(15, 21215, 0, 0, 0, 12, 0, 12, 0, 0, 0, 0, 0, '', 'Only display gossip during Hallows End'), +(15, 21215, 0, 0, 0, 23, 0, 1638, 0, 0, 0, 0, 0, '', 'Only display gossip in Thunderbluff'), +(15, 21215, 0, 0, 0, 1, 0, 24755, 0, 0, 1, 0, 0, '', 'only display gossip if player does not have tricked or treated aura'); + +UPDATE `smart_scripts` SET `target_type`=7 WHERE `entryorguid`=6740 AND `source_type`=0 AND `id`=1 AND `link`=0; diff --git a/sql/updates/world/2013_11_02_02_world_creature_loot_template.sql b/sql/updates/world/2013_11_02_02_world_creature_loot_template.sql new file mode 100644 index 00000000000..abbe650b451 --- /dev/null +++ b/sql/updates/world/2013_11_02_02_world_creature_loot_template.sql @@ -0,0 +1,18 @@ +-- Quest item "Drain Schematics" should be only obtainable if: +-- 1) player has completed quest 9720 "Balance Must Be Preserved" +-- 2) player has no quest 9731 "Drain Schematics" +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = '1' AND `SourceEntry` = '24330'; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`) VALUES +('1','18088','24330','0','0','8','0','9720','0','0','0'), +('1','18088','24330','0','0','9','0','9731','0','0','1'), +('1','18089','24330','0','0','8','0','9720','0','0','0'), +('1','18089','24330','0','0','9','0','9731','0','0','1'), +('1','18340','24330','0','0','8','0','9720','0','0','0'), +('1','18340','24330','0','0','9','0','9731','0','0','1'), +('1','20088','24330','0','0','8','0','9720','0','0','0'), +('1','20088','24330','0','0','9','0','9731','0','0','1'), +('1','20089','24330','0','0','8','0','9720','0','0','0'), +('1','20089','24330','0','0','9','0','9731','0','0','1'); + +-- Set drop chance to normal(non-quest) +UPDATE `creature_loot_template` SET `ChanceOrQuestChance` = abs(`ChanceOrQuestChance`) WHERE (`item` = '24330'); diff --git a/sql/updates/world/2013_11_02_03_world_sai.sql b/sql/updates/world/2013_11_02_03_world_sai.sql new file mode 100644 index 00000000000..1a7b4d5b511 --- /dev/null +++ b/sql/updates/world/2013_11_02_03_world_sai.sql @@ -0,0 +1,2 @@ +-- +UPDATE `smart_scripts` SET `action_param1`=60 WHERE `entryorguid`=208001 AND `source_type`=9 AND `id` IN (7,8,9); diff --git a/sql/updates/world/2013_11_02_04_world_sai.sql b/sql/updates/world/2013_11_02_04_world_sai.sql new file mode 100644 index 00000000000..71c8dd5fd98 --- /dev/null +++ b/sql/updates/world/2013_11_02_04_world_sai.sql @@ -0,0 +1,30 @@ +-- +SET @Mechagnome=29384; -- Captive Mechagnome + +-- Update creature template to use SAI +UPDATE `creature_template` SET `ainame`='SmartAI',`scriptname`='' WHERE `entry`=@Mechagnome; +-- Add gossip option +DELETE FROM `gossip_menu_option` WHERE `menu_id`=9871; +INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`) VALUES +(9871,0,0,'I\'m not a laborer. I\'m here to free you from servitude in the mines.',1,1,0,0,0,0,NULL); +-- Add conditions for gossip option visibility +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9871; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(15,9871,0,0,0,9,0,12957,0,0,0,0,0,'','Show gossip only if quest is active'); +-- Add Captive Mechagnome text +DELETE FROM `creature_text` WHERE `entry`=@Mechagnome; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(@Mechagnome,0,0,'Does not compute. Unit malfunctioning. Directive: shut down.',12,0,0,0,0,0,''), +(@Mechagnome,0,1,'New directive: leave mine and return to Inventor\'s Library.',12,0,0,0,0,0,''), +(@Mechagnome,0,2,'New directive: assist in the defeat of the iron dwarves.',12,0,0,0,0,0,''), +(@Mechagnome,0,3,'Free again? Keeper Mimir\'s work awaits.',12,0,0,0,0,0,''), +(@Mechagnome,0,4,'Thank you, $r. I will join your struggle against the stormforged.',12,0,0,0,0,0,''); +-- Add Captive Mechagnome SAI +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Mechagnome AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(@Mechagnome,0,0,1,62,0,100,0,9871,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Captive Mechagnome - On Gossip Option Select - Close Gossip'), +(@Mechagnome,0,1,2,61,0,100,0,0,0,0,0,83,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Mechagnome - Link With Previous Event - Remove npcflag 1'), +(@Mechagnome,0,2,3,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Mechagnome - Link With Previous Event - Talk'), +(@Mechagnome,0,3,4,61,0,100,0,0,0,0,0,33,29962,0,0,0,0,0,7,0,0,0,0,0,0,0,'Captive Mechagnome - Link With Previous Event - Give Quest Credit'), +(@Mechagnome,0,4,5,61,0,100,0,0,0,0,0,69,0,0,0,0,0,0,1,0,0,0,7818.4,-86.48,880.63,0,'Captive Mechagnome - Link With Previous Event - Move To Position'), +(@Mechagnome,0,5,0,61,0,100,0,0,0,0,0,41,4000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Mechagnome - Link With Previous Event - Despawn'); diff --git a/sql/updates/world/2013_11_02_05_world_creature_template.sql b/sql/updates/world/2013_11_02_05_world_creature_template.sql new file mode 100644 index 00000000000..2d44f63cbdd --- /dev/null +++ b/sql/updates/world/2013_11_02_05_world_creature_template.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=21657; diff --git a/sql/updates/world/2013_11_02_06_world_loot.sql b/sql/updates/world/2013_11_02_06_world_loot.sql new file mode 100644 index 00000000000..8448c9763b8 --- /dev/null +++ b/sql/updates/world/2013_11_02_06_world_loot.sql @@ -0,0 +1,3 @@ +-- +DELETE FROM `creature_loot_template` WHERE `entry` =8996; +UPDATE `creature_template` SET `lootid`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=8996; diff --git a/sql/updates/world/2013_11_02_07_world_misc.sql b/sql/updates/world/2013_11_02_07_world_misc.sql new file mode 100644 index 00000000000..6fc65d20802 --- /dev/null +++ b/sql/updates/world/2013_11_02_07_world_misc.sql @@ -0,0 +1,3 @@ +-- +DELETE FROM `game_event_creature` WHERE `guid` IN (136921,136922) AND `eventEntry`=24; +UPDATE `game_event_seasonal_questrelation` SET `eventEntry`=2 WHERE `questId` IN (6983,6984); diff --git a/sql/updates/world/2013_11_03_00_world_sai.sql b/sql/updates/world/2013_11_03_00_world_sai.sql new file mode 100644 index 00000000000..3d7de4856eb --- /dev/null +++ b/sql/updates/world/2013_11_03_00_world_sai.sql @@ -0,0 +1,11 @@ +-- +SET @MARKER1 := 20473; -- Surveying Marker One +SET @MARKER2 := 20475; -- Surveying Marker Two +SET @MARKER3 := 20476; -- Surveying Marker Three + +DELETE FROM `smart_scripts` WHERE `entryorguid` IN(@MARKER1,@MARKER2,@MARKER3) AND `source_type`=0; +UPDATE creature_template SET AIName="SmartAI" WHERE entry IN(@MARKER1,@MARKER2,@MARKER3); +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@MARKER1,0,0,0,8,0,100,0,35246,0,0,0,33,@MARKER1,0,0,0,0,0,7,0,0,0,0.0,0.0,0.0,0.0,"Surveying Marker One - On Spellhit - Quest Credit"), +(@MARKER2,0,0,0,8,0,100,0,35246,0,0,0,33,@MARKER2,0,0,0,0,0,7,0,0,0,0.0,0.0,0.0,0.0,"Surveying Marker Two - On Spellhit - Quest Credit"), +(@MARKER3,0,0,0,8,0,100,0,35246,0,0,0,33,@MARKER3,0,0,0,0,0,7,0,0,0,0.0,0.0,0.0,0.0,"Surveying Marker Three - On Spellhit - Quest Credit"); diff --git a/sql/updates/world/2013_11_03_01_world_sai.sql b/sql/updates/world/2013_11_03_01_world_sai.sql new file mode 100644 index 00000000000..61c95db4e62 --- /dev/null +++ b/sql/updates/world/2013_11_03_01_world_sai.sql @@ -0,0 +1,18 @@ +-- +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN(18849,19008); + +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (18849,19008); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(18849, 0, 0, 0, 8, 0, 100, 0, 33067, 0, 0, 0, 33, 18849 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Invis Alliance Siege Engine - East - On Spellhit - Kill Credit'), +(19008, 0, 0, 0, 8, 0, 100, 0, 33067, 0, 0, 0, 33, 19008 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Invis Alliance Siege Engine - West - On Spellhit - Kill Credit'); + +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN(15941,15945,28352,28064,28304,28305); + +DELETE FROM `smart_scripts` WHERE `entryorguid` IN(15941,15945,28352,28064,28304,28305); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(15941, 0, 0, 0, 8, 0, 100, 0, 27907, 0, 15000, 15000, 33, 15941 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Apprentice Ralen - On Spellhit - Kill Credit'), +(15945, 0, 0, 0, 8, 0, 100, 0, 27907, 0, 15000, 15000, 33, 15945 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Apprentice Meledor - On Spellhit - Kill Credit'), +(28352, 0, 0, 0, 8, 0, 100, 0, 51381, 0, 180000, 180000, 33, 28352 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Nethurbian Crater KC Bunny - On Spellhit - Kill Credit'), +(28064, 0, 0, 0, 8, 0, 100, 0, 51247, 0, 0, 0, 33, 28064 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Drakkari Pedestal 01 - On Spellhit - Kill Credit'), +(28304, 0, 0, 0, 8, 0, 100, 0, 51247, 0, 0, 0, 33, 28304 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Drakkari Pedestal 02 - On Spellhit - Kill Credit'), +(28305, 0, 0, 0, 8, 0, 100, 0, 51247, 0, 0, 0, 33, 28305 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Drakkari Pedestal 03 - On Spellhit - Kill Credit'); diff --git a/sql/updates/world/2013_11_03_02_world_gameobject_335.sql b/sql/updates/world/2013_11_03_02_world_gameobject_335.sql new file mode 100644 index 00000000000..d25f702ce73 --- /dev/null +++ b/sql/updates/world/2013_11_03_02_world_gameobject_335.sql @@ -0,0 +1,6 @@ +-- +SET @GGUID=5289; + +DELETE FROM `gameobject` WHERE `id`=181632; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(@GGUID,181632,1,1,1,-4511.94,-781.874,-41.5711,6.04346,0,0,0.119574,-0.992825,300,0,1); diff --git a/sql/updates/world/2013_11_03_03_world_creature_template.sql b/sql/updates/world/2013_11_03_03_world_creature_template.sql new file mode 100644 index 00000000000..cab7574ed7f --- /dev/null +++ b/sql/updates/world/2013_11_03_03_world_creature_template.sql @@ -0,0 +1,12 @@ +-- IoC template updates +UPDATE creature_template SET difficulty_entry_1 = 35415 WHERE entry = 34775; +UPDATE creature_template SET difficulty_entry_1 = 35433 WHERE entry = 35069; +UPDATE creature_template SET difficulty_entry_1 = 35413 WHERE entry = 34793; +UPDATE creature_template SET difficulty_entry_1 = 35421 WHERE entry = 35273; +UPDATE creature_template SET difficulty_entry_1 = 35429 WHERE entry = 34944; +UPDATE creature_template SET difficulty_entry_1 = 35401 WHERE entry = 34919; +UPDATE creature_template SET difficulty_entry_1 = 35403 WHERE entry = 34924; +UPDATE creature_template SET difficulty_entry_1 = 35407 WHERE entry = 34918; +UPDATE creature_template SET difficulty_entry_1 = 35405 WHERE entry = 34922; +UPDATE creature_template SET difficulty_entry_1 = 35431 WHERE entry = 34776; +UPDATE creature_template SET difficulty_entry_1 = 35419 WHERE entry = 34802; diff --git a/sql/updates/world/2013_11_03_04_world_creature_template.sql b/sql/updates/world/2013_11_03_04_world_creature_template.sql new file mode 100644 index 00000000000..9dfe9bfbe98 --- /dev/null +++ b/sql/updates/world/2013_11_03_04_world_creature_template.sql @@ -0,0 +1,8 @@ +-- +UPDATE `creature_template` SET `spell1` = 0 WHERE `entry` IN(314, 619, 657, 660, 670, 677, 699, 731, 762, 771, 784, 942, 950, 1029, 1144, 1726, 1808, 1831, 1909, 1912, 1913, 1915, 2071, 2169, 2272, 2534, 2555, 2598, 2894, 3252, 3253, 3416, 3458, 3748, 3750, 3771, 3863, 3922, 3927, 3993, 4057, 4297, 4380, 4440, 4518, 4519, 5451, 5650, 5712, 5715, 5715, 5715, 5822, 5836, 5865, 6212, 6228, 6286, 6427, 7206, 7441, 7738, 7738, 7738, 8551, 8553, 8555, 8978, 9016, 9024, 9257, 9266, 11076, 11077, 11466, 11582, 11613, 11882, 12225, 15430, 15439, 16925, 16944, 17129, 17235, 17395, 18064, 18257, 18327, 18413, 19754, 20109, 20866, 21468, 21804, 21859, 22265, 23051, 5348, 18679, 20691, 24860, 23593, 27664, 40281); +UPDATE `creature_template` SET `spell2` = 0 WHERE `entry` IN(458, 670, 815, 1041, 2337, 2358, 2553, 2555, 2654, 2755, 2894, 3198, 3199, 3203, 3265, 3458, 3728, 3771, 3854, 3927, 4440, 4518, 4519, 4520, 4522, 4530, 4668, 4718, 4811, 5457, 5650, 5836, 6168, 6286, 7441, 7607, 9266, 10374, 11324, 11388, 11668, 13280, 14530, 16345, 16873, 16911, 16912, 17320, 17395, 18037, 18326, 18696, 18859, 19405, 19792, 19987, 19992, 21050, 21710, 22384, 15328, 16184, 21229); +UPDATE `creature_template` SET `spell3` = 0 WHERE `entry` IN(332, 397, 642, 660, 669, 679, 1057, 1364, 1564, 2358, 2534, 2553, 2570, 3725, 3927, 4532, 4813, 4852, 5717, 6008, 6231, 7342, 7728, 7795, 9266, 10596, 11496, 13282, 14523, 16021, 16449, 16473, 18069, 18080, 18210, 18312, 19405, 19424, 19544, 19747, 19806, 19992, 19998, 20248, 20445, 20459, 20929, 21178, 22018, 22363, 22821, 15328, 15863, 16054, 20648, 20302, 22910, 18617, 37575); +UPDATE `creature_template` SET `spell4` = 0 WHERE `entry` IN(397, 1060, 1564, 2590, 3899, 4463, 4852, 7271, 7607, 9039, 10321, 10419, 13280, 16146, 19298, 19994, 20648, 20302, 20301); +UPDATE `creature_template` SET `spell5` = 0 WHERE `entry` = 27678; +UPDATE `creature_template` SET `spell6` = 0 WHERE `entry` = 28668; +UPDATE `creature_template` SET `spell8` = 0 WHERE `entry` IN(16573, 29256); diff --git a/sql/updates/world/2013_11_03_05_world_gameobject.sql b/sql/updates/world/2013_11_03_05_world_gameobject.sql new file mode 100644 index 00000000000..6c2aa246b98 --- /dev/null +++ b/sql/updates/world/2013_11_03_05_world_gameobject.sql @@ -0,0 +1,6 @@ +-- +SET @GGUID=5338; + +DELETE FROM `gameobject` WHERE `id`=181632 AND `guid`=5338; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(@GGUID, 194905,603,3,1,401.308,-13.8236,409.524,3.14159,0,0,0,0,604800,0,0); diff --git a/sql/updates/world/2013_11_03_06_world_conditions.sql b/sql/updates/world/2013_11_03_06_world_conditions.sql new file mode 100644 index 00000000000..0be141bf2e8 --- /dev/null +++ b/sql/updates/world/2013_11_03_06_world_conditions.sql @@ -0,0 +1,9 @@ +-- Skill requirements for Flying Carpets and Flying Machines +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry` IN (75596,61309,61451,44153,44151); + +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(17, 0, 75596, 0, 0, 7, 0, 197, 425, 0, 0, 0, 0, '', 'Player has must have Tailoring with skill level 425 to Ride Frosty Flying Carpet'), +(17, 0, 61309, 0, 0, 7, 0, 197, 425, 0, 0, 0, 0, '', 'Player has must have Tailoring with skill level 425 to Ride Magnificent Flying Carpet'), +(17, 0, 61451, 0, 0, 7, 0, 197, 300, 0, 0, 0, 0, '', 'Player has must have Tailoring with skill level 300 to Ride Flying Carpet'), +(17, 0, 44153, 0, 0, 7, 0, 202, 300, 0, 0, 0, 0, '', 'Player has must have Engineering with skill level 300 to Ride Flying Machine'), +(17, 0, 44151, 0, 0, 7, 0, 202, 375, 0, 0, 0, 0, '', 'Player has must have Engineering with skill level 375 to Ride Turbo-Charged Flying Machine'); diff --git a/sql/updates/world/2013_11_03_07_world_sai.sql b/sql/updates/world/2013_11_03_07_world_sai.sql new file mode 100644 index 00000000000..13812b190d5 --- /dev/null +++ b/sql/updates/world/2013_11_03_07_world_sai.sql @@ -0,0 +1,2 @@ +-- +UPDATE `smart_scripts` SET `event_param1`=489 WHERE `entryorguid`=2150 AND `source_type`=0 AND `id`=0; diff --git a/sql/updates/world/2013_11_03_08_world_creature_template.sql b/sql/updates/world/2013_11_03_08_world_creature_template.sql new file mode 100644 index 00000000000..87cd001dc1a --- /dev/null +++ b/sql/updates/world/2013_11_03_08_world_creature_template.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=32535; diff --git a/sql/updates/world/2013_11_03_09_world_sai.sql b/sql/updates/world/2013_11_03_09_world_sai.sql new file mode 100644 index 00000000000..a2c31c41c03 --- /dev/null +++ b/sql/updates/world/2013_11_03_09_world_sai.sql @@ -0,0 +1,3 @@ +-- +UPDATE `smart_scripts` SET `event_param3`=103900, `event_param4`=103900 WHERE `entryorguid`=28566 AND `source_type`=0 AND `id`=3 AND `link`=0; +UPDATE `smart_scripts` SET `event_flags`=0 WHERE `entryorguid`=28566 AND `source_type`=0 AND `id` IN(3,4,5,6) AND `link`=0; diff --git a/sql/updates/world/2013_11_03_10_world_quest_template.sql b/sql/updates/world/2013_11_03_10_world_quest_template.sql new file mode 100644 index 00000000000..6f200a9c47b --- /dev/null +++ b/sql/updates/world/2013_11_03_10_world_quest_template.sql @@ -0,0 +1,3 @@ +-- +UPDATE `quest_template` SET `RequiredClasses`=431 WHERE `Id` IN (24553,24564,24594); +UPDATE `quest_template` SET `RequiredClasses`=1104 WHERE `Id` IN (24595,24596,24598,24799); diff --git a/sql/updates/world/2013_11_03_11_world_creature_text.sql b/sql/updates/world/2013_11_03_11_world_creature_text.sql new file mode 100644 index 00000000000..d7a237d3a72 --- /dev/null +++ b/sql/updates/world/2013_11_03_11_world_creature_text.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_text` SET `entry`=23622 WHERE `entry`=23616 AND `groupid`=2 AND `id`=0; diff --git a/sql/updates/world/2013_11_03_12_world_sai.sql b/sql/updates/world/2013_11_03_12_world_sai.sql new file mode 100644 index 00000000000..780ad3d0886 --- /dev/null +++ b/sql/updates/world/2013_11_03_12_world_sai.sql @@ -0,0 +1,12 @@ +-- DB/Quest: Fix: A Dark Influence (12220) | by wintergreen77 +SET @SPELL := 48218; -- Sampling Energy +SET @NPC_HEART := 27263; -- Vordrassil's Heart Credit +SET @NPC_LIMB := 27264; -- Vordrassil's Limb Credit +SET @NPC_TEARS := 27265; -- Vordrassil's Tears Credit + +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (@NPC_HEART, @NPC_LIMB, @NPC_TEARS); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@NPC_HEART, @NPC_LIMB, @NPC_TEARS) AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(@NPC_HEART, 0, 0, 0, 8, 0, 100, 0, @SPELL, 0, 0, 0, 33, @NPC_HEART, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'On Spellhit - Give Vordrasill''s Heart Kill credit - Action Invoker'), +(@NPC_LIMB, 0, 0, 0, 8, 0, 100, 0, @SPELL, 0, 0, 0, 33, @NPC_LIMB, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'On Spellhit - Give Vordrasill''s Limb Kill credit - Action Invoker'), +(@NPC_TEARS, 0, 0, 0, 8, 0, 100, 0, @SPELL, 0, 0, 0, 33, @NPC_TEARS, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'On Spellhit - Give Vordrasill''s Tears Kill credit - Action Invoker'); diff --git a/sql/updates/world/2013_11_03_13_world_sai.sql b/sql/updates/world/2013_11_03_13_world_sai.sql new file mode 100644 index 00000000000..9f6bb7289bc --- /dev/null +++ b/sql/updates/world/2013_11_03_13_world_sai.sql @@ -0,0 +1,36 @@ +-- +DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (25416,25418); +DELETE FROM `creature_ai_texts` WHERE `entry` IN (-487,-488,-489,-498,-499,-500,-501); + +UPDATE `creature_template` SET `ainame`='SmartAI' WHERE `entry` IN (25416,25418); + +DELETE FROM `creature_text` WHERE `entry` IN (25416,25418); +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(25416,0,0,'Who dares?',12,0,0,0,0,0,''), +(25416,1,0,'STOP!',12,0,0,0,0,0,''), +(25416,2,0,'Tell Imperean that I will consider a cessation of hostilities. But first, Churn must stop his watery intrusions upon my rise!',12,0,0,0,0,0,''), +(25416,3,0,'I grow bored with you. Begone!',12,0,0,0,0,0,''), +(25418,0,0,'I... submit. As long as Simmer agrees to stop boiling my pool, I agree to an armistice.',12,0,0,0,0,0,''), +(25418,1,0,'Now, remove yourself from my presence. You would be wise not to come within sight of me again.',12,0,0,0,0,0,''), +(25418,2,0,'WAIT... NO MORE!',12,0,0,0,0,0,''); + +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25416,25418) AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(25416,0,0,1,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Simmer - On Aggro - Say line 0'), +(25416,0,1,0,61,0,100,0,0,0,0,0,42,0,5,0,0,0,0,1,0,0,0,0,0,0,0,'Simmer - Link With Event 0 - Set Invincible HP'), +(25416,0,2,0,0,0,100,1,5000,5000,5000,5000,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Simmer - IC - Say Line 2 After 5 secs'), +(25416,0,3,0,0,0,100,1,10000,10000,10000,10000,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Simmer - IC - Say Line 3 After 10 secs'), +(25416,0,4,5,2,0,100,1,0,5,0,0,85,45599,0,0,0,0,0,7,0,0,0,0,0,0,0,'Simmer - At 5 % HP - Give Quest Credit'), +(25416,0,5,6,61,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Simmer - Link With Event 4 - Say Line 1'), +(25416,0,6,7,61,0,100,0,0,0,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,'Simmer - Link With Event 5 - Change Faction'), +(25416,0,7,0,61,0,100,0,0,0,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Simmer - Link With Event 6 - Evade'), +(25416,0,8,0,1,0,100,0,120000,120000,120000,120000,2,1983,0,0,0,0,0,1,0,0,0,0,0,0,0,'Simmer - OOC - Change Faction After 2 mins'), +(25418,0,0,0,0,0,100,0,5300,5300,9900,9900,11,50206,0,0,0,0,0,2,0,0,0,0,0,0,0,'Churn - IC - Cast Scalding Steam'), +(25418,0,1,0,4,0,100,0,0,0,0,0,42,0,5,0,0,0,0,1,0,0,0,0,0,0,0,'Churn - On Aggro - Set Invincible HP'), +(25418,0,2,0,0,0,100,1,5000,5000,5000,5000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Churn - IC - Say Line 0 After 5 secs'), +(25418,0,3,0,0,0,100,1,10000,10000,10000,10000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Churn - IC - Say Line 1 After 10 secs'), +(25418,0,4,5,2,0,100,1,0,5,0,0,85,45598,0,0,0,0,0,7,0,0,0,0,0,0,0,'Churn - At 5 % HP - Give Quest Credit'), +(25418,0,5,6,61,0,100,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Churn - Link With Event 4 - Say Line 2'), +(25418,0,6,7,61,0,100,0,0,0,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,'Churn - Link With Event 5 - Change Faction'), +(25418,0,7,0,61,0,100,0,0,0,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Churn - Link With Event 6 - Evade'), +(25418,0,8,0,1,0,100,0,120000,120000,120000,120000,2,1984,0,0,0,0,0,1,0,0,0,0,0,0,0,'Churn - OOC - Change Faction After 2 mins'); diff --git a/sql/updates/world/2013_11_03_14_world_sai.sql b/sql/updates/world/2013_11_03_14_world_sai.sql new file mode 100644 index 00000000000..7b137662274 --- /dev/null +++ b/sql/updates/world/2013_11_03_14_world_sai.sql @@ -0,0 +1,8 @@ +-- +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` =25654; + +DELETE FROM `smart_scripts` WHERE `entryorguid` =25654 AND `source_type`=0; + +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(25654,0,0,0,8,0,100,0,45835,0,0,0,11,45837,0,0,0,0,0,7,0,0,0,0,0,0,0,'Stop the Plague Kill Credit Bunny - On Spell Hit (Bixies Inhibiting Powder) - Give Quest Credit'), +(25654,0,1,0,8,0,100,0,45834,0,0,0,11,45837,0,0,0,0,0,7,0,0,0,0,0,0,0,'Stop the Plague Kill Credit Bunny - On Spell Hit (Highmesas Cleansing Seeds) - Give Quest Credit'); diff --git a/sql/updates/world/2013_11_03_15_world_quest_template.sql b/sql/updates/world/2013_11_03_15_world_quest_template.sql new file mode 100644 index 00000000000..f9a7819f3c1 --- /dev/null +++ b/sql/updates/world/2013_11_03_15_world_quest_template.sql @@ -0,0 +1,17 @@ +-- A Valiant`s Field Training (All) (Horde) progress +UPDATE `quest_template` SET `RequestItemsText` = 'A good day of training will never hurt anyone. It''s good to see you keeping up.' WHERE `id` IN (13765, 13771, 13776, 13781, 13786); + +-- Taking Battle To The Enemy (Horde and Alliance) progress +UPDATE `quest_template` SET `RequestItemsText` = 'Have you tested yourself in combat against the Scourge?' WHERE `id` IN (13813, 13791); + +-- Stop The Aggressors (Horde) progress +UPDATE `quest_template` SET `RequestItemsText` = 'Have you shown the Kvaldir that we will not let them threaten us?' WHERE `id` = 14140; + +-- You`ve Really Done It This Time, Kul (Horde) progress +UPDATE `quest_template` SET `RequestItemsText` = 'Did you free Kul and those hopeless aspirants?' WHERE `id` = 14142; + +-- Threat From Above (Horde) progress +UPDATE `quest_template` SET `RequestItemsText` = 'Have you defeated the Cult of the Damned raiding party?' WHERE `id` = 13812; + +-- Rescue at Sea (Horde) progress +UPDATE `quest_template` SET `RequestItemsText` = 'Have you helped fend off the Kvaldir attack?' WHERE `id` = 14136; diff --git a/sql/updates/world/2013_11_03_16_world_sai.sql b/sql/updates/world/2013_11_03_16_world_sai.sql new file mode 100644 index 00000000000..ea5ac909a40 --- /dev/null +++ b/sql/updates/world/2013_11_03_16_world_sai.sql @@ -0,0 +1,12 @@ +-- +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI', `ScriptName`='' WHERE `entry`=177673; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` =12369; + +DELETE FROM `smart_scripts` WHERE `entryorguid` =177673 AND `source_type`=1 OR `entryorguid`=17767300 AND `source_type`=9 OR `entryorguid`=12369 AND `source_type`=0; + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(177673, 1, 0 ,1, 70, 0, 100, 0, 2, 0, 0,0,80,17767300,2,0,0,0,0,1,0,0,0,0,0,0,0, 'Serpent Statue - On State Changed - Run Script'), +(17767300, 9, 0 ,0, 0, 0, 100, 0, 5000, 5000, 0,0,12,12369,1,180000,0,0,0,8,0,0,0,254.166855,2966.883545,1.367331,0.957399, 'Serpent Statue - Script - Spawn Lord Kragaru'), +(17767300, 9, 1 ,0, 0, 0, 100, 0, 185000, 185000, 0,0,32,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Serpent Statue - Script - Reset Go'), +(12369, 0, 0 ,0, 9, 0, 100, 0, 0, 5, 3000,4000,11,15496,0,0,0,0,0,7,0,0,0,0, 0, 0, 0, 'Lord Kragaru - On Range - Cast Cleave'), +(12369, 0, 1 ,0, 13, 0, 100, 0, 10000, 15000, 0,0,11,12555,0,0,0,0,0,7,0,0,0,0, 0, 0, 0, 'Lord Kragaru - On Target Casting - Cast Pummel'); diff --git a/sql/updates/world/2013_11_03_17_world_gameobject.sql b/sql/updates/world/2013_11_03_17_world_gameobject.sql new file mode 100644 index 00000000000..a762e0c461f --- /dev/null +++ b/sql/updates/world/2013_11_03_17_world_gameobject.sql @@ -0,0 +1,2 @@ +-- +UPDATE gameobject SET `phaseMask`=3 WHERE `id`=201367; diff --git a/sql/updates/world/2013_11_03_18_world_disables.sql b/sql/updates/world/2013_11_03_18_world_disables.sql new file mode 100644 index 00000000000..910a7527441 --- /dev/null +++ b/sql/updates/world/2013_11_03_18_world_disables.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `disables` WHERE `sourceType` = 0 AND `entry` = 54114; +INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES +(0, 54114, 64, 0, 0, 'Heart of the Phoenix uses Cooldown, but won''t work through LoS, so ignore LoS.'); diff --git a/sql/updates/world/2013_11_03_19_world_misc.sql b/sql/updates/world/2013_11_03_19_world_misc.sql new file mode 100644 index 00000000000..7a5e4f9d7d5 --- /dev/null +++ b/sql/updates/world/2013_11_03_19_world_misc.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM spell_scripts WHERE id=26373; +DELETE FROM spell_linked_spell WHERE spell_trigger=26373; +INSERT INTO spell_linked_spell VALUES (26373,26448,0,'Lunar Festival Invitation - Teleport Moonglade'); diff --git a/sql/updates/world/2013_11_03_20_world_disables.sql b/sql/updates/world/2013_11_03_20_world_disables.sql new file mode 100644 index 00000000000..68f28f1741d --- /dev/null +++ b/sql/updates/world/2013_11_03_20_world_disables.sql @@ -0,0 +1,5 @@ +-- +DELETE FROM `disables` WHERE `sourceType`=0 AND `entry`IN(69922,69956); +INSERT INTO `disables`(`sourceType`,`entry`,`flags`,`comment`) VALUES +(0,69922,64,'Ignore LOS on Temper Quel Delar'), +(0,69956,64,'Ignore LOS on Return Tempered Quel Delar'); diff --git a/sql/updates/world/2013_11_03_20_world_spell_area.sql b/sql/updates/world/2013_11_03_20_world_spell_area.sql new file mode 100644 index 00000000000..e633c7d8a38 --- /dev/null +++ b/sql/updates/world/2013_11_03_20_world_spell_area.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `spell_area` WHERE `spell`=71313; +INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES +(71313, 4862, 24461, 24522, 0, 0, 2, 1, 74, 11); diff --git a/sql/updates/world/2013_11_03_22_world_creature_questender.sql b/sql/updates/world/2013_11_03_22_world_creature_questender.sql new file mode 100644 index 00000000000..4db3e910070 --- /dev/null +++ b/sql/updates/world/2013_11_03_22_world_creature_questender.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_questender` SET `id`=27872 WHERE `quest`=12474; diff --git a/sql/updates/world/2013_11_03_23_world_creature_template.sql b/sql/updates/world/2013_11_03_23_world_creature_template.sql new file mode 100644 index 00000000000..2bb892c1801 --- /dev/null +++ b/sql/updates/world/2013_11_03_23_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Bros. Before Ho Ho Ho's fix by nelegalno +UPDATE `creature_template` SET `type_flags`=4096 WHERE `entry` IN (5661,26044,739,927,1182,1351,1444,5484,5489,8140,12336); diff --git a/sql/updates/world/2013_11_03_24_world_misc.sql b/sql/updates/world/2013_11_03_24_world_misc.sql new file mode 100644 index 00000000000..12859a2578d --- /dev/null +++ b/sql/updates/world/2013_11_03_24_world_misc.sql @@ -0,0 +1,13 @@ +-- +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN(17111,17112,17113); + +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (17111,17112,17113); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(17111, 0, 0, 0, 8, 0, 100, 0, 29916, 0, 0, 0, 33, 17111 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Captive Jaguar - On Spellhit - Kill Credit'), +(17112, 0, 0, 0, 8, 0, 100, 0, 29916, 0, 0, 0, 33, 17112 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Captive Tarantula - On Spellhit - Kill Credit'), +(17113, 0, 0, 0, 8, 0, 100, 0, 29916, 0, 0, 0, 33, 17113 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Captive Crocolisk - On Spellhit - Kill Credit'); + +DELETE FROM `disables` WHERE `sourceType`=0 AND `entry`IN (29916,29917); +INSERT INTO `disables`(`sourceType`,`entry`,`flags`,`comment`) VALUES +(0,29917,64,'Ignore LOS on Feed Captured Animal'), +(0,29916,64,'Ignore LOS on Feed Captured Animal'); diff --git a/sql/updates/world/2013_11_03_25_world_misc.sql b/sql/updates/world/2013_11_03_25_world_misc.sql new file mode 100644 index 00000000000..c5996949257 --- /dev/null +++ b/sql/updates/world/2013_11_03_25_world_misc.sql @@ -0,0 +1,2 @@ +-- +UPDATE `smart_scripts` SET `event_type`=0 WHERE `entryorguid`=6066 AND `source_type`=0 AND `id`=0 AND `link`=0; diff --git a/sql/updates/world/2013_11_03_26_world_misc.sql b/sql/updates/world/2013_11_03_26_world_misc.sql new file mode 100644 index 00000000000..e9b7cd504b3 --- /dev/null +++ b/sql/updates/world/2013_11_03_26_world_misc.sql @@ -0,0 +1,343 @@ +-- Rewrite [Qs] Gruesome, But Necessary /11257-H,11246-A /using some of old event data, fix visual bugs, death states, adds conditions +-- Rewrite scripts from EAI to SAI to add spells to the Winterskorn creatures, add some that are missing at all, add texts, fix dynamicflags, remove pointless phasing that created some bugs +SET @Tribesman:= 23661; +SET @Woodsman := 23662; +SET @Shield_Maiden := 23663; +SET @Warrior := 23664; +SET @Raider := 23665; +SET @Berserker := 23666; +SET @Rune_Seer := 23667; +SET @Rune_Caster := 23668; +SET @Oracle := 23669; +SET @Elder := 23670; +SET @Dismember := 43036; +SET @Transform := 43059; +SET @Credit := 43037; + +-- Delete the old EAIs while using part of their data +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@Tribesman; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@Woodsman; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@Shield_Maiden; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@Warrior; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@Raider; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@Berserker; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@Rune_Seer; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@Rune_Caster; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@Oracle; + +-- Winterskorn Tribesman +UPDATE `creature_template` SET `AIName`='SmartAI ' WHERE `entry`=@Tribesman; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Tribesman; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@Tribesman,0,0,1,8,0,100,0,@Dismember,0,0,0,11,@Transform,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Tribesman - On hit by spell Dismember - Cast spell trasnform on self'), +(@Tribesman,0,1,0,61,0,100,0,0,0,0,0,11,@Credit,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Tribesman - Linked with previous event - Cast kill credit to player'), +(@Tribesman,0,2,0,0,0,100,0,1000,15000,7200,35000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Tribesman - IC - Say random text from id 0'); + +-- Winterskorn Woodsman +UPDATE `creature_template` SET `AIName`='SmartAI ' WHERE `entry`=@Woodsman; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Woodsman; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@Woodsman,0,0,0,0,0,100,0,100,1000,5000,14500,11,38557,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Woodsman - IC - Cast spell Throw on victim'), +(@Woodsman,0,1,0,0,0,100,0,1000,4500,4900,8100,11,43410,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Woodsman - IC - Cast spell Chop on victim'), +(@Woodsman,0,2,3,8,0,100,0,@Dismember,0,0,0,11,@Transform,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Woodsman - On hit by spell Dismember - Cast spell trasnform on self'), +(@Woodsman,0,3,0,61,0,100,0,0,0,0,0,11,@Credit,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Woodsman - Linked with previous event - Cast kill credit to player'), +(@Woodsman,0,4,0,0,0,100,0,1000,15000,7200,35000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Woodsman - IC - Say random text from id 0'); + +-- Winterskorn Shield-Maiden +UPDATE `creature_template` SET `AIName`='SmartAI ' WHERE `entry`=@Shield_Maiden; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Shield_Maiden; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@Shield_Maiden,0,0,0,0,0,100,0,1000,2000,6000,14500,11,43416,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Shield_Maiden - IC - Throw Shield'), +(@Shield_Maiden,0,1,2,8,0,100,0,@Dismember,0,0,0,11,@Transform,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Shield_Maiden - On hit by spell Dismember - Cast spell trasnform on self'), +(@Shield_Maiden,0,2,0,61,0,100,0,0,0,0,0,11,@Credit,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Shield_Maiden - Linked with previous event - Cast kill credit to player'), +(@Shield_Maiden,0,3,0,0,0,100,0,1000,15000,7200,35000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Shield_Maiden - IC - Say random text from id 0'), +(@Shield_Maiden,0,4,0,1,0,100,0,0,60000,15000,70000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Shield_Maiden - OOC - Say random text from id 1'); + +-- Winterskorn Warrior +UPDATE `creature_template` SET `AIName`='SmartAI ' WHERE `entry`=@Warrior; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Warrior; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@Warrior,0,0,1,8,0,100,0,@Dismember,0,0,0,11,@Transform,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Warrior - On hit by spell Dismember - Cast spell trasnform on self'), +(@Warrior,0,1,0,61,0,100,0,0,0,0,0,11,@Credit,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Warrior - Linked with previous event - Cast kill credit to player'), +(@Warrior,0,2,0,0,0,100,0,1000,15000,7200,35000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Warrior - IC - Say random text from id 0'), +(@Warrior,0,3,0,1,0,100,0,0,60000,15000,70000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Warrior - OOC - Say random text from id 1'); + +-- Winterskorn Raider +UPDATE `creature_template` SET `InhabitType`=`InhabitType`|1,`AIName`='SmartAI ' WHERE `entry`=@Raider; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Raider; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@Raider,0,0,0,13,0,100,0,4500,14000,0,0,11,11978,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Raider - On target casting spell - Cast kick to interrupt and silence'), +(@Raider,0,1,2,8,0,100,0,@Dismember,0,0,0,11,@Transform,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Raider - On hit by spell Dismember - Cast spell trasnform on self'), +(@Raider,0,2,0,61,0,100,0,0,0,0,0,11,@Credit,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Raider - Linked with previous event - Cast kill credit to player'), +(@Raider,0,3,0,0,0,100,0,1000,15000,7200,35000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Raider - IC - Say random text from id 0'), +(@Raider,0,4,0,1,0,100,0,0,60000,15000,70000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Raider - OOC - Say random text from id 1'); + +-- Winterskorn Berserker +UPDATE `creature_template` SET dynamicflags=8,`AIName`='SmartAI ' WHERE `entry`=@Berserker; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Berserker; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@Berserker,0,0,1,8,0,100,0,@Dismember,0,0,0,11,@Transform,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Berserker - On hit by spell Dismember - Cast spell trasnform on self'), +(@Berserker,0,1,0,61,0,100,0,0,0,0,0,11,@Credit,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Berserker - Linked with previous event - Cast kill credit to player'), +(@Berserker,0,2,0,0,0,100,0,1000,15000,7200,35000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Berserker - IC - Say random text from id 0'), +(@Berserker,0,3,0,1,0,100,0,0,60000,15000,70000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Berserker- OOC - Say random text from id 1'); + +-- Winterskorn Rune-Seer +UPDATE `creature_template` SET `AIName`='SmartAI ' WHERE `entry`=@Rune_Seer; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Rune_Seer; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@Rune_Seer,0,0,0,0,0,100,0,1000,3500,8000,12000,11,43453,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Rune_Seer - IC - Cast spell Rune Ward on self'), +(@Rune_Seer,0,1,0,0,0,100,0,1500,4500,2900,8000,11,43083,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Rune_Seer - IC - Cast spell Frostbolt on victim'), +(@Rune_Seer,0,2,0,0,0,100,0,100,4500,10000,14500,11,34787,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Rune_Seer - IC - Cast spell Freezing circle victim /aoe/'), +(@Rune_Seer,0,3,0,2,0,100,0,10,90,7500,20100,11,11986,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Rune_Seer - On HP% - Cast spell Healing wave on self'), +(@Rune_Seer,0,4,0,14,0,100,0,1000,20,8000,18000,11,11986,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Rune_Seer - On friednly HP deficit - Cast spell Healing wave on ally'), +(@Rune_Seer,0,5,6,8,0,100,0,@Dismember,0,0,0,11,@Transform,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Rune_Seer - On hit by spell Dismember - Cast spell trasnform on self'), +(@Rune_Seer,0,6,0,61,0,100,0,0,0,0,0,11,@Credit,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Rune_Seer - Linked with previous event - Cast kill credit to player'), +(@Rune_Seer,0,7,0,0,0,100,0,1000,15000,7200,35000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Rune_Seer - IC - Say random text from id 0'); + +-- Winterskorn Rune-Caster +UPDATE `creature_template` SET dynamicflags=8,`AIName`='SmartAI ' WHERE `entry`=@Rune_Caster; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Rune_Caster; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@Rune_Caster,0,0,0,0,0,100,0,1000,3500,3000,9000,11,43083,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Rune_Caster - IC - Cast spell Frostbolt'), +(@Rune_Caster,0,1,0,0,0,100,0,2500,6500,8000,11000,11,12548,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Rune_Caster - IC - Cast spell Frost Shock'), +(@Rune_Caster,0,2,0,0,0,100,0,0,5500,8000,12500,11,37798,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Rune_Caster - IC - Cast spell Exploding Rune'), +(@Rune_Caster,0,3,4,8,0,100,0,@Dismember,0,0,0,11,@Transform,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Rune_Caster - On hit by spell Dismember - Cast spell trasnform on self'), +(@Rune_Caster,0,4,0,61,0,100,0,0,0,0,0,11,@Credit,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Rune_Caster - Linked with previous event - Cast kill credit to player'), +(@Rune_Caster,0,5,0,0,0,100,0,1000,15000,7200,35000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Rune_Caster - IC - Say random text from id 0'); + +-- Winterskorn Oracle +UPDATE `creature_template` SET dynamicflags=8,`AIName`='SmartAI ' WHERE `entry`=@Oracle; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Oracle; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@Oracle,0,0,0,0,0,100,0,1000,3500,3000,9000,11,43083,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Oracle - IC - Cast spell Frostbolt'), +(@Oracle,0,1,2,8,0,100,0,@Dismember,0,0,0,11,@Transform,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Oracle - On hit by spell Dismember - Cast spell trasnform on self'), +(@Oracle,0,2,0,61,0,100,0,0,0,0,0,11,@Credit,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Oracle - Linked with previous event - Cast kill credit to player'), +(@Oracle,0,3,0,0,0,100,0,1000,15000,7200,35000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Oracle - IC - Say random text from id 0'); + +-- Winterskorn Elder +UPDATE `creature_template` SET dynamicflags=8,`AIName`='SmartAI ' WHERE `entry`=@Elder; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Elder; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@Elder,0,0,0,0,0,100,0,0,500,120000,120000,11,32734,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Elder - IC - Cast spell Eearth Shield'), +(@Elder,0,1,0,0,0,100,0,2000,3800,3000,8500,11,9532,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Elder - IC - Cast spell Lightening bolt'), +(@Elder,0,2,0,2,0,100,0,10,90,7500,20100,11,11986,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Elder - On HP% - Cast spell Healing wave on self'), +(@Elder,0,3,0,14,0,100,0,1000,20,8000,18000,11,11986,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Elder - On friednly HP deficit - Cast spell Healing wave on ally'), +(@Elder,0,4,0,6,0,100,0,0,0,0,0,28,32734,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Elder - On death - Remove auras from Eearth Shield'), +(@Elder,0,5,6,8,0,100,0,@Dismember,0,0,0,11,@Transform,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Elder - On hit by spell Dismember - Cast spell trasnform on self'), +(@Elder,0,6,0,61,0,100,0,0,0,0,0,11,@Credit,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Elder - Linked with previous event - Cast kill credit to player'), +(@Elder,0,7,0,0,0,100,0,1000,15000,7200,35000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Elder - IC - Say random text from id 0'); + +-- Add conditions for Dismember - cannot be used on Transformed units +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=@Dismember; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition` ,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(17,0,@Dismember,0,0,1,1,@Transform,0,0,1,0,'','Amulet can target only Iskalder'); + +-- Add texts: +DELETE FROM `creature_text` WHERE `entry`=@Tribesman; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@Tribesman,0,0,'Die, maggot!',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,1,'For Ymiron!',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,2,'Haraak foln!',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,3,'I spit on you!',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,4,'I will break you!',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,5,'I will feed you to the dogs!',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,6,'I will take pleasure in gutting you!',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,7,'I''ll eat your heart!',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,8,'Look what''s come to play.',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,9,'My life for Ymiron!',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,10,'Sniveling pig!',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,11,'There will be no everlasting life for you!',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,12,'Ugglin oo bjorr!',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,13,'YAAARRRGH!',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,14,'You come to die!',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,15,'You tiny creatures disgust me!',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,16,'Your entrails will make a fine necklace.',12,0,100,1,0,0,'Winterskon Tribesman'), +(@Tribesman,0,17,'Your race is a disease upon the world!',12,0,100,1,0,0,'Winterskon Tribesman'); + +DELETE FROM `creature_text` WHERE `entry`=@Woodsman; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@Woodsman,0,0,'Die, maggot!',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,1,'For Ymiron!',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,2,'Haraak foln!',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,3,'I spit on you!',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,4,'I will break you!',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,5,'I will feed you to the dogs!',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,6,'I will take pleasure in gutting you!',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,7,'I''ll eat your heart!',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,8,'Look what''s come to play.',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,9,'My life for Ymiron!',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,10,'Sniveling pig!',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,11,'There will be no everlasting life for you!',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,12,'Ugglin oo bjorr!',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,13,'YAAARRRGH!',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,14,'You come to die!',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,15,'You tiny creatures disgust me!',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,16,'Your entrails will make a fine necklace.',12,0,100,1,0,0,'Winterskon Woodsman'), +(@Woodsman,0,17,'Your race is a disease upon the world!',12,0,100,1,0,0,'Winterskon Woodsman'); + +DELETE FROM `creature_text` WHERE `entry`=@Berserker; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@Berserker,0,0,'Die, maggot!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,1,'For Ymiron!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,2,'Haraak foln!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,3,'I spit on you!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,4,'I will break you!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,5,'I will feed you to the dogs!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,6,'I will take pleasure in gutting you!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,7,'I''ll eat your heart!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,8,'Look what''s come to play.',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,9,'My life for Ymiron!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,10,'Sniveling pig!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,11,'There will be no everlasting life for you!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,12,'Ugglin oo bjorr!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,13,'YAAARRRGH!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,14,'You come to die!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,15,'You tiny creatures disgust me!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,16,'Your entrails will make a fine necklace.',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,0,17,'Your race is a disease upon the world!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,1,0,'Come on, stop trying to hit me and hit me already!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,1,1,'I train better against a target dummy.',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,1,2,'Practice or not, you''re going to spit teeth!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,1,3,'Sure you don''t need a break, old woman?',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,1,4,'When the little ones come, I won''t hold back like I am with you.',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,1,5,'You practice as if you''re still asleep.',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,1,6,'You spar like a girl!',12,0,100,1,0,0,'Winterskon Berserker'), +(@Berserker,1,7,'Your sparring is feeble!',12,0,100,1,0,0,'Winterskon Berserker'); + +DELETE FROM `creature_text` WHERE `entry`=@Warrior; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@Warrior,0,0,'Die, maggot!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,1,'For Ymiron!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,2,'Haraak foln!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,3,'I spit on you!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,4,'I will break you!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,5,'I will feed you to the dogs!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,6,'I will take pleasure in gutting you!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,7,'I''ll eat your heart!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,8,'Look what''s come to play.',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,9,'My life for Ymiron!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,10,'Sniveling pig!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,11,'There will be no everlasting life for you!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,12,'Ugglin oo bjorr!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,13,'YAAARRRGH!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,14,'You come to die!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,15,'You tiny creatures disgust me!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,16,'Your entrails will make a fine necklace.',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,0,17,'Your race is a disease upon the world!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,1,0,'Come on, stop trying to hit me and hit me already!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,1,1,'I train better against a target dummy.',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,1,2,'Practice or not, you''re going to spit teeth!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,1,3,'Sure you don''t need a break, old woman?',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,1,4,'When the little ones come, I won''t hold back like I am with you.',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,1,5,'You practice as if you''re still asleep.',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,1,6,'You spar like a girl!',12,0,100,1,0,0,'Winterskon Warrior'), +(@Warrior,1,7,'Your sparring is feeble!',12,0,100,1,0,0,'Winterskon Warrior'); + +DELETE FROM `creature_text` WHERE `entry`=@Raider; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@Raider,0,0,'Die, maggot!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,1,'For Ymiron!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,2,'Haraak foln!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,3,'I spit on you!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,4,'I will break you!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,5,'I will feed you to the dogs!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,6,'I will take pleasure in gutting you!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,7,'I''ll eat your heart!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,8,'Look what''s come to play.',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,9,'My life for Ymiron!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,10,'Sniveling pig!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,11,'There will be no everlasting life for you!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,12,'Ugglin oo bjorr!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,13,'YAAARRRGH!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,14,'You come to die!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,15,'You tiny creatures disgust me!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,16,'Your entrails will make a fine necklace.',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,0,17,'Your race is a disease upon the world!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,1,0,'Come on, stop trying to hit me and hit me already!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,1,1,'I train better against a target dummy.',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,1,2,'Practice or not, you''re going to spit teeth!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,1,3,'Sure you don''t need a break, old woman?',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,1,4,'When the little ones come, I won''t hold back like I am with you.',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,1,5,'You practice as if you''re still asleep.',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,1,6,'You spar like a girl!',12,0,100,1,0,0,'Winterskon Raider'), +(@Raider,1,7,'Your sparring is feeble!',12,0,100,1,0,0,'Winterskon Raider'); + +DELETE FROM `creature_text` WHERE `entry`=@Shield_Maiden; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@Shield_Maiden,0,0,'Die, maggot!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,1,'For Ymiron!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,2,'Haraak foln!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,3,'I spit on you!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,4,'I will break you!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,5,'I will feed you to the dogs!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,6,'I will take pleasure in gutting you!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,7,'I''ll eat your heart!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,8,'Look what''s come to play.',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,9,'My life for Ymiron!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,10,'Sniveling pig!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,11,'There will be no everlasting life for you!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,12,'Ugglin oo bjorr!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,13,'YAAARRRGH!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,14,'You come to die!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,15,'You tiny creatures disgust me!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,16,'Your entrails will make a fine necklace.',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,0,17,'Your race is a disease upon the world!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,1,0,'Come on, stop trying to hit me and hit me already!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,1,1,'I train better against a target dummy.',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,1,2,'Practice or not, you''re going to spit teeth!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,1,3,'When the little ones come, I won''t hold back like I am with you.',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,1,4,'You practice as if you''re still asleep.',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,1,5,'You spar like a girl!',12,0,100,1,0,0,'Winterskon Shield_Maiden'), +(@Shield_Maiden,1,6,'Your sparring is feeble!',12,0,100,1,0,0,'Winterskon Shield_Maiden'); + +DELETE FROM `creature_text` WHERE `entry`=@Elder; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@Elder,0,0,'For Ymiron!',12,0,100,1,0,0,'Winterskon Elder'), +(@Elder,0,1,'I will break you!',12,0,100,1,0,0,'Winterskon Elder'), +(@Elder,0,2,'I''ll eat your heart!',12,0,100,1,0,0,'Winterskon Elder'), +(@Elder,0,3,'Look what''s come to play.',12,0,100,1,0,0,'Winterskon Elder'), +(@Elder,0,4,'My life for Ymiron!',12,0,100,1,0,0,'Winterskon Elder'), +(@Elder,0,5,'You tiny creatures disgust me!',12,0,100,1,0,0,'Winterskon Elder'), +(@Elder,0,6,'Your race is a disease upon the world!',12,0,100,1,0,0,'Winterskon Elder'); + +DELETE FROM `creature_text` WHERE `entry`=@Rune_Caster; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@Rune_Caster,0,0,'Die, maggot!',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,1,'For Ymiron!',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,2,'Haraak foln!',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,3,'I spit on you!',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,4,'I will break you!',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,5,'I will feed you to the dogs!',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,6,'I will take pleasure in gutting you!',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,7,'I''ll eat your heart!',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,8,'Look what''s come to play.',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,9,'My life for Ymiron!',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,10,'Sniveling pig!',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,11,'There will be no everlasting life for you!',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,12,'Ugglin oo bjorr!',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,13,'YAAARRRGH!',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,14,'You come to die!',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,15,'You tiny creatures disgust me!',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,16,'Your entrails will make a fine necklace.',12,0,100,1,0,0,'Winterskon Rune_Caster'), +(@Rune_Caster,0,17,'Your race is a disease upon the world!',12,0,100,1,0,0,'Winterskon Rune_Caster'); + +DELETE FROM `creature_text` WHERE `entry`=@Rune_Seer; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@Rune_Seer,0,0,'Die, maggot!',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,1,'For Ymiron!',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,2,'Haraak foln!',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,3,'I spit on you!',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,4,'I will break you!',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,5,'I will feed you to the dogs!',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,6,'I will take pleasure in gutting you!',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,7,'I''ll eat your heart!',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,8,'Look what''s come to play.',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,9,'My life for Ymiron!',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,10,'Sniveling pig!',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,11,'There will be no everlasting life for you!',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,12,'Ugglin oo bjorr!',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,13,'YAAARRRGH!',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,14,'You come to die!',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,15,'You tiny creatures disgust me!',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,16,'Your entrails will make a fine necklace.',12,0,100,1,0,0,'Winterskon Rune_Seer'), +(@Rune_Seer,0,17,'Your race is a disease upon the world!',12,0,100,1,0,0,'Winterskon Rune_Seer'); diff --git a/sql/updates/world/2013_11_03_27_world_misc.sql b/sql/updates/world/2013_11_03_27_world_misc.sql new file mode 100644 index 00000000000..9edb78ca26a --- /dev/null +++ b/sql/updates/world/2013_11_03_27_world_misc.sql @@ -0,0 +1,7 @@ +-- +UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `speed_walk`='1.2', `speed_run`='0.98571' WHERE `entry`=35415; +UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `speed_walk`='1.2', `speed_run`='1', `unit_class`=4 WHERE `entry`=35431; +UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `speed_walk`='2.8', `speed_run`='2.42857', `unit_class`=4 WHERE `entry`=35413; +UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `speed_walk`='3.2' WHERE `entry`=35419; +UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80 WHERE `entry`=35429; +UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `speed_walk`='1.2', `unit_class`=4 WHERE `entry`=35433; diff --git a/sql/updates/world/2013_11_03_28_world_misc.sql b/sql/updates/world/2013_11_03_28_world_misc.sql new file mode 100644 index 00000000000..2648f013d59 --- /dev/null +++ b/sql/updates/world/2013_11_03_28_world_misc.sql @@ -0,0 +1,5 @@ +-- Template updates +UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=20809; -- Mana Bomb Channel Trigger +UPDATE `creature_template` SET `speed_walk`=1,`speed_run`=1.14286 WHERE `entry` IN (26631,31350); -- Novos the Summoner +UPDATE `creature_template` SET `speed_walk`=1,`speed_run`=1 WHERE `entry` IN (27894,32795); -- Antipersonnel Cannon +UPDATE `creature_template` SET `speed_walk`=1,`speed_run`=0.99206 WHERE `entry`=30337; -- Jotunheim Rapid-Fire Harpoon diff --git a/sql/updates/world/2013_11_03_29_world_misc.sql b/sql/updates/world/2013_11_03_29_world_misc.sql new file mode 100644 index 00000000000..d05918439f6 --- /dev/null +++ b/sql/updates/world/2013_11_03_29_world_misc.sql @@ -0,0 +1,8 @@ +-- +UPDATE `creature_template` SET `ainame`='SmartAI' WHERE `entry`=25425; +DELETE FROM `smart_scripts` WHERE `entryorguid`=25425; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(25425,0,0,0,8,0,100,0,45607,0,0,0,33,25425,0,0,0,0,0,7,0,0,0,0,0,0,0,'On Spell Hit(Kaganishu''s Fetish Trigger) - Quest Credit'); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=45607; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13,1,45607,0,0,31,0,3,25425,0,0,0,0,'','Kaganishu''s Fetish Trigger hits Farseer Grimwalker''s Spirit'); diff --git a/sql/updates/world/2013_11_03_30_world_misc.sql b/sql/updates/world/2013_11_03_30_world_misc.sql new file mode 100644 index 00000000000..5131b5e83d4 --- /dev/null +++ b/sql/updates/world/2013_11_03_30_world_misc.sql @@ -0,0 +1,12 @@ +UPDATE `creature_template` SET `ainame`='SmartAI',`scriptname`='' WHERE `entry`=17768; +DELETE FROM `smart_scripts` WHERE `entryorguid`=17768 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=1776800 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(17768,0,0,0,8,0,100,0,31225,0,0,0,80,1776800,0,0,0,0,0,1,0,0,0,0,0,0,0,'Blood Knight Stillblade - On Spell Hit - Call Timed Action List'), +(1776800,9,0,0,0,0,100,0,0,0,0,0,33,17768,0,0,0,0,0,7,0,0,0,0,0,0,0,'Action 0 - Give Quest Credit'), +(1776800,9,1,0,0,0,100,0,0,0,0,0,11,32343,0,0,0,0,0,1,0,0,0,0,0,0,0,'Action 1 - Cast Revive Self'), +(1776800,9,2,0,0,0,100,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0,'Action 2 - Remove Unit Field Bytes 1'), +(1776800,9,3,0,0,0,100,0,0,0,0,0,96,40,0,0,0,0,0,1,0,0,0,0,0,0,0,'Action 3 - Remove Dynamic Flags'), +(1776800,9,4,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Action 4 - Talk'), +(1776800,9,5,0,0,0,100,0,120000,120000,0,0,94,40,0,0,0,0,0,1,0,0,0,0,0,0,0,'Action 5 - Restore Dynamic Flags'), +(1776800,9,6,0,0,0,100,0,0,0,0,0,90,7,0,0,0,0,0,1,0,0,0,0,0,0,0,'Action 6 - Restore Unit Field Bytes 1'); diff --git a/sql/updates/world/2013_11_03_31_world_misc.sql b/sql/updates/world/2013_11_03_31_world_misc.sql new file mode 100644 index 00000000000..46e35047681 --- /dev/null +++ b/sql/updates/world/2013_11_03_31_world_misc.sql @@ -0,0 +1,18 @@ +-- +SET @RUNESEEKINGPICK := 43666; +SET @RUNEDSTONEGIANT := 24329; +SET @NPC_REWARD := 24329; + +DELETE FROM `conditions` WHERE `SourceEntry`=@RUNESEEKINGPICK AND `SourceTypeOrReferenceId`=17; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(17,0,@RUNESEEKINGPICK,0,0,36,1,0,0,0,1,0,'', 'Runeseeking Pick can target only a corpse'), +(17,0,@RUNESEEKINGPICK,0,0,31,1,3,@RUNEDSTONEGIANT,0,0,0,'', 'Runeseeking Pick can target only RUNEDSTONEGIANT'); + +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` = @RUNEDSTONEGIANT; + +DELETE FROM `smart_scripts` WHERE `entryorguid` = @RUNEDSTONEGIANT AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, +`event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, +`action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(@RUNEDSTONEGIANT,0,0,1,8,0,100,1,@RUNESEEKINGPICK,0,0,0,80,@NPC_REWARD*100+1,2,0,0,0,0,16,0,0,0,0,0,0,0, 'Runed Stone Giant- Script - Give Quest Credit'), +(@RUNEDSTONEGIANT,0,1,0,61,0,100,1,0,0,0,0,41,2000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Runed Stone Giant - Despawn after 2 seconds'); diff --git a/sql/updates/world/2013_11_03_32_world_misc.sql b/sql/updates/world/2013_11_03_32_world_misc.sql new file mode 100644 index 00000000000..538979bedf3 --- /dev/null +++ b/sql/updates/world/2013_11_03_32_world_misc.sql @@ -0,0 +1,8 @@ +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=26407; +UPDATE `creature_template` SET `ainame`='SmartAI',`scriptname`='' WHERE `entry` IN (26407,27017); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (26407,27017) AND `source_type`=0; + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(26407,0,0,0,0,0,100,0,10000,12000,10000,12000,11,52703,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lightning Sentry - IC - Cast Charged Sentry Totem'), +(26407,0,1,0,6,0,100,0,0,0,0,0,45,0,1,0,0,0,0,19,27017,25,0,0,0,0,0,'Lightning Sentry - On Death - Set Data'), +(27017,0,0,0,38,0,100,0,0,1,0,0,11,47797,0,0,0,0,0,23,0,0,0,0,0,0,0,'Depleted War Golem - On Data Set - Give Quest Credit'); diff --git a/sql/updates/world/2013_11_03_33_world_misc.sql b/sql/updates/world/2013_11_03_33_world_misc.sql new file mode 100644 index 00000000000..8b5a70704cb --- /dev/null +++ b/sql/updates/world/2013_11_03_33_world_misc.sql @@ -0,0 +1,142 @@ +-- +SET @ARTRUIS := 28659; +SET @JALOOT := 28667; +SET @ZEPIK := 28668; +SET @ARTRUISGUID := 202971; +SET @JALOOTGUID := 202969; +SET @ZEPIKGUID := 202970; + +DELETE FROM `creature_questender` WHERE `id` IN (@ZEPIK,@JALOOT) AND `quest` IN (12582, 12689); +INSERT INTO `creature_questender` (`id`, `quest`) VALUES +(@ZEPIK, 12582), -- Zepik the Gorloc Hunter q12582 Frenzyheart Champion +(@JALOOT, 12689); -- Jaloot q12689 Hand of the Oracles + +UPDATE `creature_queststarter` SET `id`=@ZEPIK WHERE `quest`=12582; + +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`= @ARTRUIS; + +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ARTRUIS; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ARTRUIS; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(@ARTRUIS, 0, 0, 1, 11, 0, 100, 0, 0, 0, 0, 0, 70, 0, 0, 0, 0, 0, 0, 10, @JALOOTGUID, @JALOOT, 0, 0, 0, 0, 0, 'Artruis the Heartless - On Respawn- Respawn Jaloot'), +(@ARTRUIS, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 70, 0, 0, 0, 0, 0, 0, 10, @ZEPIKGUID, @ZEPIK, 0, 0, 0, 0, 0, 'Artruis the Heartless - Linked with Previous Event - Respawn Zephik'), +(@ARTRUIS, 0, 2, 0, 0, 0, 100, 0, 5000, 9000, 9000, 15000, 11, 15530, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - IC - Cast Frostbolt (Phase 1)'), +(@ARTRUIS, 0, 3, 0, 0, 0, 100, 0, 7000, 11000, 11000, 15000, 11, 54261, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - IC - Cast Ice Lance (Phase 1)'), +(@ARTRUIS, 0, 4, 0, 9, 0, 100, 0, 0, 10, 14000, 18000, 11, 11831, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - On Range - Cast Frost Nova (Phase 1)'), +(@ARTRUIS, 0, 5, 0, 0, 0, 100, 0, 9000, 13000, 25000, 35000, 11, 54792, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - Cast Icy Veins (Phase 1)'), +(@ARTRUIS, 0, 6, 7, 6, 0, 100, 0, 0, 0, 0, 0, 11, 52518, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - On death - Spawn Artruis Phylactery'), +(@ARTRUIS, 0, 7, 8, 61, 0, 100, 0, 0, 0, 0, 0, 45, 1, 4, 0, 0, 0, 0, 10, @JALOOTGUID, @JALOOT, 0, 0, 0, 0, 0, 'Artruis the Heartless - Linked with Previous Event- Send Data 1 4 to Jaloot'), +(@ARTRUIS, 0, 8, 9, 61, 0, 100, 0, 0, 0, 0, 0, 45, 1, 4, 0, 0, 0, 0, 10, @ZEPIKGUID, @ZEPIK, 0, 0, 0, 0, 0, 'Artruis the Heartless - Linked with Previous Event - Send Data 1 4 to Zephik'), +(@ARTRUIS, 0, 9, 0, 61, 0, 100, 0, 0, 0, 0, 0, 1, 5, 10000, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - Linked with Previous Event - Say Line 5'), +(@ARTRUIS, 0, 10, 11, 2, 0, 100, 1, 0, 30, 0, 0, 11, 52185, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - At 20% Hp Cast Bindings of Submission'), +(@ARTRUIS, 0, 11, 12, 61, 0, 100, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 10, @JALOOTGUID, @JALOOT, 0, 0, 0, 0, 0, 'Artruis the Heartless - Linked with Previous Event - Send Data 1 1 to Jaloot'), +(@ARTRUIS, 0, 12, 13, 61, 0, 100, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 10, @ZEPIKGUID, @ZEPIK, 0, 0, 0, 0, 0, 'Artruis the Heartless - Linked with Previous Event - Send Data 1 1 to Zephik'), +(@ARTRUIS, 0, 13, 14, 61, 0, 100, 0, 0, 0, 0, 0, 1, 3, 10000, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - Linked with Previous Event - Say Line 3'), +(@ARTRUIS, 0, 14, 0, 61, 0, 100, 0, 0, 0, 0, 0, 1, 4, 10000, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - Linked with Previous Event - Say Line 4'), +(@ARTRUIS, 0, 15, 16, 25, 0, 100, 0, 0, 0, 0, 0, 45, 1, 2, 0, 0, 0, 0, 10, @JALOOTGUID, @JALOOT, 0, 0, 0, 0, 0, 'Artruis the Heartless - On Reset - Send Data 1 2 to Jaloot'), +(@ARTRUIS, 0, 16, 0, 61, 0, 100, 0, 0, 0, 0, 0, 45, 1, 2, 0, 0, 0, 0, 10, @ZEPIKGUID, @ZEPIK, 0, 0, 0, 0, 0, 'Artruis the Heartless - Linked with Previous Event - Send Data 1 2 to Zephik'), +(@ARTRUIS, 0, 17, 18, 38, 0, 100, 0, 1, 2, 0, 0, 45, 1, 3, 0, 0, 0, 0, 10, @JALOOTGUID, @JALOOT, 0, 0, 0, 0, 0, 'Artruis the Heartless - On Receive Data 1 2- Send Data 1 3 to Jaloot'), +(@ARTRUIS, 0, 18, 19, 61, 0, 100, 0, 0, 0, 0, 0, 28, 52185, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - Linked with Previous Event - Remove Bindings of Submission'), +(@ARTRUIS, 0, 19, 0, 61, 0, 100, 0, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - Linked with Previous Event - Set Data 1 0'), +(@ARTRUIS, 0, 20, 21, 4, 0, 100, 0, 0, 0, 0, 0, 70, 0, 0, 0, 0, 0, 0, 10, @JALOOTGUID, @JALOOT, 0, 0, 0, 0, 0, 'Artruis the Heartless - On Agro- Respawn Jaloot'), +(@ARTRUIS, 0, 21, 22, 61, 0, 100, 0, 0, 0, 0, 0, 70, 0, 0, 0, 0, 0, 0, 10, @ZEPIKGUID, @ZEPIK, 0, 0, 0, 0, 0, 'Artruis the Heartless - Linked with Previous Event - Respawn Zephik'), +(@ARTRUIS, 0, 22, 0, 61, 0, 100, 0, 0, 0, 0, 0, 1, 0, 10000, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - Linked with Previous Event - Say Line 0'), +(@ARTRUIS, 0, 23, 0, 2, 0, 100, 1, 0, 75, 0, 0, 1, 1, 10000, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - On 75% HP - Say Line 1'), +(@ARTRUIS, 0, 24, 0, 2, 0, 100, 1, 0, 50, 0, 0, 1, 2, 10000, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - On 50% HP - Say Line 2'), +(@ARTRUIS, 0, 25, 26, 38, 0, 100, 0, 1, 1, 0, 0, 45, 1, 5, 0, 0, 0, 0, 10, @ZEPIKGUID, @ZEPIK, 0, 0, 0, 0, 0, 'Artruis the Heartless - On Receive Data 1 1- Send Data 1 5 to Zepik'), +(@ARTRUIS, 0, 26, 27, 61, 0, 100, 0, 0, 0, 0, 0, 28, 52185, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - Linked with Previous Event - Remove Bindings of Submission'), +(@ARTRUIS, 0, 28, 0, 61, 0, 100, 0, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - Linked with Previous Event - Set Data 1 0'), +(@ARTRUIS, 0, 29, 0, 0, 0, 100, 0, 1000, 1000, 1000, 1000, 11, 53163, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - IC - Cast Dessawn Retainer'), +(@ARTRUIS, 0, 30, 0, 4, 0, 100, 0, 0, 0, 0, 0, 11, 53163, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Artruis the Heartless - On Agro - Cast Dessawn Retainer'); + +DELETE FROM `creature_text` WHERE `entry` =@ARTRUIS; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(@ARTRUIS,0,0,'Ah, the hero. Your little friends said you would come. This certainly saves me the trouble of hunting you down myself.',14,0,100,2,0,0,'Artruis the Heartless'), +(@ARTRUIS,1,0,'I have weathered a hundred years of war and suffering. Do you truly think it wise to pit your mortals boddies against a being that cannot die? I''d venture you have more to lose',14,0,100,2,0,0,'Artruis the Heartless'), +(@ARTRUIS,2,0,'Even shattered into countless pieces, the crystals all around weaken me... perhaps I should not have underestimated the titans so...',14,0,100,2,0,0,'Artruis the Heartless'), +(@ARTRUIS,3,0,'These two brave, ignorant fools despise each other, yet somehow they both spoke of you as a hero. Perhaps you just lack the will to choose a side... let me extend you that opportunity.',14,0,100,2,0,0,'Artruis the Heartless'), +(@ARTRUIS,4,0,'Artruis is shielded. You must choose your side quickly to break his spell.',41,0,100,2,0,0,'Artruis the Heartless'), +(@ARTRUIS,5,0,'Arthas once mustered strength...of the very same sort... perhaps his is the path that you will follow.',14,0,100,2,0,0,'Artruis the Heartless'); + +UPDATE `creature_template` SET `AIName`= 'SmartAI',`npcflag`=0,`unit_flags`=32832 WHERE `entry`= @JALOOT; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@JALOOT; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(@JALOOT, 0, 0, 1, 11, 0, 100, 0, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - On Spawn - Remove quest giver flag'), +(@JALOOT, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 18, 512, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - Linked with Previous Event - Set Unit Flags'), +(@JALOOT, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 52182, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - Linked with Previous Event - Cast Tomb of the Heartless'), +(@JALOOT, 0, 3, 4, 38, 0, 100, 0, 1, 1, 0, 0, 2, 14, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - On Data Set 1 1 - Set Hostile'), +(@JALOOT, 0, 4, 5, 61, 0, 100, 0, 0, 0, 0, 0, 28, 52182, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - Linked with Previous Event - Remove Tomb of the Heartless'), +(@JALOOT, 0, 5, 0, 61, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 18, 40, 0, 0, 0, 0, 0, 0, 'Jaloot - Linked with Previous Event - Attack'), +(@JALOOT, 0, 6, 7, 38, 0, 100, 0, 1, 2, 0, 0, 2, 250, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - On Data Set 1 2 - Set Friendly'), +(@JALOOT, 0, 7, 8, 61, 0, 100, 0, 0, 0, 0, 0, 18, 512, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - Linked with Previous Event - Set Unit Flags'), +(@JALOOT, 0, 8 ,0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 52182, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - Linked with Previous Event - Cast Tomb of the Heartless'), +(@JALOOT, 0, 9, 0, 6, 0, 100, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 10, @ARTRUISGUID, @ARTRUIS, 0, 0, 0, 0, 0, 'Jaloot - On Death - Send Data 1 1 to Artruis'), +(@JALOOT, 0, 10,11, 38, 0, 100, 0, 1, 3, 0, 0, 2, 250, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - On Data Set 1 3 - Set Friendly'), +(@JALOOT, 0, 11,12, 61, 0, 100, 0, 0, 0, 0, 0, 19, 512, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - Linked with Previous Event - Remove Unit Flags'), +(@JALOOT, 0, 12,13, 61, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - Linked with Previous Event - Say Line 0'), +(@JALOOT, 0, 13,14, 61, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 10, @ARTRUISGUID, @ARTRUIS, 0, 0, 0, 0, 0, 'Jaloot - Linked with Previous Event - Attack Artruis'), +(@JALOOT, 0, 14, 0, 61, 0, 100, 0, 0, 0, 0, 0, 28, 52185, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - Linked with Previous Event - Remove Bindings of Submission'), +(@JALOOT, 0, 15,16, 38, 0, 100, 0, 1, 4, 0, 0, 2, 250, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - On Data Set 1 4 - Set Friendly'), +(@JALOOT, 0, 16,17, 61, 0, 100, 0, 0, 0, 0, 0, 18, 512, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - Linked with Previous Event - Set Unit Flags'), +(@JALOOT, 0, 17,18, 61, 0, 100, 0, 0, 0, 0, 0, 81, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - Linked with Previous Event - Add quest giver flag'), +(@JALOOT, 0, 18,19 , 61, 0, 100, 0, 0, 0, 0, 0, 41, 120000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - Linked with Previous Event - Despawn After 2 mins'), +(@JALOOT, 0, 19,0, 61, 0, 100, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - Linked with Previous Event - Evade'), +(@JALOOT, 0, 20, 0, 9, 0, 100, 0, 0, 5, 15000, 20000, 11, 52943, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - On Range - Cast Lightning Whirl'), +(@JALOOT, 0, 21, 0, 9, 0, 100, 0, 0, 5, 15000, 18000, 11, 52944, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - On Range - Cast Lightning Strike'), +(@JALOOT, 0, 22, 0, 9, 0, 100, 0, 0, 5, 20000, 25000, 11, 52964, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - On Range - Cast Spark Frenzy'), +(@JALOOT, 0, 23, 0, 2, 0, 100, 0, 0, 30, 9000, 12000, 11, 52969, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Jaloot - On Less than 30% HP - Cast Energy Siphon'); + +DELETE FROM `creature_text` WHERE `entry` =@JALOOT; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(@JALOOT, 0, 0, 'Now you not catch us with back turned. Now we hurt you bad undead. BAD!', 12, 0, 100, 0, 0, 0, 'Jaloot'); + +UPDATE `creature_template` SET `AIName`= 'SmartAI',`npcflag`=0,`unit_flags`=32832 WHERE `entry`= @ZEPIK; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ZEPIK; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(@ZEPIK, 0, 0, 1, 11, 0, 100, 1, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - On Spawn - Remove quest giver flag'), +(@ZEPIK, 0, 1, 2, 61, 0, 100, 1, 0, 0, 0, 0, 18, 512, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - Linked with Previous Event - Set Unit Flags'), +(@ZEPIK, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 52182, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - Linked with Previous Event - Cast Tomb of the Heartless'), +(@ZEPIK, 0, 3, 4, 38, 0, 100, 0, 1, 1, 0, 0, 2, 14, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - On Data Set 1 1 - Set Hostile'), +(@ZEPIK, 0, 4, 5, 61, 0, 100, 0, 0, 0, 0, 0, 28, 52182, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - Linked with Previous Event - Remove Tomb of the Heartless'), +(@ZEPIK, 0, 5, 0, 61, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 18, 40, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - Linked with Previous Event - Attack'), +(@ZEPIK, 0, 6, 7, 38, 0, 100, 0, 1, 2, 0, 0, 2, 250, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - On Data Set 1 2 - Set Friendly'), +(@ZEPIK, 0, 7, 8, 61, 0, 100, 0, 0, 0, 0, 0, 18, 512, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - Linked with Previous Event - Set Unit Flags'), +(@ZEPIK, 0, 8 ,0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 52182, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - Linked with Previous Event - Cast Tomb of the Heartless'), +(@ZEPIK, 0, 9, 0, 6, 0, 100, 0, 0, 0, 0, 0, 45, 1, 2, 0, 0, 0, 0, 10, @ARTRUISGUID, @ARTRUIS, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - On Death - Send Data 1 2 to Artruis'), +(@ZEPIK, 0, 10, 11, 38, 0, 100, 0, 1, 5, 0, 0, 2, 250, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - On Data Set 1 5 - Set Friendly'), +(@ZEPIK, 0, 11, 12, 61, 0, 100, 0, 0, 0, 0, 0, 19, 512, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - Linked with Previous Event - Remove Unit Flags'), +(@ZEPIK, 0, 12, 13, 61, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - Linked with Previous Event - Say Line 0'), +(@ZEPIK, 0, 13,14, 61, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 10, @ARTRUISGUID, @ARTRUIS, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - Linked with Previous Event - Attack Artruis'), +(@ZEPIK, 0, 14,0, 61, 0, 100, 0, 0, 0, 0, 0, 28, 52185, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - Linked with Previous Event - Remove Bindings of Submission'), +(@ZEPIK, 0, 15,16, 38, 0, 100, 0, 1, 4, 0, 0, 2, 250, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - On Data Set 1 4 - Set Friendly'), +(@ZEPIK, 0, 16,17, 61, 0, 100, 0, 0, 0, 0, 0, 18, 512, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - Linked with Previous Event - Set Unit Flags'), +(@ZEPIK, 0, 17,18, 61, 0, 100, 0, 0, 0, 0, 0, 81, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - Linked with Previous Event - Add quest giver flag'), +(@ZEPIK, 0, 18,19 ,61, 0, 100, 0, 0, 0, 0, 0, 41, 120000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - Linked with Previous Event - Despawn After 2 mins'), +(@ZEPIK, 0, 19,0, 61, 0, 100, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - Linked with Previous Event - Evade'), +(@ZEPIK, 0, 20, 0, 9, 0, 100, 0, 0, 20, 15000, 18000, 11, 52761, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - On Range - Cast Barbed Net'), +(@ZEPIK, 0, 21, 0, 9, 0, 100, 0, 5, 30, 12000, 15000, 11, 52889, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - On Range - Cast Envenomed Shot'), +(@ZEPIK, 0, 22, 0, 9, 0, 100, 0, 0, 5, 15000, 18000, 11, 52873, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - On Range - Cast Open Wound'), +(@ZEPIK, 0, 23, 0, 9, 0, 100, 0, 5, 30, 3000, 7000, 11, 52758, 2, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - On Range - Cast Piercing Arrow'), +(@ZEPIK, 0, 24, 0, 9, 0, 100, 0, 0, 5, 30000, 40000, 11, 52886, 2, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - On Range - Cast Spike Trap'), +(@ZEPIK, 0, 25, 0, 2, 0, 100, 0, 0, 30, 30000, 30000, 11, 52895, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Zepik the Gorloc Hunter - On Less than 30% HP Cast Bandage - Cast Bandage'); + +DELETE FROM `creature_text` WHERE `entry` =@ZEPIK; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(@ZEPIK, 0, 0, 'You going die big bad undead thing! You not catch Zepik sleeping this time!', 12, 0, 100, 0, 0, 0, 'Zepik the Gorloc Hunter'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=52185; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,52185,0,0,31,0,3,@ZEPIK,0,0,0,'','bindings of submission can hit Zepik the Gorloc Hunter'), +(13,1,52185,0,1,31,0,3,@JALOOT,0,0,0,'','bindings of submission can hit Jaloot'), +(13,1,52185,0,2,31,0,3,@ARTRUIS,0,0,0,'','bindings of submission can hit Artruis the Heartless'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry` IN(51186,51188,51189,51190,51191,51192); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(17, 0, 51186, 0, 0, 29, 0, 28659, 50, 0, 1, 0, 0, '', 'Summon Goregek the Bristlepine Hunter cannot be used near artruis'), +(17, 0, 51188, 0, 0, 29, 0, 28659, 50, 0, 1, 0, 0, '', 'Summon Dajik the Wasp Hunter cannot be used near artruis'), +(17, 0, 51189, 0, 0, 29, 0, 28659, 50, 0, 1, 0, 0, '', 'Summon Zepik the Gorloc Hunter cannot be used near artruis'), +(17, 0, 51190, 0, 0, 29, 0, 28659, 50, 0, 1, 0, 0, '', 'Summon Lafoo cannot be used near artruis'), +(17, 0, 51191, 0, 0, 29, 0, 28659, 50, 0, 1, 0, 0, '', 'Summon Jaloot cannot be used near artruis'), +(17, 0, 51192, 0, 0, 29, 0, 28659, 50, 0, 1, 0, 0, '', 'Summon Moodle cannot be used near artruis'); + +UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry` IN (28667,28668); diff --git a/sql/updates/world/2013_11_03_34_world_quest_template.sql b/sql/updates/world/2013_11_03_34_world_quest_template.sql new file mode 100644 index 00000000000..0814b94048b --- /dev/null +++ b/sql/updates/world/2013_11_03_34_world_quest_template.sql @@ -0,0 +1,5 @@ +-- Words for Delivery (25500) +UPDATE `quest_template` SET `Details` = 'Here we go. This is the speech, $N!$b$bIt has everything to be a great battle starter: It''s inspirational, has eloquent language and speaks directly to gnomes. Never has a finer speech been written!$b$bTurn this in to Captain Tread Sparknozzle and see if there''s anything else he needs of you.', `OfferRewardText` = 'This is the speech from Toby? Fantastic!$bRecruit, you''ve done all we could possibly ask for and the Gnomeregan Army thanks you!$bWe''ve got a strike team heading to Gnomeregan now and that wouldn''t have been possible without your assistance. For all of your help, we''d like you to join the Gnomeregan Reserves!$bIt doesn''t pay very well, but you do get this snazzy helmet. Hang on to that, you might need it someday!' WHERE `Id`=25500; + +-- Words for Delivery (25286) +UPDATE `quest_template` SET `Details` = 'Here we go. This is the speech, $N!$b$bIt has everything to be a great battle starter: It''s inspirational, has eloquent language and speaks directly to gnomes. Never has a finer speech been written!$b$bTurn this in to Captain Tread Sparknozzle and get some transportation to High Tinker Mekkatorque!', `OfferRewardText` = 'Toby is all done with the speech? Let me see...$b<Reads the speech> Pumping pistons! What a fantastic speech! I knew Toby was a good writer, but this is perhaps the best he''s ever written.$bI think it''s time to get you out to the battle.' WHERE `Id`=25286; diff --git a/sql/updates/world/2013_11_03_35_world_misc.sql b/sql/updates/world/2013_11_03_35_world_misc.sql new file mode 100644 index 00000000000..a204ea7c3dd --- /dev/null +++ b/sql/updates/world/2013_11_03_35_world_misc.sql @@ -0,0 +1,17 @@ +-- +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=25791; + +DELETE FROM `smart_scripts` WHERE `entryorguid`=25791; + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(25791, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 11, 45948, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Oil-stained Wolf - On Respawn - Cast Oil Coat'), +(25791, 0, 1, 0, 8 ,0, 100, 1, 53326, 0, 0, 0, 23, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Oil-stained Wolf - On Spellhit - Increment Phase'), +(25791, 0, 2, 3, 1 ,1, 100, 1, 1000, 1000, 0, 0, 2, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Oil-stained Wolf - OOC - Set Faction'), +(25791, 0, 3, 4,61 ,1, 100, 1, 0, 0, 0, 0, 11, 46075, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Oil-stained Wolf - Linked with Previous Event - Cast Summon Wolf Droppings'), +(25791, 0, 4, 5,61 ,1, 100, 1, 0, 0, 0, 0, 89, 10, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Oil-stained Wolf - Linked with Previous Event - Set Random Movement'), +(25791, 0, 5, 0,61 ,1, 100, 1, 0, 0, 0, 0, 41, 15000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Oil-stained Wolf - Linked with Previous Event - Despawn'), +(25791, 0, 6, 7, 0 ,1, 100, 1, 1000, 1000, 0, 0, 2, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Oil-stained Wolf - IC - Set Faction'), +(25791, 0, 7, 8,61 ,1, 100, 1, 0, 0, 0, 0, 11, 46075, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Oil-stained Wolf - Linked with Previous Event - Cast Summon Wolf Droppings'), +(25791, 0, 8, 9,61 ,1, 100, 1, 0, 0, 0, 0, 89, 10, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Oil-stained Wolf - Linked with Previous Event - Set Random Movement'), +(25791, 0, 9,10,61 ,1, 100, 1, 0, 0, 0, 0, 41, 15000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Oil-stained Wolf - Linked with Previous Event - Despawn'), +(25791, 0,10, 0,61 ,1, 100, 1, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Oil-stained Wolf - Linked with Previous Event - Evade'); diff --git a/sql/updates/world/2013_11_03_36_world_misc.sql b/sql/updates/world/2013_11_03_36_world_misc.sql new file mode 100644 index 00000000000..5bf656b3d68 --- /dev/null +++ b/sql/updates/world/2013_11_03_36_world_misc.sql @@ -0,0 +1,47 @@ +-- [11258] [11247] Burn Skorn ,Burn + +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN(24098,24100,24102); + +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (24098,24100,24102); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(24102, 0, 0, 0, 8, 0, 100, 0, 43057, 0, 0, 0, 11, 43065 , 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Skorn Barraks Bunny - On Spellhit - Cast Burn Skorn, Burn!: Barracks Kill Credit'), +(24098, 0, 0, 0, 8, 0, 100, 0, 43057, 0, 0, 0, 11, 43058 , 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Skorn Longhouse NW Bunny - On Spellhit - Cast Burn Skorn, Burn!: NW Kill Credit'), +(24100, 0, 0, 0, 8, 0, 100, 0, 43057, 0, 0, 0, 11, 43061 , 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Skorn Longhouse NE Bunny - On Spellhit - Cast Burn Skorn, Burn!: NE Kill Credit'); + +-- [11259] [11245] Towers of Certain Doom + +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN(24087,24092,24093,24094); + +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (24087,24092,24093,24094) AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` =2408700 AND `source_type`=9; + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(24087, 0, 0, 2, 8, 0, 100, 0, 49625, 0, 15000, 15000, 11, 43067 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Skorn Tower NW Bunny - On Spellhit - Cast Towers of Certain Doom: NW Kill Credit'), +(24092, 0, 0, 2, 8, 0, 100, 0, 49625, 0, 15000, 15000, 11, 43077 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Skorn Tower E Bunny - On Spellhit - Cast Towers of Certain Doom: E Kill Credit'), +(24093, 0, 0, 2, 8, 0, 100, 0, 49625, 0, 15000, 15000, 11, 43086 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Skorn Tower SW Bunny - On Spellhit - Cast Towers of Certain Doom: SW Kill Credit'), +(24094, 0, 0, 2, 8, 0, 100, 0, 49625, 0, 15000, 15000, 11, 43087 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Skorn Tower SE Bunny - On Spellhit - Cast Towers of Certain Doom: SE Kill Credit'), +(24087, 0, 1, 2, 8, 0, 100, 0, 49634, 0, 15000, 15000, 11, 43067 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Skorn Tower NW Bunny - On Spellhit - Cast Towers of Certain Doom: NW Kill Credit'), +(24092, 0, 1, 2, 8, 0, 100, 0, 49634, 0, 15000, 15000, 11, 43077 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Skorn Tower E Bunny - On Spellhit - Cast Towers of Certain Doom: E Kill Credit'), +(24093, 0, 1, 2, 8, 0, 100, 0, 49634, 0, 15000, 15000, 11, 43086 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Skorn Tower SW Bunny - On Spellhit - Cast Towers of Certain Doom: SW Kill Credit'), +(24094, 0, 1, 2, 8, 0, 100, 0, 49634, 0, 15000, 15000, 11, 43087 , 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Skorn Tower SE Bunny - On Spellhit - Cast Towers of Certain Doom: SE Kill Credit'), +(24087, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 80, 2408700 , 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Skorn Tower NW Bunny - Linked with Previous Event - Run Timed Script'), +(24092, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 80, 2408700 , 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Skorn Tower E Bunny - Linked with Previous Event - Run Timed Script'), +(24093, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 80, 2408700 , 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Skorn Tower SW Bunny - Linked with Previous Event - Run Timed Script'), +(24094, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 80, 2408700 , 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Skorn Tower SE Bunny - Linked with Previous Event - Run Timed Script'), +(2408700, 9, 0, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 11, 56511 , 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Skorn Tower Bunny - Script - Cast Towers of Certain Doom: Tower Bunny Smoke Flare Effect'), +(2408700, 9, 1, 0, 0, 0, 100, 0, 15000, 15000, 0, 0, 11, 43069 , 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Skorn Tower Bunny - Script - Cast Towers of Certain Doom: Skorn Cannonfire'), +(2408700, 9, 2, 0, 0, 0, 100, 0, 100, 100, 0, 0, 85, 43072 , 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Skorn Tower Bunny - Script - Cast Towers of Certain Doom: Tower Caster Instakill'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`IN(49625,49634,43072); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13,1,49625,0,0,31,0,3,24087,0,0,0,0,'','Braves Flare targets Skorn Tower NW Bunny'), +(13,1,49625,0,1,31,0,3,24092,0,0,0,0,'','Braves Flare targets Skorn Tower E Bunny'), +(13,1,49625,0,2,31,0,3,24093,0,0,0,0,'','Braves Flare targets Skorn Tower SW Bunny'), +(13,1,49625,0,3,31,0,3,24094,0,0,0,0,'','Braves Flare targets Skorn Tower SE Bunny'), +(13,1,49634,0,0,31,0,3,24087,0,0,0,0,'','Seargents Flare targets Skorn Tower NW Bunny'), +(13,1,49634,0,1,31,0,3,24092,0,0,0,0,'','Seargents Flare targets Skorn Tower E Bunny'), +(13,1,49634,0,2,31,0,3,24093,0,0,0,0,'','Seargents Flare targets Skorn Tower SW Bunny'), +(13,1,49634,0,3,31,0,3,24094,0,0,0,0,'','Seargents Flare targets Skorn Tower SE Bunny'), +(13,1,43072,0,0,31,0,3,23668,0,0,0,0,'','Towers of Certain Doom: Tower Caster Instakill targets Winterskorn Rune-Caster'), +(13,1,43072,0,1,31,0,3,23667,0,0,0,0,'','Towers of Certain Doom: Tower Caster Instakill targets Winterskorn Rune-Seer'), +(13,1,43072,0,2,31,0,3,23669,0,0,0,0,'','Towers of Certain Doom: Tower Caster Instakill targets Winterskorn Oracle'); diff --git a/sql/updates/world/2013_11_03_37_world_misc.sql b/sql/updates/world/2013_11_03_37_world_misc.sql new file mode 100644 index 00000000000..6f6723141aa --- /dev/null +++ b/sql/updates/world/2013_11_03_37_world_misc.sql @@ -0,0 +1,11 @@ +-- +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`= 9376; + +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=9376; + +DELETE FROM `smart_scripts` WHERE `entryorguid`=9376 AND `source_type`=0; + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(9376, 0, 0, 0,11, 0, 100, 0, 0, 0, 0, 0, 11, 13913, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Blazerunner - On Spawn - Cast Blazerunner Aura'), +(9376, 0, 1, 0, 9, 0, 100, 0, 0, 10, 10000, 20000, 11, 17277, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Blazerunner - On Range - Cast Blast Wave'), +(9376, 0, 2, 0, 8, 0, 100, 0, 14247, 0, 0, 0, 28, 13913, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Blazerunner - On Spellhit (Blazerunner Dispel) - Remove Blazerunner Aura'); diff --git a/sql/updates/world/2013_11_03_38_world_misc.sql b/sql/updates/world/2013_11_03_38_world_misc.sql new file mode 100644 index 00000000000..3a21a350853 --- /dev/null +++ b/sql/updates/world/2013_11_03_38_world_misc.sql @@ -0,0 +1,21 @@ +-- +UPDATE `creature_template` SET `gossip_menu_id`=10036 WHERE `entry`=31273; + +DELETE FROM `gossip_menu` WHERE `entry`IN(10036,10037); +INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES +(10036, 13930), +(10037, 13931); + +DELETE FROM `gossip_menu_option` WHERE `menu_id`=10036; +INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`) VALUES +(10036, 0, 0, 'Hold on friend. Tell me what happened here.', 1, 1, 10037, 0, 0, 0, NULL); + +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=31273; + +DELETE FROM `smart_scripts` WHERE `entryorguid` =31273; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(31273, 0, 0, 0, 62, 0, 100, 0, 10036, 0, 0, 0, 33, 31272, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Dying Berserker - On Gossip Select - Give Kill Credit'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10036; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,10036,0,0,0,9,0,13228,0,0,0,0,'','Dying Berserker show gossip only if player on quest The Broken Front'); diff --git a/sql/updates/world/2013_11_03_39_world_misc.sql b/sql/updates/world/2013_11_03_39_world_misc.sql new file mode 100644 index 00000000000..c5af862bd14 --- /dev/null +++ b/sql/updates/world/2013_11_03_39_world_misc.sql @@ -0,0 +1,55 @@ +-- +DELETE FROM `smart_scripts` WHERE `entryorguid`=6497; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(6497, 0, 0, 1, 62, 0, 100, 0, 125, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Astor Hadren - On Gossip Select - Close Menu'), +(6497, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 2, 14, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Astor Hadren - Linked with Previous Event - Set Hostile'), +(6497, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 55, 120000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Astor Hadren - Linked with Previous Event - Stop WP'), +(6497, 0, 3, 4, 11, 0, 100, 0, 0, 0, 0, 0, 2, 68, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Astor Hadren - On Spawn - Set Friendly'), +(6497, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 53, 0, 6497, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 'Astor Hadren - Linked with previous Event - Start WP'), +(6497, 0, 5, 0, 64, 0, 100, 0, 0, 0, 0, 0, 54, 15000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Astor Hadren - On Gossip Hello - Pause WP'); + +UPDATE `creature` SET `MovementType`=0 WHERE `guid`=44738; +UPDATE `creature_addon` SET `path_id`=0 WHERE `guid`=44738; + +DELETE FROM `waypoint_data` WHERE `id`=447380; +DELETE FROM `waypoints` WHERE `entry`=6497; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES +(6497, 1, 1597.4, 566.768, 37.8602, 'Astor Hadren'), +(6497, 2, 1613.91, 562.333, 35.146, 'Astor Hadren'), +(6497, 3, 1631.83, 557.812, 33.7566, 'Astor Hadren'), +(6497, 4, 1661.1, 550.278, 33.3758, 'Astor Hadren'), +(6497, 5, 1689.98, 545.014, 33.4033, 'Astor Hadren'), +(6497, 6, 1714.5, 540.561, 33.6137, 'Astor Hadren'), +(6497, 7, 1737.88, 533.75, 33.3961, 'Astor Hadren'), +(6497, 8, 1772.23, 525.741, 33.3961, 'Astor Hadren'), +(6497, 9, 1802.45, 516.861, 33.4219, 'Astor Hadren'), +(6497, 10, 1836.05, 504.973, 34.1916, 'Astor Hadren'), +(6497, 11, 1850.21, 496.778, 34.6882, 'Astor Hadren'), +(6497, 12, 1867.39, 481.534, 34.5889, 'Astor Hadren'), +(6497, 13, 1877.67, 463.224, 34.1472, 'Astor Hadren'), +(6497, 14, 1890.49, 434.482, 33.8649, 'Astor Hadren'), +(6497, 15, 1898.6, 404.11, 34.3546, 'Astor Hadren'), +(6497, 16, 1909.06, 371.483, 34.0201, 'Astor Hadren'), +(6497, 17, 1927.47, 333.806, 35.1605, 'Astor Hadren'), +(6497, 18, 1948.33, 293.56, 38.7782, 'Astor Hadren'), +(6497, 19, 1960.17, 272.962, 38.3855, 'Astor Hadren'), +(6497, 20, 1981.05, 237.328, 36.6631, 'Astor Hadren'), +(6497, 21, 1955.89, 236.574, 41.3907, 'Astor Hadren'), +(6497, 22, 1922.53, 240.366, 49.3415, 'Astor Hadren'), +(6497, 23, 1938.41, 259.961, 44.9292, 'Astor Hadren'), +(6497, 24, 1949.26, 286.982, 38.8665, 'Astor Hadren'), +(6497, 25, 1941.21, 306.375, 37.5792, 'Astor Hadren'), +(6497, 26, 1927.42, 334.68, 35.107, 'Astor Hadren'), +(6497, 27, 1912.91, 362.632, 33.9933, 'Astor Hadren'), +(6497, 28, 1899.77, 399.685, 34.2583, 'Astor Hadren'), +(6497, 29, 1894.23, 419.938, 34.2863, 'Astor Hadren'), +(6497, 30, 1883.81, 449.623, 33.9371, 'Astor Hadren'), +(6497, 31, 1865.35, 482.581, 34.6089, 'Astor Hadren'), +(6497, 32, 1839.53, 502.555, 34.3171, 'Astor Hadren'), +(6497, 33, 1810.76, 513.551, 33.4393, 'Astor Hadren'), +(6497, 34, 1780.72, 522.962, 33.3959, 'Astor Hadren'), +(6497, 35, 1744.62, 532.56, 33.3959, 'Astor Hadren'), +(6497, 36, 1713.98, 539.842, 33.5092, 'Astor Hadren'), +(6497, 37, 1683.12, 546.073, 33.4104, 'Astor Hadren'), +(6497, 38, 1642.1, 554.955, 33.448, 'Astor Hadren'), +(6497, 39, 1612.29, 563.53, 35.3895, 'Astor Hadren'); diff --git a/sql/updates/world/2013_11_03_40_world_misc.sql b/sql/updates/world/2013_11_03_40_world_misc.sql new file mode 100644 index 00000000000..ec127db3910 --- /dev/null +++ b/sql/updates/world/2013_11_03_40_world_misc.sql @@ -0,0 +1,2 @@ +-- Template updates for creature 27263 (Vordrassil's Heart Credit) +UPDATE `creature_template` SET `unit_flags`=`unit_flags`|33555200 WHERE `entry`=27263; diff --git a/sql/updates/world/2013_11_03_41_world_npc_vendor.sql b/sql/updates/world/2013_11_03_41_world_npc_vendor.sql new file mode 100644 index 00000000000..db7619bee1f --- /dev/null +++ b/sql/updates/world/2013_11_03_41_world_npc_vendor.sql @@ -0,0 +1,63 @@ +-- +DELETE FROM `npc_vendor` WHERE `entry` IN(33238,33239); +INSERT INTO `npc_vendor` (`entry`, `slot`, `item`, `maxcount`, `incrtime`, `ExtendedCost`) VALUES +(33238, 24, 33443, 0, 0, 0), +(33238, 26, 35952, 0, 0, 0), +(33238, 23, 33454, 0, 0, 0), +(33238, 21, 33449, 0, 0, 0), +(33238, 22, 33451, 0, 0, 0), +(33238, 25, 35949, 0, 0, 0), +(33238, 30, 35950, 0, 0, 0), +(33238, 27, 35953, 0, 0, 0), +(33238, 28, 35951, 0, 0, 0), +(33238, 29, 35948, 0, 0, 0), +(33238, 2, 5237, 0, 0, 0), +(33238, 3, 5565, 0, 0, 0), +(33238, 4, 16583, 0, 0, 0), +(33238, 1, 3775, 0, 0, 0), +(33238, 6, 17030, 0, 0, 0), +(33238, 9, 17033, 0, 0, 0), +(33238, 10, 21177, 0, 0, 0), +(33238, 8, 17032, 0, 0, 0), +(33238, 5, 17020, 0, 0, 0), +(33238, 7, 17031, 0, 0, 0), +(33238, 16, 43235, 0, 0, 0), +(33238, 13, 41586, 0, 0, 0), +(33238, 11, 37201, 0, 0, 0), +(33238, 14, 43231, 0, 0, 0), +(33238, 15, 43233, 0, 0, 0), +(33238, 18, 44605, 0, 0, 0), +(33238, 19, 44614, 0, 0, 0), +(33238, 17, 43237, 0, 0, 0), +(33238, 12, 41584, 0, 0, 0), +(33238, 20, 44615, 0, 0, 0), +(33239, 24, 33443, 0, 0, 0), +(33239, 26, 35952, 0, 0, 0), +(33239, 23, 33454, 0, 0, 0), +(33239, 21, 33449, 0, 0, 0), +(33239, 22, 33451, 0, 0, 0), +(33239, 25, 35949, 0, 0, 0), +(33239, 30, 35950, 0, 0, 0), +(33239, 27, 35953, 0, 0, 0), +(33239, 28, 35951, 0, 0, 0), +(33239, 29, 35948, 0, 0, 0), +(33239, 2, 5237, 0, 0, 0), +(33239, 3, 5565, 0, 0, 0), +(33239, 4, 16583, 0, 0, 0), +(33239, 1, 3775, 0, 0, 0), +(33239, 6, 17030, 0, 0, 0), +(33239, 9, 17033, 0, 0, 0), +(33239, 10, 21177, 0, 0, 0), +(33239, 8, 17032, 0, 0, 0), +(33239, 5, 17020, 0, 0, 0), +(33239, 7, 17031, 0, 0, 0), +(33239, 16, 43235, 0, 0, 0), +(33239, 13, 41586, 0, 0, 0), +(33239, 11, 37201, 0, 0, 0), +(33239, 14, 43231, 0, 0, 0), +(33239, 15, 43233, 0, 0, 0), +(33239, 18, 44605, 0, 0, 0), +(33239, 19, 44614, 0, 0, 0), +(33239, 17, 43237, 0, 0, 0), +(33239, 12, 41584, 0, 0, 0), +(33239, 20, 44615, 0, 0, 0); diff --git a/sql/updates/world/2013_11_03_42_world_creature.sql b/sql/updates/world/2013_11_03_42_world_creature.sql new file mode 100644 index 00000000000..20ac761eed0 --- /dev/null +++ b/sql/updates/world/2013_11_03_42_world_creature.sql @@ -0,0 +1,50 @@ +-- +SET @ROLCITIZEN := 3617; +SET @GUID := 132232; + +UPDATE `creature_template` SET `MovementType` = 1, `Health_mod` = 2 WHERE `entry` = @ROLCITIZEN; + +DELETE FROM `creature_template_addon` WHERE `entry`=3617; +INSERT INTO `creature_template_addon` (`entry`, `auras`) VALUES +(@ROLCITIZEN, '34426'); + +DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+37; +INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES +(@GUID, @ROLCITIZEN, 0, 1, 1, 0, 0, 1834.213, 249.057, 59.82264, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+1, @ROLCITIZEN, 0, 1, 1, 0, 0, 1823.905, 252.862, 60.02497, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+2, @ROLCITIZEN, 0, 1, 1, 0, 0, 1829.434, 259.207, 59.58340, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+3, @ROLCITIZEN, 0, 1, 1, 0, 0, 1819.516, 264.184, 59.89560, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+4, @ROLCITIZEN, 0, 1, 1, 0, 0, 1806.351, 265.815, 65.39972, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+5, @ROLCITIZEN, 0, 1, 1, 0, 0, 1816.986, 281.063, 70.39969, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+6, @ROLCITIZEN, 0, 1, 1, 0, 0, 1831.261, 282.122, 70.39969, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+7, @ROLCITIZEN, 0, 1, 1, 0, 0, 1843.583, 278.447, 70.39969, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+8, @ROLCITIZEN, 0, 1, 1, 0, 0, 1794.100, 284.269, 70.39969, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+9, @ROLCITIZEN, 0, 1, 1, 0, 0, 1769.915, 285.161, 70.39969, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+10, @ROLCITIZEN, 0, 1, 1, 0, 0, 1806.014, 254.011, 60.65592, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+11, @ROLCITIZEN, 0, 1, 1, 0, 0, 1782.721, 267.958, 59.61376, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+12, @ROLCITIZEN, 0, 1, 1, 0, 0, 1783.947, 251.046, 59.50742, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+13, @ROLCITIZEN, 0, 1, 1, 0, 0, 1782.661, 226.650, 59.36586, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+14, @ROLCITIZEN, 0, 1, 1, 0, 0, 1785.052, 210.563, 59.70694, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+15, @ROLCITIZEN, 0, 1, 1, 0, 0, 1805.750, 210.858, 65.39980, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+16, @ROLCITIZEN, 0, 1, 1, 0, 0, 1803.131, 192.819, 70.39975, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+17, @ROLCITIZEN, 0, 1, 1, 0, 0, 1819.385, 193.334, 70.39975, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+18, @ROLCITIZEN, 0, 1, 1, 0, 0, 1841.260, 196.939, 70.39975, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+19, @ROLCITIZEN, 0, 1, 1, 0, 0, 1788.094, 193.416, 70.39975, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+20, @ROLCITIZEN, 0, 1, 1, 0, 0, 1768.284, 193.266, 70.39975, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+21, @ROLCITIZEN, 0, 1, 1, 0, 0, 1836.373, 229.404, 60.23154, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+22, @ROLCITIZEN, 0, 1, 1, 0, 0, 1830.285, 213.645, 60.38905, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+23, @ROLCITIZEN, 0, 1, 1, 0, 0, 1817.453, 225.251, 59.52800, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+24, @ROLCITIZEN, 0, 1, 1, 0, 0, 1820.128, 250.549, 60.04744, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+25, @ROLCITIZEN, 0, 1, 1, 0, 0, 1805.220, 291.655, 70.39964, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+26, @ROLCITIZEN, 0, 1, 1, 0, 0, 1846.193, 271.665, 70.39966, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+27, @ROLCITIZEN, 0, 1, 1, 0, 0, 1797.379, 321.783, 70.81464, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+28, @ROLCITIZEN, 0, 1, 1, 0, 0, 1795.755, 336.788, 70.81464, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+29, @ROLCITIZEN, 0, 1, 1, 0, 0, 1816.091, 339.486, 70.81320, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+30, @ROLCITIZEN, 0, 1, 1, 0, 0, 1818.251, 324.754, 70.81323, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+31, @ROLCITIZEN, 0, 1, 1, 0, 0, 1806.574, 325.978, 70.39765, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+32, @ROLCITIZEN, 0, 1, 1, 0, 0, 1806.596, 337.597, 70.39765, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+33, @ROLCITIZEN, 0, 1, 1, 0, 0, 1779.739, 208.601, 60.31278, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+34, @ROLCITIZEN, 0, 1, 1, 0, 0, 1774.185, 238.088, 60.69822, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+35, @ROLCITIZEN, 0, 1, 1, 0, 0, 1784.677, 238.470, 60.40865, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+36, @ROLCITIZEN, 0, 1, 1, 0, 0, 1821.226, 239.487, 60.64784, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0), +(@GUID+37, @ROLCITIZEN, 0, 1, 1, 0, 0, 1837.954, 238.254, 60.51441, 0, 300, 5, 0, 656, 0, 1, 0, 0, 0); diff --git a/sql/updates/world/2013_11_03_43_world_misc.sql b/sql/updates/world/2013_11_03_43_world_misc.sql new file mode 100644 index 00000000000..eb8468f40a3 --- /dev/null +++ b/sql/updates/world/2013_11_03_43_world_misc.sql @@ -0,0 +1,43 @@ +-- DB/Quest: Fix: Wooly Justice (12707) +SET @MEDALLION := 52596; -- Spell: Medallion of Mam'toth +SET @MAMMOTH := 28851; -- NPC: Enraged Mammoth +SET @TRAMPLE := 52603; -- Spell: Trample +SET @T_AURA := 52607; -- Spell: Enraged Mammoth: Trample Aura for On Death Kill Credit +SET @DISCIPLE := 28861; -- NPC: Mam'toth Disciple +SET @CREDIT := 28876; -- NPC: Mam'toth Disciple Kill Credit Bunny + +-- Add SAI for Enraged Mammoth +UPDATE `creature_template` SET `AIName`='SmartAI',`spell1`=52601,`spell2`=@TRAMPLE WHERE `entry`=@MAMMOTH; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@MAMMOTH AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@MAMMOTH,0,0,0,8,0,100,0,@MEDALLION,0,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Enraged Mammoth - On hit by spell from medallion - Change faction to friendly'), +(@MAMMOTH,0,1,0,1,0,100,0,10000,10000,10000,10000,2,1924,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Enraged Mammoth - On OOC for 10 sec - Change faction to back to normal'), +(@MAMMOTH,0,2,0,1,0,100,0,10000,10000,10000,10000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Enraged Mammoth - On OOC for 10 sec - DESPAWN'); + +-- Add SAI for Mam'toth disciple +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@DISCIPLE; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@DISCIPLE AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@DISCIPLE,0,0,0,6,0,100,0,0,0,0,0,33,@CREDIT,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Mam''toth disciple - On death - Give credit to invoker, if Tampered'), +(@DISCIPLE,0,1,0,25,0,100,0,0,0,0,0,28,@T_AURA,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Mam''toth disciple - On reset - Remove aura from trample'); + +-- Add conditions for spell Medallion of Mam'toth +DELETE FROM `conditions` WHERE `SourceEntry`=@MEDALLION AND `SourceTypeOrReferenceId`=17; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(17,0,@MEDALLION,0,0,31,1,3,@MAMMOTH,0,0,0,'', 'Medallion of Mam''toth can hit only Enraged Mammoths'); + +-- Add conditions for spell Trample +DELETE FROM `conditions` WHERE `SourceEntry`=@TRAMPLE AND `SourceTypeOrReferenceId`=13; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13,1,@TRAMPLE,0,0,31,0,3,@DISCIPLE,0,0,0,'', 'Trample effect 1 can hit only hit disciple of Mam''toth'), +(13,2,@TRAMPLE,0,0,31,0,3,@DISCIPLE,0,0,0,'', 'Trample effect 2 can hit only hit disciple of Mam''toth'); + +-- Add conditions for smart_event 0 of Mam'toth disciple +DELETE FROM `conditions` WHERE `SourceEntry`=@DISCIPLE AND `SourceTypeOrReferenceId`=22; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(22,1,@DISCIPLE,0,0,1,1,@T_AURA,0,0,0,0,'', 'Mam''toth disciple 1st event is valid only, if has Tampered aura credit'); + +-- Add conditions for spell Trample Aura +DELETE FROM `conditions` WHERE `SourceEntry`=@T_AURA AND `SourceTypeOrReferenceId`=13; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13,1,@T_AURA,0,0,31,0,3,@DISCIPLE,0,0,0,'', 'TAura effect can hit only Disciple of Mam''toth'); diff --git a/sql/updates/world/2013_11_03_44_world_misc.sql b/sql/updates/world/2013_11_03_44_world_misc.sql new file mode 100644 index 00000000000..e10583a7fe5 --- /dev/null +++ b/sql/updates/world/2013_11_03_44_world_misc.sql @@ -0,0 +1,8 @@ +-- +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry` =29811; +DELETE FROM `smart_scripts` WHERE `entryorguid` =29811; + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(29811,0,0,1,62,0,100,0,9843,0,0,0,15,12864,0,0,0,0,0,7,0,0,0,0,0,0,0,'Frostborn Scout - On Gossip Select - Give Quest Credit'), +(29811,0,1,0,61,0,100,0,0,0,0,0,41,30000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Frostborn Scout - Linked with Previous Event - Despawn'), +(29811,0,2,0,25,0,100,0,0,0,0,0,90,7,0,0,0,0,0,1,0,0,0,0,0,0,0,'Frostborn Scout - On Spawn - Set Bytes 1'); diff --git a/sql/updates/world/2013_11_04_00_world_creature_template.sql b/sql/updates/world/2013_11_04_00_world_creature_template.sql new file mode 100644 index 00000000000..4eeb702bb73 --- /dev/null +++ b/sql/updates/world/2013_11_04_00_world_creature_template.sql @@ -0,0 +1,2 @@ +UPDATE `creature_template` SET `speed_walk`=1, `speed_run`=1 WHERE `entry`=16236; -- Eye Stalk +UPDATE `creature_template` SET `speed_run`=1.14286 WHERE `entry`=28948; -- Malmortis diff --git a/sql/updates/world/2013_11_04_01_world_misc.sql b/sql/updates/world/2013_11_04_01_world_misc.sql new file mode 100644 index 00000000000..fa961b0416d --- /dev/null +++ b/sql/updates/world/2013_11_04_01_world_misc.sql @@ -0,0 +1,9 @@ +-- +UPDATE `creature_template` SET `ainame`='SmartAI' WHERE `entry` IN (20813,20815,20816,20814); + +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (20813,20815,20816,20814) AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(20813,0,0,0,8,0,100,0,35724,0,0,0,33,20813,0,0,0,0,0,7,0,0,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, Barracks - On Spell Hit (Throw Torch) - Quest Credit'), +(20814,0,0,0,8,0,100,0,35724,0,0,0,33,20814,0,0,0,0,0,7,0,0,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, Stable - On Spell Hit (Throw Torch) - Quest Credit'), +(20815,0,0,0,8,0,100,0,35724,0,0,0,33,20815,0,0,0,0,0,7,0,0,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, East Hovel - On Spell Hit (Throw Torch) - Quest Credit'), +(20816,0,0,0,8,0,100,0,35724,0,0,0,33,20816,0,0,0,0,0,7,0,0,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, West Hovel - On Spell Hit (Throw Torch) - Quest Credit'); diff --git a/sql/updates/world/2013_11_04_02_world_misc.sql b/sql/updates/world/2013_11_04_02_world_misc.sql new file mode 100644 index 00000000000..ccf522427e5 --- /dev/null +++ b/sql/updates/world/2013_11_04_02_world_misc.sql @@ -0,0 +1,4 @@ +-- +UPDATE `creature_template` SET `npcflag`=129 WHERE `entry` = 33238; +UPDATE `creature_template` SET `npcflag`=129 WHERE `entry` = 33239; +UPDATE `creature_template` SET `speed_walk`=1, `speed_run`=1 WHERE `entry`=29613; -- Eye Stalk (1) diff --git a/sql/updates/world/2013_11_04_03_world_misc.sql b/sql/updates/world/2013_11_04_03_world_misc.sql new file mode 100644 index 00000000000..3d75b951eae --- /dev/null +++ b/sql/updates/world/2013_11_04_03_world_misc.sql @@ -0,0 +1,8 @@ +UPDATE `creature_template` SET `npcflag`=16777216 WHERE `entry` IN (35415, 35413, 35419, 35429); -- Demolisher, Catapult, Glaive Thrower & Keep Cannon + +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (35415, 35413, 35419, 35429); +INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUES +(35415, 66245, 1, 0), -- Demolisher (Ride Vehicle) +(35413, 66245, 1, 0), -- Catapult (Ride Vehicle) +(35419, 68503, 1, 0), -- Glaive Thrower (Ride Vehicle) +(35429, 68458, 1, 0); -- Keep Cannon (Keep Cannon) diff --git a/sql/updates/world/2013_11_04_04_world_misc.sql b/sql/updates/world/2013_11_04_04_world_misc.sql new file mode 100644 index 00000000000..1d07791d928 --- /dev/null +++ b/sql/updates/world/2013_11_04_04_world_misc.sql @@ -0,0 +1,21 @@ +-- 10913 An Improper Burial + +DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN(21859,21846,21869); + +UPDATE creature_template SET AIName='SmartAI' WHERE entry IN(21859,21846,21869); + +DELETE FROM `smart_scripts` WHERE `entryorguid`IN(21859,21846,21869) AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(21859,0,0,1,8,0,100,1,39189,0,0,0,11,59216,0,0,0,0,0,1,0,0,0,0,0,0,0,'Slain Sha tar Vindicator - On Spellhit (Sha tari Torch) - Cast Burning Corpse'), +(21859,0,1,2,61,0,100,0,0,0,0,0,33,21859,0,0,0,0,0,7,0,0,0,0,0,0,0,'Slain Sha tar Vindicator - Linked with Previous Event - Give Kill Credit'), +(21859,0,2,3,61,0,100,0,0,0,0,0,11,37759,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Slain Sha tar Vindicator - Linked with Previous Event - Cast Bone Wastes - Summon Draenei Guardian Spirit'), +(21859,0,3,0,61,0,100,0,0,0,0,0,41,15000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Slain Sha tar Vindicator - Linked with Previous Event - Despawn after 15 seconds'), +(21846,0,0,1,8,0,100,1,39189,0,0,0,11,59216,0,0,0,0,0,1,0,0,0,0,0,0,0,'Slain Auchenai Warrior - On Spellhit (Sha tari Torch) - Cast Burning Corpse'), +(21846,0,1,2,61,0,100,0,0,0,0,0,33,21846,0,0,0,0,0,7,0,0,0,0,0,0,0,'Slain Auchenai Warrior - Linked with Previous Event - Give Kill Credit'), +(21846,0,2,0,61,0,100,0,0,0,0,0,41,15000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Slain Auchenai Warrior - Linked with Previous Event - Despawn after 15 seconds'), +(21869,0,0,1,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0.0,0.0,0.0,0.0,'Unliving Guardian - Link - Set Rendom Move'), +(21869,0,1,0,61,0,100,0,0,0,0,0,41,300000,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,'Unliving Guardian - On Spawn - Force Despawn 5 min'); + +DELETE FROM `creature_template_addon` WHERE `entry`=21869; +INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES +(21869, 0, 0, 0, 4097, 0, '17327'); diff --git a/sql/updates/world/2013_11_04_05_world_misc.sql b/sql/updates/world/2013_11_04_05_world_misc.sql new file mode 100644 index 00000000000..cad4739c8f0 --- /dev/null +++ b/sql/updates/world/2013_11_04_05_world_misc.sql @@ -0,0 +1,5 @@ +-- +DELETE FROM `smart_scripts` WHERE `entryorguid`=29445 AND `source_type`=0 AND `id`=1; + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(29445, 0, 1, 0, 19, 0, 100, 0, 12924, 0, 0, 0, 85, 56518, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Thorim - On Quest Accept (Forging an Alliance) - Cast Clearquests'); diff --git a/sql/updates/world/2013_11_04_06_world_misc.sql b/sql/updates/world/2013_11_04_06_world_misc.sql new file mode 100644 index 00000000000..982cd82a91f --- /dev/null +++ b/sql/updates/world/2013_11_04_06_world_misc.sql @@ -0,0 +1,8 @@ +-- +DELETE FROM `smart_scripts` WHERE `entryorguid`=28518 AND `source_type`=0 AND `id` BETWEEN 5 AND 8; + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(28518, 0, 5, 0, 19, 0, 100, 0, 12676, 0, 0, 0, 85, 55413, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Stefan Vadu - On quest accept (Sabotage) - Cast Clearquest'), +(28518, 0, 6, 0, 19, 0, 100, 0, 12669, 0, 0, 0, 85, 55411, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Stefan Vadu - On quest accept (So Far, So Bad) - Cast Clearquest'), +(28518, 0, 7, 0, 19, 0, 100, 0, 12677, 0, 0, 0, 85, 55412, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Stefan Vadu - On quest accept (Hazardous Materials) - Cast Clearquest'), +(28518, 0, 8, 0, 19, 0, 100, 0, 12661, 0, 0, 0, 85, 55410, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Stefan Vadu - On quest accept (Infiltrating Voltarus) - Cast Clearquests'); diff --git a/sql/updates/world/2013_11_04_07_world_sai.sql b/sql/updates/world/2013_11_04_07_world_sai.sql new file mode 100644 index 00000000000..b0434eccf5b --- /dev/null +++ b/sql/updates/world/2013_11_04_07_world_sai.sql @@ -0,0 +1,9 @@ +SET @Mammoth := 28851; -- NPC: Enraged Mammoth + +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Mammoth AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@Mammoth,0,0,1,8,0,100,0,52596,0,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,'Enraged Mammoth - On Spell Hit(Medallion of Mam''toth) - Change Faction To friendly'), +(@Mammoth,0,1,0,61,0,100,0,0,0,0,0,81,16777216,0,0,0,0,0,1,0,0,0,0,0,0,0,'Enraged Mammoth - Link With Previous Event - Set Flags 16777216'), +(@Mammoth,0,2,3,1,0,100,0,10000,10000,10000,10000,2,1924,0,0,0,0,0,1,0,0,0,0,0,0,0,'Enraged Mammoth - On OOC for 10 sec - Change Faction Back To Normal'), +(@Mammoth,0,3,0,61,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Enraged Mammoth - Link With Previous Event - Restore flags'), +(@Mammoth,0,4,0,28,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Enraged Mammoth - On Passenger Removed - Despawn'); diff --git a/sql/updates/world/2013_11_04_08_world_sai.sql b/sql/updates/world/2013_11_04_08_world_sai.sql new file mode 100644 index 00000000000..2feb5db3803 --- /dev/null +++ b/sql/updates/world/2013_11_04_08_world_sai.sql @@ -0,0 +1,48 @@ +-- +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=30098; + +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13,7,30098,0,0,31,0,3,17253,0,0,0, '', 'Defile Uthers Tomb Targets Defile Uthers Tomb Trigger'), +(13,7,30098,0,1,31,0,5,181653,0,0,0, '', 'Defile Uthers Tomb Targets Temp Uthers Statue'); + +DELETE FROM `smart_scripts` WHERE `entryorguid` IN(17253,1854) AND `source_type`=0; + +UPDATE creature_template SET `InhabitType`=4 WHERE entry IN(17233); +UPDATE creature_template SET AIName='SmartAI' WHERE entry IN(17253,1854); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry` =30098; + +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(17, 0, 30098, 0, 0, 29, 0, 17233, 40, 0, 1, 0, 0, '', 'Cant cast Defile Uthers Tomb within 40 yards of Ghost of Uther Lightbringer'); + + +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(17253,0,0,0,8,0,100,0,30098,0,60000,60000,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Defile Uthers Tomb Trigger - On Spellhit - Set Phase 2'), +(17253,0,1,2,1,2,100,0,5000,5000,5000,5000,1,4,10000,0,0,0,0,9,17233,0,200,0,0,0,0,'Defile Uthers Tomb Trigger - OOC (Phase 2) - Say Line 4 on Ghost of Uther the Lightbringer'), +(17253,0,2,0,61,2,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Defile Uthers Tomb Trigger - Linked with Previous Event (Phase 2) - Set Phase 1'), +(17253,0,3,0,52,0,100,0,4,17233,0,0,1,5,10000,0,0,0,0,9,17233,0,200,0,0,0,0,'Defile Uthers Tomb Trigger - On Text Over on Ghost of Uther (line 4) - Say Line 5 on Ghost of Uther the Lightbringer'), +(17253,0,4,0,52,0,100,0,5,17233,0,0,1,6,10000,0,0,0,0,9,17233,0,200,0,0,0,0,'Defile Uthers Tomb Trigger - On Text Over on Ghost of Uther (line 5) - Say Line 6 on Ghost of Uther the Lightbringer'), +(17253,0,5,0,52,0,100,0,6,17233,0,0,1,7,10000,0,0,0,0,9,17233,0,200,0,0,0,0,'Defile Uthers Tomb Trigger - On Text Over on Ghost of Uther (line 6) - Say Line 7 on Ghost of Uther the Lightbringer'), +(1854,0,0,0,4,0,100,0,0,0,0,0,1,1,10000,0,0,0,0,1,0,0,0,0,0,0,0,'High Priest Thel danis - On Agro - Say Line 1'), +(1854,0,1,0,16,0,100,0,10951,50,6000,6000,11,10951,0,0,0,0,0,1,0,0,0,0,0,0,0,'High Priest Thel danis - On Missing Inner Fire (Rank 4) - Cast Inner Fire (Rank 4)'), +(1854,0,2,0,2,0,100,0,0,50,15000,15000,11,30155,0,0,0,0,0,1,0,0,0,0,0,0,0,'High Priest Thel danis - On Low HP - Cast Heal'), +(1854,0,3,0,0,0,100,0,0,0,2500,3000,11,15498,0,0,0,0,0,2,0,0,0,0,0,0,0,'High Priest Thel danis - IC - Cast Holy Smite'), +(1854,0,4,0,25,0,100,0,0,0,0,0,11,10591,0,0,0,0,0,1,0,0,0,0,0,0,0,'High Priest Thel danis - On Spawn - Cast Inner Fire (Rank 4)'); + +-- Event script to spawn Ghost of Uther the Lightbringer in correct place, seems the trigger npc is in exact spot where spawns in video so using the co-ordinates of that + +DELETE FROM `event_scripts` WHERE `id`=10561; +INSERT INTO `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES +(10561, 0, 10, 17233, 90000, 0, 972.969971, -1824.719971, 82.540703, 0.2935); + +-- Texts groupid 0,1,2,3 are for alliance quest so starting from 4 here + +DELETE FROM `creature_text` WHERE `entry`=17233 AND `groupid` BETWEEN 4 AND 7; +DELETE FROM `creature_text` WHERE `entry`=1854 AND `groupid`=1; + +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(17233, 4, 0, 'Why do you do this? Did I somehow wrong you in life?', 12, 0, 100, 0, 0, 0, 'Ghost of Uther Lightbringer '), +(17233, 5, 0, 'Ah, I see it now in your mind. This is the work of one of my former students... Mehlar Dawnblade. It is sad to know that his heart has turned so dark.', 12, 0, 100, 0, 0, 0, 'Ghost of Uther Lightbringer'), +(17233, 6, 0, 'Return to him. Return to Mehlor and tell him that I forgive him and that I understand why he believes what he does.', 12, 0, 100, 0, 0, 0, 'Ghost of Uther Lightbringer '), +(17233, 7, 0, 'I can only hope that he will see the Light and instead turn his energies to restoring once-beautiful Quel''Thalas.', 12, 0, 100, 0, 0, 0, 'Ghost of Uther Lightbringer '), +(1854, 1, 0, 'By the Light you will leave this tomb!', 12, 0, 100, 0, 0, 0, 'High Priest Thel danis'); diff --git a/sql/updates/world/2013_11_05_00_world_sai.sql b/sql/updates/world/2013_11_05_00_world_sai.sql new file mode 100644 index 00000000000..972ac09bc94 --- /dev/null +++ b/sql/updates/world/2013_11_05_00_world_sai.sql @@ -0,0 +1,2 @@ +-- +UPDATE `smart_scripts` SET `action_param1`=10951 WHERE `entryorguid`=1854 AND `source_type`=0 AND `id`=4 AND `link`=0; diff --git a/sql/updates/world/2013_11_06_00_world_creature_formations.sql b/sql/updates/world/2013_11_06_00_world_creature_formations.sql new file mode 100644 index 00000000000..2e4795fcc90 --- /dev/null +++ b/sql/updates/world/2013_11_06_00_world_creature_formations.sql @@ -0,0 +1,2 @@ +ALTER TABLE creature_formations ADD point_1 MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0; +ALTER TABLE creature_formations ADD point_2 MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0; diff --git a/sql/updates/world/2013_11_06_01_world_creature_formations.sql b/sql/updates/world/2013_11_06_01_world_creature_formations.sql new file mode 100644 index 00000000000..b52421bc22d --- /dev/null +++ b/sql/updates/world/2013_11_06_01_world_creature_formations.sql @@ -0,0 +1,7 @@ +UPDATE `creature_formations` SET `point_1`=18, `point_2`=36 WHERE `memberGUID`=127058; +UPDATE `creature_formations` SET `point_1`=9, `point_2`=17 WHERE `memberGUID` IN (202695,202696); +UPDATE `creature_formations` SET `point_1`=3, `point_2`=6 WHERE `memberGUID`=201735; +UPDATE `creature_formations` SET `point_1`=3, `point_2`=7 WHERE `memberGUID` IN (202680,202682); +UPDATE `creature_formations` SET `point_1`=3, `point_2`=8 WHERE `memberGUID` IN (201764); +UPDATE `creature_formations` SET `point_1`=2, `point_2`=5 WHERE `memberGUID` IN (202805,202806); +UPDATE `creature_formations` SET `point_1`=1, `point_2`=6 WHERE `memberGUID` IN (202803,202804,202681,202684); diff --git a/sql/updates/world/2013_11_07_00_world_creature_template.sql b/sql/updates/world/2013_11_07_00_world_creature_template.sql new file mode 100644 index 00000000000..93ad79e0ad9 --- /dev/null +++ b/sql/updates/world/2013_11_07_00_world_creature_template.sql @@ -0,0 +1,2 @@ +UPDATE `creature_template` SET `speed_walk`=1.0 WHERE `entry` IN (2674,25855,28887); +UPDATE `creature_template` SET `speed_run`=1.14286,`speed_walk`=1.0 WHERE `entry`=28833; diff --git a/sql/updates/world/2013_11_07_01_world_smart_scripts.sql b/sql/updates/world/2013_11_07_01_world_smart_scripts.sql new file mode 100644 index 00000000000..f8cbba56598 --- /dev/null +++ b/sql/updates/world/2013_11_07_01_world_smart_scripts.sql @@ -0,0 +1 @@ +UPDATE `smart_scripts` SET `link`=0, `action_type`=11, `action_param1`=43787, `action_param2`=0 WHERE `entryorguid`=24399 AND `id`=5; diff --git a/sql/updates/world/2013_11_07_02_world_creature_text.sql b/sql/updates/world/2013_11_07_02_world_creature_text.sql new file mode 100644 index 00000000000..f1ad3ab4b56 --- /dev/null +++ b/sql/updates/world/2013_11_07_02_world_creature_text.sql @@ -0,0 +1,10 @@ +-- Creature text for Wrath-Scryer Soccothrates +SET @ENTRY = 20886; +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY, 0, 0, 'Have you come to kill Dalliah? Can I watch?', 14, 0, 100, 0, 0, 11237, 'Wrath-Scryer Soccothrates - OCC'), +(@ENTRY, 1, 0, 'At last, a target for my frustrations!', 14, 0, 100, 0, 0, 11238, 'Wrath-Scryer Soccothrates - Aggro'), +(@ENTRY, 2, 0, 'Yes, that was quite satisfying', 14, 0, 100, 0, 0, 11239, 'Wrath-Scryer Soccothrates - Kill'), +(@ENTRY, 3, 0, 'On guard!', 14, 0, 100, 0, 0, 11241, 'Wrath-Scryer Soccothrates - Charge'), +(@ENTRY, 3, 1, 'Defend yourself, for all the good it will do...', 14, 0, 100, 0, 0, 11242, 'Wrath-Scryer Soccothrates - Charge'), +(@ENTRY, 4, 0, 'Knew this was... the only way out', 14, 0, 100, 0, 0, 11243, 'Wrath-Scryer Soccothrates - Death'); diff --git a/sql/updates/world/2013_11_07_03_world_creature_text.sql b/sql/updates/world/2013_11_07_03_world_creature_text.sql new file mode 100644 index 00000000000..2218f77a274 --- /dev/null +++ b/sql/updates/world/2013_11_07_03_world_creature_text.sql @@ -0,0 +1,32 @@ +-- Creature text for Dalliah the Doomsayer +SET @ENTRY = 20885; +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY, 0, 0, 'Don''t worry about me; kill that worthless dullard instead!', 14, 0, 100, 0, 0, 11085, 'Dalliah the Doomsayer - Aggro Soccothrates First'), +(@ENTRY, 1, 0, 'It is unwise to anger me.', 14, 0, 100, 0, 0, 11086, 'Dalliah the Doomsayer - Aggro'), +(@ENTRY, 2, 0, 'Completely ineffective. Just like someone else I know.', 14, 0, 100, 0, 0, 11087, 'Dalliah the Doomsayer - Kill'), +(@ENTRY, 2, 1, 'You chose the wrong opponent.', 14, 0, 100, 0, 0, 11088, 'Dalliah the Doomsayer - Kill'), +(@ENTRY, 3, 0, 'Reap the Whirlwind!', 14, 0, 100, 0, 0, 11089, 'Dalliah the Doomsayer - Cast Whirlwind'), +(@ENTRY, 3, 1, 'I''ll cut you to pieces!', 14, 0, 100, 0, 0, 11090, 'Dalliah the Doomsayer - Cast Whirlwind'), +(@ENTRY, 4, 0, 'Ahh... That is much better.', 14, 0, 100, 0, 0, 11091, 'Dalliah the Doomsayer - Cast Heal'), +(@ENTRY, 4, 1, 'Ahh... Just what I needed.', 14, 0, 100, 0, 0, 11092, 'Dalliah the Doomsayer - Cast Heal'), +(@ENTRY, 5, 0, 'Now I''m really... angry...', 14, 0, 100, 0, 0, 11093, 'Dalliah the Doomsayer - Death'), +(@ENTRY, 6, 0, 'More than you can handle, scryer?', 14, 0, 100, 0, 0, 11094, 'Dalliah the Doomsayer - Soccothrates at 25%'), +(@ENTRY, 6, 1, 'I suppose I''ll end up fighting them all myself.', 14, 0, 100, 0, 0, 11095, 'Dalliah the Doomsayer - Soccothrates at 25%'), +(@ENTRY, 6, 2, 'I''ve grown used to cleaning up your messes.', 14, 0, 100, 0, 0, 11096, 'Dalliah the Doomsayer - Soccothrates at 25%'), +(@ENTRY, 7, 0, 'Congratulations. I''ve wanted to do that for years.', 14, 0, 100, 0, 0, 11097, 'Dalliah the Doomsayer - Soccothratess dies'); + +-- Creature text for Wrath-Scryer Soccothrates +SET @ENTRY = 20886; +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY, 0, 0, 'Have you come to kill Dalliah? Can I watch?', 14, 0, 100, 0, 0, 11237, 'Wrath-Scryer Soccothrates - Aggro Dalliah First'), +(@ENTRY, 1, 0, 'At last, a target for my frustrations!', 14, 0, 100, 0, 0, 11238, 'Wrath-Scryer Soccothrates - Aggro'), +(@ENTRY, 2, 0, 'Yes, that was quite satisfying', 14, 0, 100, 0, 0, 11239, 'Wrath-Scryer Soccothrates - Kill'), +(@ENTRY, 3, 0, 'On guard!', 14, 0, 100, 0, 0, 11241, 'Wrath-Scryer Soccothrates - Charge'), +(@ENTRY, 3, 1, 'Defend yourself, for all the good it will do...', 14, 0, 100, 0, 0, 11242, 'Wrath-Scryer Soccothrates - Charge'), +(@ENTRY, 4, 0, 'Knew this was... the only way out', 14, 0, 100, 0, 0, 11243, 'Wrath-Scryer Soccothrates - Death'), +(@ENTRY, 5, 0, 'Having problems, Dalliah? How nice.', 14, 0, 100, 0, 0, 11244, 'Wrath-Scryer Soccothrates - Dalliah at 25%'), +(@ENTRY, 5, 1, 'This may be the end of you Dalliah, what a shame that would be.', 14, 0, 100, 0, 0, 11245, 'Wrath-Scryer Soccothrates - Dalliah at 25%'), +(@ENTRY, 5, 2, 'I suggest a new strategy, you draw the attackers while I gather reinforcements. Hahaha!', 14, 0, 100, 0, 0, 11246, 'Wrath-Scryer Soccothrates - Dalliah at 25%'), +(@ENTRY, 6, 0, 'Finally! Well done!', 14, 0, 100, 0, 0, 11247, 'Wrath-Scryer Soccothrates - Dalliah dies'); diff --git a/sql/updates/world/2013_11_07_04_world_creature_text.sql b/sql/updates/world/2013_11_07_04_world_creature_text.sql new file mode 100644 index 00000000000..f75f42f6a7a --- /dev/null +++ b/sql/updates/world/2013_11_07_04_world_creature_text.sql @@ -0,0 +1,10 @@ +-- Creature text for Mennu the Betrayer +SET @ENTRY = 17941; +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY, 0, 0, 'The work must continue.', 14, 0, 100, 0, 0, 10376, 'Mennu the Betrayer - Aggro'), +(@ENTRY, 0, 1, 'You brought this on yourselves.', 14, 0, 100, 0, 0, 10378, 'Mennu the Betrayer - Aggro'), +(@ENTRY, 0, 2, 'Don''t make me kill you!', 14, 0, 100, 0, 0, 10379, 'Mennu the Betrayer - Aggro'), +(@ENTRY, 1, 0, 'It had to be done.', 14, 0, 100, 0, 0, 10380, 'Mennu the Betrayer - Kill'), +(@ENTRY, 1, 1, 'You should not have come.', 14, 0, 100, 0, 0, 10381, 'Mennu the Betrayer - Kill'), +(@ENTRY, 2, 0, 'I... Deserve this.', 14, 0, 100, 0, 0, 10382, 'Mennu the Betrayer - Death'); diff --git a/sql/updates/world/2013_11_07_05_world_misc.sql b/sql/updates/world/2013_11_07_05_world_misc.sql new file mode 100644 index 00000000000..5467468192f --- /dev/null +++ b/sql/updates/world/2013_11_07_05_world_misc.sql @@ -0,0 +1,10 @@ +-- Remove some unused creature_ai_texts +DELETE FROM creature_ai_texts WHERE entry IN (-1,-133,-134,-135,-136,-137,-138,-139,-217,-218,-219,-220,-221,-222,-223,-224,-225,-226,-227,-810,-811,-812,-813,-814,-815); +DELETE FROM creature_ai_texts WHERE entry BETWEEN -876 AND -841; +DELETE FROM creature_ai_texts WHERE entry BETWEEN -643 AND -634; +DELETE FROM creature_ai_texts WHERE entry BETWEEN -763 AND -740; +-- Clean up some EAI errors +UPDATE creature_ai_scripts SET action1_param2 = 0 WHERE action1_type = 1 AND creature_id IN (22992,22993,22994,23163); +-- Remove some EAI already converted to cpp +DELETE FROM creature_ai_scripts WHERE creature_id IN (26529,26530,26532,26533); +UPDATE creature_template SET AIName = '' WHERE entry IN (26529,26530,26532,26533); diff --git a/src/server/authserver/Realms/RealmList.h b/src/server/authserver/Realms/RealmList.h index d59990135f2..bf9493ad372 100644 --- a/src/server/authserver/Realms/RealmList.h +++ b/src/server/authserver/Realms/RealmList.h @@ -60,7 +60,7 @@ public: typedef std::map<std::string, Realm> RealmMap; RealmList(); - ~RealmList() {} + ~RealmList() { } void Initialize(uint32 updateInterval); diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp index 4a9d3ce7faf..4312548116a 100644 --- a/src/server/authserver/Server/AuthSocket.cpp +++ b/src/server/authserver/Server/AuthSocket.cpp @@ -206,7 +206,7 @@ AuthSocket::AuthSocket(RealmSocket& socket) : } // Close patch file descriptor before leaving -AuthSocket::~AuthSocket(void) {} +AuthSocket::~AuthSocket(void) { } // Accept the connection void AuthSocket::OnAccept(void) @@ -1096,9 +1096,7 @@ PatcherRunnable::PatcherRunnable(class AuthSocket* as) } // Send content of patch file to the client -void PatcherRunnable::run() -{ -} +void PatcherRunnable::run() { } // Preload MD5 hashes of existing patch files on server #ifndef _WIN32 diff --git a/src/server/authserver/Server/RealmSocket.cpp b/src/server/authserver/Server/RealmSocket.cpp index 88d81132306..acefa4b1af7 100644 --- a/src/server/authserver/Server/RealmSocket.cpp +++ b/src/server/authserver/Server/RealmSocket.cpp @@ -23,7 +23,7 @@ #include "RealmSocket.h" #include "Log.h" -RealmSocket::Session::Session(void) {} +RealmSocket::Session::Session(void) { } RealmSocket::Session::~Session(void) { } diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist index 3c811eda3b3..83edf9669ac 100644 --- a/src/server/authserver/authserver.conf.dist +++ b/src/server/authserver/authserver.conf.dist @@ -219,6 +219,11 @@ LoginDatabase.WorkerThreads = 1 Appender.Console=1,2,0 Appender.Auth=2,2,0,Auth.log,w +# Logger config values: Given a logger "name" +# Logger.name +# Description: Defines 'What to log' +# Format: LogLevel,AppenderList +# # LogLevel # 0 - (Disabled) # 1 - (Trace) @@ -231,33 +236,8 @@ Appender.Auth=2,2,0,Auth.log,w # AppenderList: List of appenders linked to logger # (Using spaces as separator). # -# Appenders -# Description: List of Appenders to read from config -# (Using spaces as separator). -# Default: "Console Server" - -Appenders=Console Auth - -# Logger config values: Given a logger "name" -# Logger.name -# Description: Defines 'What to log' -# Format: Type,LogLevel,AppenderList -# Type -# 0 - Default. Each type that has no config will -# rely on this one. Core will create this logger -# (disabled) if it's not configured -# 7 - Network input/output, -# 30 - Authserver - -Logger.Root=0,3,Console Auth - -# -# Loggers -# Description: List of Loggers to read from config -# (Using spaces as separator). -# Default: "root" -Loggers=Root +Logger.root=3,Console Auth # ################################################################################################### diff --git a/src/server/collision/BoundingIntervalHierarchyWrapper.h b/src/server/collision/BoundingIntervalHierarchyWrapper.h index 8696a759fa8..8aafc023a20 100644 --- a/src/server/collision/BoundingIntervalHierarchyWrapper.h +++ b/src/server/collision/BoundingIntervalHierarchyWrapper.h @@ -35,7 +35,7 @@ class BIHWrap RayCallback& _callback; uint32 objects_size; - MDLCallback(RayCallback& callback, const T* const* objects_array, uint32 objects_size ) : objects(objects_array), _callback(callback), objects_size(objects_size) {} + MDLCallback(RayCallback& callback, const T* const* objects_array, uint32 objects_size ) : objects(objects_array), _callback(callback), objects_size(objects_size) { } /// Intersect ray bool operator() (const G3D::Ray& ray, uint32 idx, float& maxDist, bool /*stopAtFirst*/) @@ -66,7 +66,7 @@ class BIHWrap int unbalanced_times; public: - BIHWrap() : unbalanced_times(0) {} + BIHWrap() : unbalanced_times(0) { } void insert(const T& obj) { diff --git a/src/server/collision/DynamicTree.cpp b/src/server/collision/DynamicTree.cpp index aebcee0d689..4b2878169d7 100644 --- a/src/server/collision/DynamicTree.cpp +++ b/src/server/collision/DynamicTree.cpp @@ -107,9 +107,7 @@ struct DynTreeImpl : public ParentTree/*, public Intersectable*/ int unbalanced_times; }; -DynamicMapTree::DynamicMapTree() : impl(new DynTreeImpl()) -{ -} +DynamicMapTree::DynamicMapTree() : impl(new DynTreeImpl()) { } DynamicMapTree::~DynamicMapTree() { @@ -150,7 +148,7 @@ struct DynamicTreeIntersectionCallback { bool did_hit; uint32 phase_mask; - DynamicTreeIntersectionCallback(uint32 phasemask) : did_hit(false), phase_mask(phasemask) {} + DynamicTreeIntersectionCallback(uint32 phasemask) : did_hit(false), phase_mask(phasemask) { } bool operator()(const G3D::Ray& r, const GameObjectModel& obj, float& distance) { did_hit = obj.intersectRay(r, distance, true, phase_mask); diff --git a/src/server/collision/Management/IVMapManager.h b/src/server/collision/Management/IVMapManager.h index 9289d820e5b..7269d2e05f4 100644 --- a/src/server/collision/Management/IVMapManager.h +++ b/src/server/collision/Management/IVMapManager.h @@ -49,9 +49,9 @@ namespace VMAP bool iEnableHeightCalc; public: - IVMapManager() : iEnableLineOfSightCalc(true), iEnableHeightCalc(true) {} + IVMapManager() : iEnableLineOfSightCalc(true), iEnableHeightCalc(true) { } - virtual ~IVMapManager(void) {} + virtual ~IVMapManager(void) { } virtual int loadMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0; diff --git a/src/server/collision/Management/MMapManager.h b/src/server/collision/Management/MMapManager.h index 56b1b856d65..9a04d638805 100644 --- a/src/server/collision/Management/MMapManager.h +++ b/src/server/collision/Management/MMapManager.h @@ -33,7 +33,7 @@ namespace MMAP // dummy struct to hold map's mmap data struct MMapData { - MMapData(dtNavMesh* mesh) : navMesh(mesh) {} + MMapData(dtNavMesh* mesh) : navMesh(mesh) { } ~MMapData() { for (NavMeshQuerySet::iterator i = navMeshQueries.begin(); i != navMeshQueries.end(); ++i) @@ -58,7 +58,7 @@ namespace MMAP class MMapManager { public: - MMapManager() : loadedTiles(0) {} + MMapManager() : loadedTiles(0) { } ~MMapManager(); bool loadMap(const std::string& basePath, uint32 mapId, int32 x, int32 y); diff --git a/src/server/collision/Management/VMapManager2.h b/src/server/collision/Management/VMapManager2.h index 51f15f0fda4..644e6004201 100644 --- a/src/server/collision/Management/VMapManager2.h +++ b/src/server/collision/Management/VMapManager2.h @@ -53,7 +53,7 @@ namespace VMAP class ManagedModel { public: - ManagedModel() : iModel(0), iRefCount(0) {} + ManagedModel() : iModel(0), iRefCount(0) { } void setModel(WorldModel* model) { iModel = model; } WorldModel* getModel() { return iModel; } void incRefCount() { ++iRefCount; } diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp index 436f30eed10..d20c572cf71 100644 --- a/src/server/collision/Maps/MapTree.cpp +++ b/src/server/collision/Maps/MapTree.cpp @@ -36,7 +36,7 @@ namespace VMAP class MapRayCallback { public: - MapRayCallback(ModelInstance* val): prims(val), hit(false) {} + MapRayCallback(ModelInstance* val): prims(val), hit(false) { } bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool pStopAtFirstHit=true) { bool result = prims[entry].intersectRay(ray, distance, pStopAtFirstHit); @@ -53,7 +53,7 @@ namespace VMAP class AreaInfoCallback { public: - AreaInfoCallback(ModelInstance* val): prims(val) {} + AreaInfoCallback(ModelInstance* val): prims(val) { } void operator()(const Vector3& point, uint32 entry) { #ifdef VMAP_DEBUG @@ -69,7 +69,7 @@ namespace VMAP class LocationInfoCallback { public: - LocationInfoCallback(ModelInstance* val, LocationInfo &info): prims(val), locInfo(info), result(false) {} + LocationInfoCallback(ModelInstance* val, LocationInfo &info): prims(val), locInfo(info), result(false) { } void operator()(const Vector3& point, uint32 entry) { #ifdef VMAP_DEBUG diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h index c66893da82f..1440ee0f250 100644 --- a/src/server/collision/Maps/MapTree.h +++ b/src/server/collision/Maps/MapTree.h @@ -31,7 +31,7 @@ namespace VMAP struct LocationInfo { - LocationInfo(): hitInstance(0), hitModel(0), ground_Z(-G3D::inf()) {} + LocationInfo(): hitInstance(0), hitModel(0), ground_Z(-G3D::inf()) { } const ModelInstance* hitInstance; const GroupModel* hitModel; float ground_Z; @@ -86,7 +86,7 @@ namespace VMAP struct AreaInfo { AreaInfo(): result(false), ground_Z(-G3D::inf()), flags(0), adtId(0), - rootId(0), groupId(0) {} + rootId(0), groupId(0) { } bool result; float ground_Z; uint32 flags; diff --git a/src/server/collision/Maps/TileAssembler.h b/src/server/collision/Maps/TileAssembler.h index 56cb7600e4f..715f228c3df 100644 --- a/src/server/collision/Maps/TileAssembler.h +++ b/src/server/collision/Maps/TileAssembler.h @@ -76,7 +76,7 @@ namespace VMAP class WmoLiquid* liquid; GroupModel_Raw() : mogpflags(0), GroupWMOID(0), liquidflags(0), - liquid(NULL) {} + liquid(NULL) { } ~GroupModel_Raw(); bool Read(FILE* f); diff --git a/src/server/collision/Models/GameObjectModel.cpp b/src/server/collision/Models/GameObjectModel.cpp index a3af175a977..fee165ef44a 100644 --- a/src/server/collision/Models/GameObjectModel.cpp +++ b/src/server/collision/Models/GameObjectModel.cpp @@ -37,7 +37,7 @@ using G3D::AABox; struct GameobjectModelData { GameobjectModelData(const std::string& name_, const AABox& box) : - bound(box), name(name_) {} + bound(box), name(name_) { } AABox bound; std::string name; diff --git a/src/server/collision/Models/GameObjectModel.h b/src/server/collision/Models/GameObjectModel.h index 44abed55267..143337e88f9 100644 --- a/src/server/collision/Models/GameObjectModel.h +++ b/src/server/collision/Models/GameObjectModel.h @@ -45,7 +45,7 @@ class GameObjectModel /*, public Intersectable*/ float iScale; VMAP::WorldModel* iModel; - GameObjectModel() : phasemask(0), iModel(NULL) {} + GameObjectModel() : phasemask(0), iModel(NULL) { } bool initialize(const GameObject& go, const GameObjectDisplayInfoEntry& info); public: diff --git a/src/server/collision/Models/ModelInstance.h b/src/server/collision/Models/ModelInstance.h index f26089bb46c..8ea2792393b 100644 --- a/src/server/collision/Models/ModelInstance.h +++ b/src/server/collision/Models/ModelInstance.h @@ -63,7 +63,7 @@ namespace VMAP class ModelInstance: public ModelSpawn { public: - ModelInstance(): iInvScale(0.0f), iModel(0) {} + ModelInstance(): iInvScale(0.0f), iModel(0) { } ModelInstance(const ModelSpawn &spawn, WorldModel* model); void setUnloaded() { iModel = 0; } bool intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit) const; diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp index 3c72cb80308..fcb28e5e331 100644 --- a/src/server/collision/Models/WorldModel.cpp +++ b/src/server/collision/Models/WorldModel.cpp @@ -84,7 +84,7 @@ namespace VMAP class TriBoundFunc { public: - TriBoundFunc(std::vector<Vector3> &vert): vertices(vert.begin()) {} + TriBoundFunc(std::vector<Vector3> &vert): vertices(vert.begin()) { } void operator()(const MeshTriangle &tri, G3D::AABox &out) const { G3D::Vector3 lo = vertices[tri.idx0]; @@ -360,7 +360,7 @@ namespace VMAP struct GModelRayCallback { GModelRayCallback(const std::vector<MeshTriangle> &tris, const std::vector<Vector3> &vert): - vertices(vert.begin()), triangles(tris.begin()), hit(false) {} + vertices(vert.begin()), triangles(tris.begin()), hit(false) { } bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool /*pStopAtFirstHit*/) { bool result = IntersectTriangle(triangles[entry], vertices, ray, distance); @@ -420,7 +420,7 @@ namespace VMAP struct WModelRayCallBack { - WModelRayCallBack(const std::vector<GroupModel> &mod): models(mod.begin()), hit(false) {} + WModelRayCallBack(const std::vector<GroupModel> &mod): models(mod.begin()), hit(false) { } bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool pStopAtFirstHit) { bool result = models[entry].IntersectRay(ray, distance, pStopAtFirstHit); @@ -446,7 +446,7 @@ namespace VMAP class WModelAreaCallback { public: WModelAreaCallback(const std::vector<GroupModel> &vals, const Vector3 &down): - prims(vals.begin()), hit(vals.end()), minVol(G3D::inf()), zDist(G3D::inf()), zVec(down) {} + prims(vals.begin()), hit(vals.end()), minVol(G3D::inf()), zDist(G3D::inf()), zVec(down) { } std::vector<GroupModel>::const_iterator prims; std::vector<GroupModel>::const_iterator hit; float minVol; diff --git a/src/server/collision/Models/WorldModel.h b/src/server/collision/Models/WorldModel.h index 9d588316cce..23fb1cdb7b6 100644 --- a/src/server/collision/Models/WorldModel.h +++ b/src/server/collision/Models/WorldModel.h @@ -36,8 +36,8 @@ namespace VMAP class MeshTriangle { public: - MeshTriangle(){} - MeshTriangle(uint32 na, uint32 nb, uint32 nc): idx0(na), idx1(nb), idx2(nc) {} + MeshTriangle(){ } + MeshTriangle(uint32 na, uint32 nb, uint32 nc): idx0(na), idx1(nb), idx2(nc) { } uint32 idx0; uint32 idx1; @@ -59,7 +59,7 @@ namespace VMAP bool writeToFile(FILE* wf); static bool readFromFile(FILE* rf, WmoLiquid* &liquid); private: - WmoLiquid(): iHeight(0), iFlags(0) {} + WmoLiquid(): iHeight(0), iFlags(0) { } uint32 iTilesX; //!< number of tiles in x direction, each uint32 iTilesY; G3D::Vector3 iCorner; //!< the lower corner @@ -74,10 +74,10 @@ namespace VMAP class GroupModel { public: - GroupModel(): iLiquid(0) {} + GroupModel(): iLiquid(0) { } GroupModel(const GroupModel &other); GroupModel(uint32 mogpFlags, uint32 groupWMOID, const G3D::AABox &bound): - iBound(bound), iMogpFlags(mogpFlags), iGroupWMOID(groupWMOID), iLiquid(0) {} + iBound(bound), iMogpFlags(mogpFlags), iGroupWMOID(groupWMOID), iLiquid(0) { } ~GroupModel() { delete iLiquid; } //! pass mesh data to object and create BIH. Passed vectors get get swapped with old geometry! @@ -107,7 +107,7 @@ namespace VMAP class WorldModel { public: - WorldModel(): RootWMOID(0) {} + WorldModel(): RootWMOID(0) { } //! pass group models to WorldModel and create BIH. Passed vector is swapped with old geometry! void setGroupModels(std::vector<GroupModel> &models); diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp index 85088bbeff4..3ad52aedb34 100644 --- a/src/server/game/AI/CoreAI/CombatAI.cpp +++ b/src/server/game/AI/CoreAI/CombatAI.cpp @@ -272,7 +272,7 @@ void TurretAI::UpdateAI(uint32 /*diff*/) //VehicleAI ////////////// -VehicleAI::VehicleAI(Creature* c) : CreatureAI(c), m_vehicle(c->GetVehicleKit()), m_IsVehicleInUse(false), m_ConditionsTimer(VEHICLE_CONDITION_CHECK_TIME) +VehicleAI::VehicleAI(Creature* c) : CreatureAI(c), m_IsVehicleInUse(false), m_ConditionsTimer(VEHICLE_CONDITION_CHECK_TIME) { LoadConditions(); m_DoDismiss = false; @@ -291,7 +291,9 @@ void VehicleAI::UpdateAI(uint32 diff) m_DoDismiss = false; me->SetVisible(false); me->DespawnOrUnsummon(); - }else m_DismissTimer -= diff; + } + else + m_DismissTimer -= diff; } } @@ -310,6 +312,7 @@ void VehicleAI::OnCharmed(bool apply) } else if (apply) m_DoDismiss = false;//in use again + m_DismissTimer = VEHICLE_DISMISS_TIME;//reset timer m_IsVehicleInUse = apply; } @@ -327,19 +330,22 @@ void VehicleAI::CheckConditions(const uint32 diff) { if (!conditions.empty()) { - for (SeatMap::iterator itr = m_vehicle->Seats.begin(); itr != m_vehicle->Seats.end(); ++itr) - if (Unit* passenger = ObjectAccessor::GetUnit(*m_vehicle->GetBase(), itr->second.Passenger.Guid)) - { - if (Player* player = passenger->ToPlayer()) + if( Vehicle* vehicleKit = me->GetVehicleKit()) + for (SeatMap::iterator itr = vehicleKit->Seats.begin(); itr != vehicleKit->Seats.end(); ++itr) + if (Unit* passenger = ObjectAccessor::GetUnit(*me, itr->second.Passenger.Guid)) { - if (!sConditionMgr->IsObjectMeetToConditions(player, me, conditions)) + if (Player* player = passenger->ToPlayer()) { - player->ExitVehicle(); - return;//check other pessanger in next tick + if (!sConditionMgr->IsObjectMeetToConditions(player, me, conditions)) + { + player->ExitVehicle(); + return;//check other pessanger in next tick + } } } - } } m_ConditionsTimer = VEHICLE_CONDITION_CHECK_TIME; - } else m_ConditionsTimer -= diff; + } + else + m_ConditionsTimer -= diff; } diff --git a/src/server/game/AI/CoreAI/CombatAI.h b/src/server/game/AI/CoreAI/CombatAI.h index 315ff861da9..16167d1be59 100644 --- a/src/server/game/AI/CoreAI/CombatAI.h +++ b/src/server/game/AI/CoreAI/CombatAI.h @@ -28,7 +28,7 @@ class Creature; class AggressorAI : public CreatureAI { public: - explicit AggressorAI(Creature* c) : CreatureAI(c) {} + explicit AggressorAI(Creature* c) : CreatureAI(c) { } void UpdateAI(uint32); static int Permissible(const Creature*); @@ -39,7 +39,7 @@ typedef std::vector<uint32> SpellVct; class CombatAI : public CreatureAI { public: - explicit CombatAI(Creature* c) : CreatureAI(c) {} + explicit CombatAI(Creature* c) : CreatureAI(c) { } void InitializeAI(); void Reset(); @@ -100,12 +100,11 @@ struct VehicleAI : public CreatureAI void UpdateAI(uint32 diff); static int Permissible(const Creature*); void Reset(); - void MoveInLineOfSight(Unit*) {} - void AttackStart(Unit*) {} + void MoveInLineOfSight(Unit*) { } + void AttackStart(Unit*) { } void OnCharmed(bool apply); private: - Vehicle* m_vehicle; bool m_IsVehicleInUse; void LoadConditions(); void CheckConditions(const uint32 diff); diff --git a/src/server/game/AI/CoreAI/GameObjectAI.cpp b/src/server/game/AI/CoreAI/GameObjectAI.cpp index 06e3a4b9ec4..adc82d7b018 100644 --- a/src/server/game/AI/CoreAI/GameObjectAI.cpp +++ b/src/server/game/AI/CoreAI/GameObjectAI.cpp @@ -18,7 +18,7 @@ #include "GameObjectAI.h" -//GameObjectAI::GameObjectAI(GameObject* g) : go(g) {} +//GameObjectAI::GameObjectAI(GameObject* g) : go(g) { } int GameObjectAI::Permissible(const GameObject* go) { if (go->GetAIName() == "GameObjectAI") @@ -26,4 +26,4 @@ int GameObjectAI::Permissible(const GameObject* go) return PERMIT_BASE_NO; } -NullGameObjectAI::NullGameObjectAI(GameObject* g) : GameObjectAI(g) {} +NullGameObjectAI::NullGameObjectAI(GameObject* g) : GameObjectAI(g) { } diff --git a/src/server/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h index 32a6e9a670c..0d5af4f8802 100644 --- a/src/server/game/AI/CoreAI/GameObjectAI.h +++ b/src/server/game/AI/CoreAI/GameObjectAI.h @@ -30,18 +30,18 @@ class GameObjectAI protected: GameObject* const go; public: - explicit GameObjectAI(GameObject* g) : go(g) {} - virtual ~GameObjectAI() {} + explicit GameObjectAI(GameObject* g) : go(g) { } + virtual ~GameObjectAI() { } - virtual void UpdateAI(uint32 /*diff*/) {} + virtual void UpdateAI(uint32 /*diff*/) { } virtual void InitializeAI() { Reset(); } virtual void Reset() { } // Pass parameters between AI - virtual void DoAction(int32 /*param = 0 */) {} - virtual void SetGUID(uint64 /*guid*/, int32 /*id = 0 */) {} + virtual void DoAction(int32 /*param = 0 */) { } + virtual void SetGUID(uint64 /*guid*/, int32 /*id = 0 */) { } virtual uint64 GetGUID(int32 /*id = 0 */) const { return 0; } static int Permissible(GameObject const* go); @@ -52,14 +52,14 @@ class GameObjectAI virtual bool QuestAccept(Player* /*player*/, Quest const* /*quest*/) { return false; } virtual bool QuestReward(Player* /*player*/, Quest const* /*quest*/, uint32 /*opt*/) { return false; } virtual uint32 GetDialogStatus(Player* /*player*/) { return 100; } - virtual void Destroyed(Player* /*player*/, uint32 /*eventId*/) {} + virtual void Destroyed(Player* /*player*/, uint32 /*eventId*/) { } virtual uint32 GetData(uint32 /*id*/) const { return 0; } - virtual void SetData64(uint32 /*id*/, uint64 /*value*/) {} + virtual void SetData64(uint32 /*id*/, uint64 /*value*/) { } virtual uint64 GetData64(uint32 /*id*/) const { return 0; } - virtual void SetData(uint32 /*id*/, uint32 /*value*/) {} - virtual void OnGameEvent(bool /*start*/, uint16 /*eventId*/) {} - virtual void OnStateChanged(uint32 /*state*/, Unit* /*unit*/) {} - virtual void EventInform(uint32 /*eventId*/) {} + virtual void SetData(uint32 /*id*/, uint32 /*value*/) { } + virtual void OnGameEvent(bool /*start*/, uint16 /*eventId*/) { } + virtual void OnStateChanged(uint32 /*state*/, Unit* /*unit*/) { } + virtual void EventInform(uint32 /*eventId*/) { } }; class NullGameObjectAI : public GameObjectAI @@ -67,7 +67,7 @@ class NullGameObjectAI : public GameObjectAI public: explicit NullGameObjectAI(GameObject* g); - void UpdateAI(uint32 /*diff*/) {} + void UpdateAI(uint32 /*diff*/) { } static int Permissible(GameObject const* /*go*/) { return PERMIT_BASE_IDLE; } }; diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp index 220d53a20e0..188ad4fb450 100644 --- a/src/server/game/AI/CoreAI/GuardAI.cpp +++ b/src/server/game/AI/CoreAI/GuardAI.cpp @@ -31,9 +31,7 @@ int GuardAI::Permissible(Creature const* creature) return PERMIT_BASE_NO; } -GuardAI::GuardAI(Creature* creature) : ScriptedAI(creature) -{ -} +GuardAI::GuardAI(Creature* creature) : ScriptedAI(creature) { } bool GuardAI::CanSeeAlways(WorldObject const* obj) { diff --git a/src/server/game/AI/CoreAI/PassiveAI.h b/src/server/game/AI/CoreAI/PassiveAI.h index cb047ff364b..58c9a348fe9 100644 --- a/src/server/game/AI/CoreAI/PassiveAI.h +++ b/src/server/game/AI/CoreAI/PassiveAI.h @@ -26,8 +26,8 @@ class PassiveAI : public CreatureAI public: explicit PassiveAI(Creature* c); - void MoveInLineOfSight(Unit*) {} - void AttackStart(Unit*) {} + void MoveInLineOfSight(Unit*) { } + void AttackStart(Unit*) { } void UpdateAI(uint32); static int Permissible(const Creature*) { return PERMIT_BASE_IDLE; } @@ -38,10 +38,10 @@ class PossessedAI : public CreatureAI public: explicit PossessedAI(Creature* c); - void MoveInLineOfSight(Unit*) {} + void MoveInLineOfSight(Unit*) { } void AttackStart(Unit* target); void UpdateAI(uint32); - void EnterEvadeMode() {} + void EnterEvadeMode() { } void JustDied(Unit*); void KilledUnit(Unit* victim); @@ -54,11 +54,11 @@ class NullCreatureAI : public CreatureAI public: explicit NullCreatureAI(Creature* c); - void MoveInLineOfSight(Unit*) {} - void AttackStart(Unit*) {} - void UpdateAI(uint32) {} - void EnterEvadeMode() {} - void OnCharmed(bool /*apply*/) {} + void MoveInLineOfSight(Unit*) { } + void AttackStart(Unit*) { } + void UpdateAI(uint32) { } + void EnterEvadeMode() { } + void OnCharmed(bool /*apply*/) { } static int Permissible(const Creature*) { return PERMIT_BASE_IDLE; } }; @@ -66,7 +66,7 @@ class NullCreatureAI : public CreatureAI class CritterAI : public PassiveAI { public: - explicit CritterAI(Creature* c) : PassiveAI(c) {} + explicit CritterAI(Creature* c) : PassiveAI(c) { } void DamageTaken(Unit* done_by, uint32& /*damage*/); void EnterEvadeMode(); @@ -75,7 +75,7 @@ class CritterAI : public PassiveAI class TriggerAI : public NullCreatureAI { public: - explicit TriggerAI(Creature* c) : NullCreatureAI(c) {} + explicit TriggerAI(Creature* c) : NullCreatureAI(c) { } void IsSummonedBy(Unit* summoner); }; diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h index efb088160f3..9cce00440e1 100644 --- a/src/server/game/AI/CoreAI/PetAI.h +++ b/src/server/game/AI/CoreAI/PetAI.h @@ -45,9 +45,9 @@ class PetAI : public CreatureAI // The following aren't used by the PetAI but need to be defined to override // default CreatureAI functions which interfere with the PetAI // - void MoveInLineOfSight(Unit* /*who*/) {} // CreatureAI interferes with returning pets - void MoveInLineOfSight_Safe(Unit* /*who*/) {} // CreatureAI interferes with returning pets - void EnterEvadeMode() {} // For fleeing, pets don't use this type of Evade mechanic + void MoveInLineOfSight(Unit* /*who*/) { } // CreatureAI interferes with returning pets + void MoveInLineOfSight_Safe(Unit* /*who*/) { } // CreatureAI interferes with returning pets + void EnterEvadeMode() { } // For fleeing, pets don't use this type of Evade mechanic private: bool _isVisible(Unit*) const; diff --git a/src/server/game/AI/CoreAI/ReactorAI.h b/src/server/game/AI/CoreAI/ReactorAI.h index 449458f39be..42f9c425ceb 100644 --- a/src/server/game/AI/CoreAI/ReactorAI.h +++ b/src/server/game/AI/CoreAI/ReactorAI.h @@ -27,9 +27,9 @@ class ReactorAI : public CreatureAI { public: - explicit ReactorAI(Creature* c) : CreatureAI(c) {} + explicit ReactorAI(Creature* c) : CreatureAI(c) { } - void MoveInLineOfSight(Unit*) {} + void MoveInLineOfSight(Unit*) { } void UpdateAI(uint32 diff); static int Permissible(const Creature*); diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp index 358baa0c5ad..464021e1e53 100644 --- a/src/server/game/AI/CoreAI/TotemAI.cpp +++ b/src/server/game/AI/CoreAI/TotemAI.cpp @@ -40,9 +40,7 @@ TotemAI::TotemAI(Creature* c) : CreatureAI(c), i_victimGuid(0) ASSERT(c->IsTotem()); } -void TotemAI::MoveInLineOfSight(Unit* /*who*/) -{ -} +void TotemAI::MoveInLineOfSight(Unit* /*who*/) { } void TotemAI::EnterEvadeMode() { diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index f048c049b34..71fc86f112b 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -120,8 +120,8 @@ class UnitAI protected: Unit* const me; public: - explicit UnitAI(Unit* unit) : me(unit) {} - virtual ~UnitAI() {} + explicit UnitAI(Unit* unit) : me(unit) { } + virtual ~UnitAI() { } virtual bool CanAIAttack(Unit const* /*target*/) const { return true; } virtual void AttackStart(Unit* /*target*/); @@ -129,16 +129,16 @@ class UnitAI virtual void InitializeAI() { if (!me->isDead()) Reset(); } - virtual void Reset() {}; + virtual void Reset() { }; // Called when unit is charmed virtual void OnCharmed(bool apply) = 0; // Pass parameters between AI - virtual void DoAction(int32 /*param*/) {} + virtual void DoAction(int32 /*param*/) { } virtual uint32 GetData(uint32 /*id = 0*/) const { return 0; } - virtual void SetData(uint32 /*id*/, uint32 /*value*/) {} - virtual void SetGUID(uint64 /*guid*/, int32 /*id*/ = 0) {} + virtual void SetData(uint32 /*id*/, uint32 /*value*/) { } + virtual void SetGUID(uint64 /*guid*/, int32 /*id*/ = 0) { } virtual uint64 GetGUID(int32 /*id*/ = 0) const { return 0; } Unit* SelectTarget(SelectAggroTarget targetType, uint32 position = 0, float dist = 0.0f, bool playerOnly = false, int32 aura = 0); @@ -225,17 +225,17 @@ class UnitAI // Called at any Damage from any attacker (before damage apply) // Note: it for recalculation damage or special reaction at damage // for attack reaction use AttackedBy called for not DOT damage in Unit::DealDamage also - virtual void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) {} + virtual void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) { } // Called when the creature receives heal - virtual void HealReceived(Unit* /*done_by*/, uint32& /*addhealth*/) {} + virtual void HealReceived(Unit* /*done_by*/, uint32& /*addhealth*/) { } // Called when the unit heals - virtual void HealDone(Unit* /*done_to*/, uint32& /*addhealth*/) {} + virtual void HealDone(Unit* /*done_to*/, uint32& /*addhealth*/) { } /// Called when a spell is interrupted by Spell::EffectInterruptCast /// Use to reschedule next planned cast of spell. - virtual void SpellInterrupted(uint32 /*spellId*/, uint32 /*unTimeMs*/) {} + virtual void SpellInterrupted(uint32 /*spellId*/, uint32 /*unTimeMs*/) { } void AttackStartCaster(Unit* victim, float dist); @@ -254,15 +254,15 @@ class UnitAI static AISpellInfoType* AISpellInfo; static void FillAISpellInfo(); - virtual void sGossipHello(Player* /*player*/) {} - virtual void sGossipSelect(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/) {} - virtual void sGossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, char const* /*code*/) {} - virtual void sQuestAccept(Player* /*player*/, Quest const* /*quest*/) {} - virtual void sQuestSelect(Player* /*player*/, Quest const* /*quest*/) {} - virtual void sQuestComplete(Player* /*player*/, Quest const* /*quest*/) {} - virtual void sQuestReward(Player* /*player*/, Quest const* /*quest*/, uint32 /*opt*/) {} + virtual void sGossipHello(Player* /*player*/) { } + virtual void sGossipSelect(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/) { } + virtual void sGossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, char const* /*code*/) { } + virtual void sQuestAccept(Player* /*player*/, Quest const* /*quest*/) { } + virtual void sQuestSelect(Player* /*player*/, Quest const* /*quest*/) { } + virtual void sQuestComplete(Player* /*player*/, Quest const* /*quest*/) { } + virtual void sQuestReward(Player* /*player*/, Quest const* /*quest*/, uint32 /*opt*/) { } virtual bool sOnDummyEffect(Unit* /*caster*/, uint32 /*spellId*/, SpellEffIndex /*effIndex*/) { return false; } - virtual void sOnGameEvent(bool /*start*/, uint16 /*eventId*/) {} + virtual void sOnGameEvent(bool /*start*/, uint16 /*eventId*/) { } }; class PlayerAI : public UnitAI @@ -270,7 +270,7 @@ class PlayerAI : public UnitAI protected: Player* const me; public: - explicit PlayerAI(Player* player) : UnitAI((Unit*)player), me(player) {} + explicit PlayerAI(Player* player) : UnitAI((Unit*)player), me(player) { } void OnCharmed(bool apply); }; @@ -279,7 +279,7 @@ class SimpleCharmedAI : public PlayerAI { public: void UpdateAI(uint32 diff); - SimpleCharmedAI(Player* player): PlayerAI(player) {} + SimpleCharmedAI(Player* player): PlayerAI(player) { } }; #endif diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index 34339859a95..14cf0a05109 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -79,9 +79,9 @@ class CreatureAI : public UnitAI public: void Talk(uint8 id, uint64 WhisperGuid = 0); - explicit CreatureAI(Creature* creature) : UnitAI(creature), me(creature), m_MoveInLineOfSight_locked(false) {} + explicit CreatureAI(Creature* creature) : UnitAI(creature), me(creature), m_MoveInLineOfSight_locked(false) { } - virtual ~CreatureAI() {} + virtual ~CreatureAI() { } /// == Reactions At ================================= @@ -95,61 +95,61 @@ class CreatureAI : public UnitAI virtual void EnterEvadeMode(); // Called for reaction at enter to combat if not in combat yet (enemy can be NULL) - virtual void EnterCombat(Unit* /*victim*/) {} + virtual void EnterCombat(Unit* /*victim*/) { } // Called when the creature is killed - virtual void JustDied(Unit* /*killer*/) {} + virtual void JustDied(Unit* /*killer*/) { } // Called when the creature kills a unit - virtual void KilledUnit(Unit* /*victim*/) {} + virtual void KilledUnit(Unit* /*victim*/) { } // Called when the creature summon successfully other creature - virtual void JustSummoned(Creature* /*summon*/) {} - virtual void IsSummonedBy(Unit* /*summoner*/) {} + virtual void JustSummoned(Creature* /*summon*/) { } + virtual void IsSummonedBy(Unit* /*summoner*/) { } - virtual void SummonedCreatureDespawn(Creature* /*summon*/) {} - virtual void SummonedCreatureDies(Creature* /*summon*/, Unit* /*killer*/) {} + virtual void SummonedCreatureDespawn(Creature* /*summon*/) { } + virtual void SummonedCreatureDies(Creature* /*summon*/, Unit* /*killer*/) { } // Called when hit by a spell - virtual void SpellHit(Unit* /*caster*/, SpellInfo const* /*spell*/) {} + virtual void SpellHit(Unit* /*caster*/, SpellInfo const* /*spell*/) { } // Called when spell hits a target - virtual void SpellHitTarget(Unit* /*target*/, SpellInfo const* /*spell*/) {} + virtual void SpellHitTarget(Unit* /*target*/, SpellInfo const* /*spell*/) { } // Called when the creature is target of hostile action: swing, hostile spell landed, fear/etc) - virtual void AttackedBy(Unit* /*attacker*/) {} + virtual void AttackedBy(Unit* /*attacker*/) { } virtual bool IsEscorted() { return false; } // Called when creature is spawned or respawned (for reseting variables) virtual void JustRespawned() { Reset(); } // Called at waypoint reached or point movement finished - virtual void MovementInform(uint32 /*type*/, uint32 /*id*/) {} + virtual void MovementInform(uint32 /*type*/, uint32 /*id*/) { } void OnCharmed(bool apply); // Called at reaching home after evade - virtual void JustReachedHome() {} + virtual void JustReachedHome() { } void DoZoneInCombat(Creature* creature = NULL, float maxRangeToNearestTarget = 50.0f); // Called at text emote receive from player - virtual void ReceiveEmote(Player* /*player*/, uint32 /*emoteId*/) {} + virtual void ReceiveEmote(Player* /*player*/, uint32 /*emoteId*/) { } // Called when owner takes damage - virtual void OwnerAttackedBy(Unit* /*attacker*/) {} + virtual void OwnerAttackedBy(Unit* /*attacker*/) { } // Called when owner attacks something - virtual void OwnerAttacked(Unit* /*target*/) {} + virtual void OwnerAttacked(Unit* /*target*/) { } /// == Triggered Actions Requested ================== // Called when creature attack expected (if creature can and no have current victim) // Note: for reaction at hostile action must be called AttackedBy function. - //virtual void AttackStart(Unit*) {} + //virtual void AttackStart(Unit*) { } // Called at World update tick - //virtual void UpdateAI(const uint32 /*diff*/) {} + //virtual void UpdateAI(const uint32 /*diff*/) { } /// == State checks ================================= @@ -157,7 +157,7 @@ class CreatureAI : public UnitAI //virtual bool IsVisible(Unit*) const { return false; } // called when the corpse of this creature gets removed - virtual void CorpseRemoved(uint32& /*respawnDelay*/) {} + virtual void CorpseRemoved(uint32& /*respawnDelay*/) { } // Called when victim entered water and creature can not enter water //virtual bool CanReachByRangeAttack(Unit*) { return false; } @@ -167,7 +167,7 @@ class CreatureAI : public UnitAI // Pointer to controlled by AI creature //Creature* const me; - virtual void PassengerBoarded(Unit* /*passenger*/, int8 /*seatId*/, bool /*apply*/) {} + virtual void PassengerBoarded(Unit* /*passenger*/, int8 /*seatId*/, bool /*apply*/) { } virtual void OnSpellClick(Unit* /*clicker*/, bool& /*result*/) { } diff --git a/src/server/game/AI/CreatureAIFactory.h b/src/server/game/AI/CreatureAIFactory.h index b4e031fbe6f..30576cf28bd 100644 --- a/src/server/game/AI/CreatureAIFactory.h +++ b/src/server/game/AI/CreatureAIFactory.h @@ -25,13 +25,13 @@ struct SelectableAI : public FactoryHolder<CreatureAI>, public Permissible<Creature> { - SelectableAI(const char* id) : FactoryHolder<CreatureAI>(id) {} + SelectableAI(const char* id) : FactoryHolder<CreatureAI>(id) { } }; template<class REAL_AI> struct CreatureAIFactory : public SelectableAI { - CreatureAIFactory(const char* name) : SelectableAI(name) {} + CreatureAIFactory(const char* name) : SelectableAI(name) { } CreatureAI* Create(void*) const; @@ -53,13 +53,13 @@ typedef FactoryHolder<CreatureAI>::FactoryHolderRepository CreatureAIRepository; //GO struct SelectableGameObjectAI : public FactoryHolder<GameObjectAI>, public Permissible<GameObject> { - SelectableGameObjectAI(const char* id) : FactoryHolder<GameObjectAI>(id) {} + SelectableGameObjectAI(const char* id) : FactoryHolder<GameObjectAI>(id) { } }; template<class REAL_GO_AI> struct GameObjectAIFactory : public SelectableGameObjectAI { - GameObjectAIFactory(const char* name) : SelectableGameObjectAI(name) {} + GameObjectAIFactory(const char* name) : SelectableGameObjectAI(name) { } GameObjectAI* Create(void*) const; diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h index 6c5cb5622b3..6b190938596 100644 --- a/src/server/game/AI/CreatureAIImpl.h +++ b/src/server/game/AI/CreatureAIImpl.h @@ -327,7 +327,7 @@ class EventMap typedef std::multimap<uint32, uint32> EventStore; public: - EventMap() : _time(0), _phase(0) {} + EventMap() : _time(0), _phase(0) { } /** * @name Reset @@ -686,7 +686,7 @@ enum AICondition struct AISpellInfoType { AISpellInfoType() : target(AITARGET_SELF), condition(AICOND_COMBAT) - , cooldown(AI_DEFAULT_COOLDOWN), realCooldown(0), maxRange(0.0f){} + , cooldown(AI_DEFAULT_COOLDOWN), realCooldown(0), maxRange(0.0f){ } AITarget target; AICondition condition; uint32 cooldown; diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 5883270e9a0..b1f5ede0a1f 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -448,9 +448,7 @@ BossAI::BossAI(Creature* creature, uint32 bossId) : ScriptedAI(creature), instance(creature->GetInstanceScript()), summons(creature), _boundary(instance ? instance->GetBossBoundary(bossId) : NULL), - _bossId(bossId) -{ -} + _bossId(bossId) { } void BossAI::_Reset() { @@ -598,9 +596,7 @@ void BossAI::_DespawnAtEvade() WorldBossAI::WorldBossAI(Creature* creature) : ScriptedAI(creature), - summons(creature) -{ -} + summons(creature) { } void WorldBossAI::_Reset() { diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index 8634355b974..e2094bcf37e 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -116,7 +116,7 @@ private: class EntryCheckPredicate { public: - EntryCheckPredicate(uint32 entry) : _entry(entry) {} + EntryCheckPredicate(uint32 entry) : _entry(entry) { } bool operator()(uint64 guid) { return GUID_ENPART(guid) == _entry; } private: @@ -132,7 +132,7 @@ class DummyEntryCheckPredicate struct ScriptedAI : public CreatureAI { explicit ScriptedAI(Creature* creature); - virtual ~ScriptedAI() {} + virtual ~ScriptedAI() { } // ************* //CreatureAI Functions @@ -141,34 +141,34 @@ struct ScriptedAI : public CreatureAI void AttackStartNoMove(Unit* target); // Called at any Damage from any attacker (before damage apply) - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) {} + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) { } //Called at World update tick virtual void UpdateAI(uint32 diff); //Called at creature death - void JustDied(Unit* /*killer*/) {} + void JustDied(Unit* /*killer*/) { } //Called at creature killing another unit - void KilledUnit(Unit* /*victim*/) {} + void KilledUnit(Unit* /*victim*/) { } // Called when the creature summon successfully other creature - void JustSummoned(Creature* /*summon*/) {} + void JustSummoned(Creature* /*summon*/) { } // Called when a summoned creature is despawned - void SummonedCreatureDespawn(Creature* /*summon*/) {} + void SummonedCreatureDespawn(Creature* /*summon*/) { } // Called when hit by a spell - void SpellHit(Unit* /*caster*/, SpellInfo const* /*spell*/) {} + void SpellHit(Unit* /*caster*/, SpellInfo const* /*spell*/) { } // Called when spell hits a target - void SpellHitTarget(Unit* /*target*/, SpellInfo const* /*spell*/) {} + void SpellHitTarget(Unit* /*target*/, SpellInfo const* /*spell*/) { } //Called at waypoint reached or PointMovement end - void MovementInform(uint32 /*type*/, uint32 /*id*/) {} + void MovementInform(uint32 /*type*/, uint32 /*id*/) { } // Called when AI is temporarily replaced or put back when possess is applied or removed - void OnPossess(bool /*apply*/) {} + void OnPossess(bool /*apply*/) { } // ************* // Variables @@ -185,10 +185,10 @@ struct ScriptedAI : public CreatureAI // ************* //Called at creature reset either by death or evade - void Reset() {} + void Reset() { } //Called at creature aggro either by MoveInLOS or Attack Start - void EnterCombat(Unit* /*victim*/) {} + void EnterCombat(Unit* /*victim*/) { } // Called before EnterCombat even before the creature is in combat. void AttackStart(Unit* /*target*/); @@ -334,7 +334,7 @@ class BossAI : public ScriptedAI { public: BossAI(Creature* creature, uint32 bossId); - virtual ~BossAI() {} + virtual ~BossAI() { } InstanceScript* const instance; BossBoundaryMap const* GetBoundary() const { return _boundary; } @@ -386,7 +386,7 @@ class WorldBossAI : public ScriptedAI { public: WorldBossAI(Creature* creature); - virtual ~WorldBossAI() {} + virtual ~WorldBossAI() { } void JustSummoned(Creature* summon); void SummonedCreatureDespawn(Creature* summon); diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index ef15ef27ec4..a21e7787197 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -35,7 +35,7 @@ npc_escortAI::npc_escortAI(Creature* creature) : ScriptedAI(creature), DespawnAtFar(true), ScriptWP(false), HasImmuneToNPCFlags(false) -{} +{ } void npc_escortAI::AttackStart(Unit* who) { diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h index 919b24a916c..4b0f4e97a1c 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h @@ -39,7 +39,7 @@ struct npc_escortAI : public ScriptedAI { public: explicit npc_escortAI(Creature* creature); - ~npc_escortAI() {} + ~npc_escortAI() { } // CreatureAI functions void AttackStart(Unit* who); @@ -72,7 +72,7 @@ struct npc_escortAI : public ScriptedAI bool GetWaypointPosition(uint32 pointId, float& x, float& y, float& z); virtual void WaypointReached(uint32 pointId) = 0; - virtual void WaypointStart(uint32 /*pointId*/) {} + virtual void WaypointStart(uint32 /*pointId*/) { } void Start(bool isActiveAttacker = true, bool run = false, uint64 playerGUID = 0, Quest const* quest = NULL, bool instantRespawn = false, bool canLoopPath = false, bool resetWaypoints = true); diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index befd6b9d16e..a5176644f34 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -26,7 +26,7 @@ FollowerAI::FollowerAI(Creature* creature) : ScriptedAI(creature), m_uiUpdateFollowTimer(2500), m_uiFollowState(STATE_FOLLOW_NONE), m_pQuestForFollow(NULL) -{} +{ } void FollowerAI::AttackStart(Unit* who) { diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h index ccc8af6197a..cdd6d31c0b4 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h @@ -22,7 +22,7 @@ class FollowerAI : public ScriptedAI { public: explicit FollowerAI(Creature* creature); - ~FollowerAI() {} + ~FollowerAI() { } //virtual void WaypointReached(uint32 uiPointId) = 0; diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 57fd7ea2d73..4ec0a3e52f2 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -674,9 +674,7 @@ void SmartAI::SummonedCreatureDespawn(Creature* unit) GetScript()->ProcessEventsFor(SMART_EVENT_SUMMON_DESPAWNED, unit); } -void SmartAI::UpdateAIWhileCharmed(const uint32 /*diff*/) -{ -} +void SmartAI::UpdateAIWhileCharmed(const uint32 /*diff*/) { } void SmartAI::CorpseRemoved(uint32& respawnDelay) { @@ -720,9 +718,7 @@ void SmartAI::SetData(uint32 id, uint32 value) GetScript()->ProcessEventsFor(SMART_EVENT_DATA_SET, NULL, id, value); } -void SmartAI::SetGUID(uint64 /*guid*/, int32 /*id*/) -{ -} +void SmartAI::SetGUID(uint64 /*guid*/, int32 /*id*/) { } uint64 SmartAI::GetGUID(int32 /*id*/) const { @@ -755,9 +751,7 @@ void SmartAI::sGossipSelect(Player* player, uint32 sender, uint32 action) GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_SELECT, player, sender, action); } -void SmartAI::sGossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) -{ -} +void SmartAI::sGossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) { } void SmartAI::sQuestAccept(Player* player, Quest const* quest) { @@ -933,7 +927,7 @@ class SmartTrigger : public AreaTriggerScript { public: - SmartTrigger() : AreaTriggerScript("SmartTrigger") {} + SmartTrigger() : AreaTriggerScript("SmartTrigger") { } bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) { diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 4b4909e9c6c..ae6719aa8f3 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -45,7 +45,7 @@ enum SmartEscortVars class SmartAI : public CreatureAI { public: - ~SmartAI(){} + ~SmartAI(){ } explicit SmartAI(Creature* c); // Start moving to the desired MovePoint @@ -237,8 +237,8 @@ class SmartAI : public CreatureAI class SmartGameObjectAI : public GameObjectAI { public: - SmartGameObjectAI(GameObject* g) : GameObjectAI(g), go(g) {} - ~SmartGameObjectAI() {} + SmartGameObjectAI(GameObject* g) : GameObjectAI(g), go(g) { } + ~SmartGameObjectAI() { } void UpdateAI(uint32 diff); void InitializeAI(); diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index a16f3190fb2..e22d7e3cd40 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -3362,43 +3362,29 @@ void SmartScript::OnMoveInLineOfSight(Unit* who) } /* -void SmartScript::UpdateAIWhileCharmed(const uint32 diff) -{ -} +void SmartScript::UpdateAIWhileCharmed(const uint32 diff) { } -void SmartScript::DoAction(const int32 param) -{ -} +void SmartScript::DoAction(const int32 param) { } uint32 SmartScript::GetData(uint32 id) { return 0; } -void SmartScript::SetData(uint32 id, uint32 value) -{ -} +void SmartScript::SetData(uint32 id, uint32 value) { } -void SmartScript::SetGUID(uint64 guid, int32 id) -{ -} +void SmartScript::SetGUID(uint64 guid, int32 id) { } uint64 SmartScript::GetGUID(int32 id) { return 0; } -void SmartScript::MovepointStart(uint32 id) -{ -} +void SmartScript::MovepointStart(uint32 id) { } -void SmartScript::SetRun(bool run) -{ -} +void SmartScript::SetRun(bool run) { } -void SmartScript::SetMovePathEndAction(SMART_ACTION action) -{ -} +void SmartScript::SetMovePathEndAction(SMART_ACTION action) { } uint32 SmartScript::DoChat(int8 id, uint64 whisperGuid) { diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 87c35d59cc0..778cd8da31c 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -785,7 +785,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) uint32 creatureSummonEntry = spellInfo->Effects[j].MiscValue; if (e.action.summonCreature.creature == creatureSummonEntry) - TC_LOG_ERROR(LOG_FILTER_SQL, "SmartAIMgr: Entry %d SourceType %u Event %u Action %u creature summon: %u has already summon spell (SpellId: %u effect: %u)", + TC_LOG_ERROR(LOG_FILTER_SQL, "SmartAIMgr: Entry %d SourceType %u Event %u Action %u creature summon: There is a summon spell for creature entry %u (SpellId: %u, effect: %u)", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType(), e.action.summonCreature.creature, spellInfo->Id, j); } } @@ -862,7 +862,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) uint32 goSummonEntry = spellInfo->Effects[j].MiscValue; if (e.action.summonGO.entry == goSummonEntry) - TC_LOG_ERROR(LOG_FILTER_SQL, "SmartAIMgr: Entry %d SourceType %u Event %u Action %u gameobject summon: %u has already summon spell (SpellId: %u effect: %u)", + TC_LOG_ERROR(LOG_FILTER_SQL, "SmartAIMgr: Entry %d SourceType %u Event %u Action %u gameobject summon: There is a summon spell for gameobject entry %u (SpellId: %u, effect: %u)", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType(), e.action.summonGO.entry, spellInfo->Id, j); } } diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 190f055855f..7e082f9b8ff 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -1292,7 +1292,7 @@ struct SmartScriptHolder { SmartScriptHolder() : entryOrGuid(0), source_type(SMART_SCRIPT_TYPE_CREATURE) , event_id(0), link(0), event(), action(), target(), timer(0), active(false), runOnce(false) - , enableTimed(false) {} + , enableTimed(false) { } int32 entryOrGuid; SmartScriptType source_type; @@ -1323,7 +1323,7 @@ typedef UNORDERED_MAP<uint32, ObjectList*> ObjectListMap; class SmartWaypointMgr { friend class ACE_Singleton<SmartWaypointMgr, ACE_Null_Mutex>; - SmartWaypointMgr() {} + SmartWaypointMgr() { } public: ~SmartWaypointMgr(); @@ -1349,9 +1349,9 @@ typedef UNORDERED_MAP<int32, SmartAIEventList> SmartAIEventMap; class SmartAIMgr { friend class ACE_Singleton<SmartAIMgr, ACE_Null_Mutex>; - SmartAIMgr(){} + SmartAIMgr(){ } public: - ~SmartAIMgr(){} + ~SmartAIMgr(){ } void LoadSmartAIFromDB(); diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp index 1cff80ba10d..46c5abe411e 100644 --- a/src/server/game/Accounts/AccountMgr.cpp +++ b/src/server/game/Accounts/AccountMgr.cpp @@ -25,9 +25,7 @@ #include "SHA1.h" #include "WorldSession.h" -AccountMgr::AccountMgr() -{ -} +AccountMgr::AccountMgr() { } AccountMgr::~AccountMgr() { @@ -392,7 +390,7 @@ void AccountMgr::LoadRBAC() { ClearRBAC(); - TC_LOG_INFO(LOG_FILTER_SERVER_LOADING, "AccountMgr::LoadRBAC"); + TC_LOG_DEBUG(LOG_FILTER_RBAC, "AccountMgr::LoadRBAC"); uint32 oldMSTime = getMSTime(); uint32 count1 = 0; uint32 count2 = 0; diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index f60674fee01..f0c68f2dcae 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -48,7 +48,7 @@ namespace Trinity { public: AchievementChatBuilder(Player const& player, ChatMsg msgtype, int32 textId, uint32 ach_id) - : i_player(player), i_msgtype(msgtype), i_textId(textId), i_achievementId(ach_id) {} + : i_player(player), i_msgtype(msgtype), i_textId(textId), i_achievementId(ach_id) { } void operator()(WorldPacket& data, LocaleConstant loc_idx) { char const* text = sObjectMgr->GetTrinityString(i_textId, loc_idx); @@ -388,17 +388,13 @@ bool AchievementCriteriaDataSet::Meets(Player const* source, Unit const* target, } template<class T> -AchievementMgr<T>::AchievementMgr(T* owner): _owner(owner), _achievementPoints(0) {} +AchievementMgr<T>::AchievementMgr(T* owner): _owner(owner), _achievementPoints(0) { } template<class T> -AchievementMgr<T>::~AchievementMgr() -{ -} +AchievementMgr<T>::~AchievementMgr() { } template<class T> -void AchievementMgr<T>::SendPacket(WorldPacket* data) const -{ -} +void AchievementMgr<T>::SendPacket(WorldPacket* data) const { } template<> void AchievementMgr<Guild>::SendPacket(WorldPacket* data) const diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h index 6bf84439a7f..5ec58ecce13 100644 --- a/src/server/game/Achievements/AchievementMgr.h +++ b/src/server/game/Achievements/AchievementMgr.h @@ -180,7 +180,7 @@ struct AchievementCriteriaData struct AchievementCriteriaDataSet { - AchievementCriteriaDataSet() : criteria_id(0) {} + AchievementCriteriaDataSet() : criteria_id(0) { } typedef std::vector<AchievementCriteriaData> Storage; void Add(AchievementCriteriaData const& data) { storage.push_back(data); } bool Meets(Player const* source, Unit const* target, uint32 miscValue = 0) const; @@ -280,8 +280,8 @@ class AchievementMgr class AchievementGlobalMgr { friend class ACE_Singleton<AchievementGlobalMgr, ACE_Null_Mutex>; - AchievementGlobalMgr() {} - ~AchievementGlobalMgr() {} + AchievementGlobalMgr() { } + ~AchievementGlobalMgr() { } public: static char const* GetCriteriaTypeString(AchievementCriteriaTypes type); diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index 79d36b694bf..38c537e2150 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -37,9 +37,7 @@ enum eAuctionHouse AH_MINIMUM_DEPOSIT = 100 }; -AuctionHouseMgr::AuctionHouseMgr() -{ -} +AuctionHouseMgr::AuctionHouseMgr() { } AuctionHouseMgr::~AuctionHouseMgr() { diff --git a/src/server/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h index fd8e294a426..cdc9e2f9e20 100644 --- a/src/server/game/Battlefield/Battlefield.h +++ b/src/server/game/Battlefield/Battlefield.h @@ -81,7 +81,7 @@ class BfCapturePoint virtual ~BfCapturePoint() { } - virtual void FillInitialWorldStates(WorldPacket& /*data*/) {} + virtual void FillInitialWorldStates(WorldPacket& /*data*/) { } // Send world state update to all players present void SendUpdateWorldState(uint32 field, uint32 value); @@ -99,7 +99,7 @@ class BfCapturePoint // Returns true if the state of the objective has changed, in this case, the OutdoorPvP must send a world state ui update. virtual bool Update(uint32 diff); - virtual void ChangeTeam(TeamId /*oldTeam*/) {} + virtual void ChangeTeam(TeamId /*oldTeam*/) { } virtual void SendChangePhase(); bool SetCapturePointData(GameObject* capturePoint); @@ -224,7 +224,7 @@ class Battlefield : public ZoneScript void InvitePlayersInZoneToWar(); /// Called when a Unit is kill in battlefield zone - virtual void HandleKill(Player* /*killer*/, Unit* /*killed*/) {}; + virtual void HandleKill(Player* /*killer*/, Unit* /*killed*/) { }; uint32 GetTypeId() { return m_TypeId; } uint32 GetZoneId() { return m_ZoneId; } @@ -402,7 +402,7 @@ class Battlefield : public ZoneScript void KickAfkPlayers(); // use for switch off all worldstate for client - virtual void SendRemoveWorldStates(Player* /*player*/) {} + virtual void SendRemoveWorldStates(Player* /*player*/) { } // use for send a packet for all player list void BroadcastPacketToZone(WorldPacket& data) const; diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index e6012313c68..2760b59b860 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -89,7 +89,7 @@ namespace Trinity { public: Battleground2ChatBuilder(ChatMsg msgtype, int32 textId, Player const* source, int32 arg1, int32 arg2) - : _msgtype(msgtype), _textId(textId), _source(source), _arg1(arg1), _arg2(arg2) {} + : _msgtype(msgtype), _textId(textId), _source(source), _arg1(arg1), _arg2(arg2) { } void operator()(WorldPacket& data, LocaleConstant loc_idx) { @@ -1971,9 +1971,7 @@ int32 Battleground::GetObjectType(uint64 guid) return -1; } -void Battleground::HandleKillUnit(Creature* /*victim*/, Player* /*killer*/) -{ -} +void Battleground::HandleKillUnit(Creature* /*victim*/, Player* /*killer*/) { } void Battleground::CheckArenaAfterTimerConditions() { diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index 7f166b92f80..bd8f231190a 100644 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -164,7 +164,7 @@ struct BattlegroundPlayer struct BattlegroundObjectInfo { - BattlegroundObjectInfo() : object(NULL), timer(0), spellid(0) {} + BattlegroundObjectInfo() : object(NULL), timer(0), spellid(0) { } GameObject *object; int32 timer; @@ -289,7 +289,7 @@ class Battleground virtual void StartingEventOpenDoors() { } virtual void ResetBGSubclass() { } // must be implemented in BG subclass - virtual void DestroyGate(Player* /*player*/, GameObject* /*go*/) {} + virtual void DestroyGate(Player* /*player*/, GameObject* /*go*/) { } /* achievement req. */ virtual bool IsAllNodesControlledByTeam(uint32 /*team*/) const { return false; } @@ -413,7 +413,7 @@ class Battleground // Packet Transfer // method that should fill worldpacket with actual world states (not yet implemented for all battlegrounds!) - virtual void FillInitialWorldStates(WorldPacket& /*data*/) {} + virtual void FillInitialWorldStates(WorldPacket& /*data*/) { } void SendPacketToTeam(uint32 TeamID, WorldPacket* packet, Player* sender = NULL, bool self = true); void SendPacketToAll(WorldPacket* packet); void YellToAll(Creature* creature, const char* text, uint32 language); @@ -478,17 +478,17 @@ class Battleground virtual void HandleKillUnit(Creature* /*unit*/, Player* /*killer*/); // Battleground events - virtual void EventPlayerDroppedFlag(Player* /*player*/) {} - virtual void EventPlayerClickedOnFlag(Player* /*player*/, GameObject* /*target_obj*/) {} + virtual void EventPlayerDroppedFlag(Player* /*player*/) { } + virtual void EventPlayerClickedOnFlag(Player* /*player*/, GameObject* /*target_obj*/) { } void EventPlayerLoggedIn(Player* player); void EventPlayerLoggedOut(Player* player); - virtual void EventPlayerDamagedGO(Player* /*player*/, GameObject* /*go*/, uint32 /*eventType*/) {} - virtual void EventPlayerUsedGO(Player* /*player*/, GameObject* /*go*/){} + virtual void EventPlayerDamagedGO(Player* /*player*/, GameObject* /*go*/, uint32 /*eventType*/) { } + virtual void EventPlayerUsedGO(Player* /*player*/, GameObject* /*go*/){ } // this function can be used by spell to interact with the BG map - virtual void DoAction(uint32 /*action*/, uint64 /*var*/) {} + virtual void DoAction(uint32 /*action*/, uint64 /*var*/) { } - virtual void HandlePlayerResurrect(Player* /*player*/) {} + virtual void HandlePlayerResurrect(Player* /*player*/) { } // Death related virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player); @@ -535,8 +535,8 @@ class Battleground bool CanAwardArenaPoints() const { return m_LevelMin >= BG_AWARD_ARENA_POINTS_MIN_LEVEL; } virtual uint64 GetFlagPickerGUID(int32 /*team*/ = -1) const { return 0; } - virtual void SetDroppedFlagGUID(uint64 /*guid*/, int32 /*team*/ = -1) {} - virtual void HandleQuestComplete(uint32 /*questid*/, Player* /*player*/) {} + virtual void SetDroppedFlagGUID(uint64 /*guid*/, int32 /*team*/ = -1) { } + virtual void HandleQuestComplete(uint32 /*questid*/, Player* /*player*/) { } virtual bool CanActivateGO(int32 /*entry*/, uint32 /*team*/) const { return true; } virtual bool IsSpellAllowed(uint32 /*spellId*/, Player const* /*player*/) const { return true; } uint32 GetTeamScore(uint32 TeamID) const; @@ -563,7 +563,7 @@ class Battleground // Scorekeeping BattlegroundScoreMap PlayerScores; // Player scores // must be implemented in BG subclass - virtual void RemovePlayer(Player* /*player*/, uint64 /*guid*/, uint32 /*team*/) {} + virtual void RemovePlayer(Player* /*player*/, uint64 /*guid*/, uint32 /*team*/) { } // Player lists, those need to be accessible by inherited classes BattlegroundPlayerMap m_Players; diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.h b/src/server/game/Battlegrounds/BattlegroundQueue.h index 0595d73fcc6..34c9e5ea1c7 100644 --- a/src/server/game/Battlegrounds/BattlegroundQueue.h +++ b/src/server/game/Battlegrounds/BattlegroundQueue.h @@ -106,7 +106,7 @@ class BattlegroundQueue class SelectionPool { public: - SelectionPool(): PlayerCount(0) {}; + SelectionPool(): PlayerCount(0) { }; void Init(); bool AddGroup(GroupQueueInfo* ginfo, uint32 desiredCount); bool KickGroup(uint32 size); @@ -163,9 +163,9 @@ class BGQueueRemoveEvent : public BasicEvent public: BGQueueRemoveEvent(uint64 pl_guid, uint32 bgInstanceGUID, BattlegroundTypeId BgTypeId, BattlegroundQueueTypeId bgQueueTypeId, uint32 removeTime) : m_PlayerGuid(pl_guid), m_BgInstanceGUID(bgInstanceGUID), m_RemoveTime(removeTime), m_BgTypeId(BgTypeId), m_BgQueueTypeId(bgQueueTypeId) - {} + { } - virtual ~BGQueueRemoveEvent() {} + virtual ~BGQueueRemoveEvent() { } virtual bool Execute(uint64 e_time, uint32 p_time); virtual void Abort(uint64 e_time); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp index da292d050e9..d7cb4af5a42 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp @@ -41,9 +41,7 @@ BattlegroundAB::BattlegroundAB() StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_AB_HAS_BEGUN; } -BattlegroundAB::~BattlegroundAB() -{ -} +BattlegroundAB::~BattlegroundAB() { } void BattlegroundAB::PostUpdateImpl(uint32 diff) { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index f8c9e888176..d5d9ac7577f 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -39,9 +39,7 @@ BattlegroundAV::BattlegroundAV() StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_AV_HAS_BEGUN; } -BattlegroundAV::~BattlegroundAV() -{ -} +BattlegroundAV::~BattlegroundAV() { } uint16 BattlegroundAV::GetBonusHonor(uint8 kills) /// @todo move this function to Battleground.cpp (needs to find a way to get m_MaxLevel) { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp index 95808065d62..600106dbdc1 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp @@ -50,9 +50,7 @@ BattlegroundEY::BattlegroundEY() StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_EY_HAS_BEGUN; } -BattlegroundEY::~BattlegroundEY() -{ -} +BattlegroundEY::~BattlegroundEY() { } void BattlegroundEY::PostUpdateImpl(uint32 diff) { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index f03b458e7ff..26c6d276311 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -249,7 +249,7 @@ enum BG_EY_Objectives struct BattlegroundEYPointIconsStruct { BattlegroundEYPointIconsStruct(uint32 _WorldStateControlIndex, uint32 _WorldStateAllianceControlledIndex, uint32 _WorldStateHordeControlledIndex) - : WorldStateControlIndex(_WorldStateControlIndex), WorldStateAllianceControlledIndex(_WorldStateAllianceControlledIndex), WorldStateHordeControlledIndex(_WorldStateHordeControlledIndex) {} + : WorldStateControlIndex(_WorldStateControlIndex), WorldStateAllianceControlledIndex(_WorldStateAllianceControlledIndex), WorldStateHordeControlledIndex(_WorldStateHordeControlledIndex) { } uint32 WorldStateControlIndex; uint32 WorldStateAllianceControlledIndex; uint32 WorldStateHordeControlledIndex; @@ -270,7 +270,7 @@ struct BattlegroundEYLosingPointStruct : SpawnNeutralObjectType(_SpawnNeutralObjectType), DespawnObjectTypeAlliance(_DespawnObjectTypeAlliance), MessageIdAlliance(_MessageIdAlliance), DespawnObjectTypeHorde(_DespawnObjectTypeHorde), MessageIdHorde(_MessageIdHorde) - {} + { } uint32 SpawnNeutralObjectType; uint32 DespawnObjectTypeAlliance; @@ -286,7 +286,7 @@ struct BattlegroundEYCapturingPointStruct SpawnObjectTypeAlliance(_SpawnObjectTypeAlliance), MessageIdAlliance(_MessageIdAlliance), SpawnObjectTypeHorde(_SpawnObjectTypeHorde), MessageIdHorde(_MessageIdHorde), GraveYardId(_GraveYardId) - {} + { } uint32 DespawnNeutralObjectType; uint32 SpawnObjectTypeAlliance; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp index 0855408c932..60a725b3eb7 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp @@ -57,9 +57,7 @@ BattlegroundIC::BattlegroundIC() gunshipAlliance = NULL; } -BattlegroundIC::~BattlegroundIC() -{ -} +BattlegroundIC::~BattlegroundIC() { } void BattlegroundIC::HandlePlayerResurrect(Player* player) { @@ -842,9 +840,7 @@ void BattlegroundIC::DestroyGate(Player* player, GameObject* go) SendMessage2ToAll(lang_entry, CHAT_MSG_BG_SYSTEM_NEUTRAL, NULL, (player->GetTeamId() == TEAM_ALLIANCE ? LANG_BG_IC_HORDE_KEEP : LANG_BG_IC_ALLIANCE_KEEP)); } -void BattlegroundIC::EventPlayerDamagedGO(Player* /*player*/, GameObject* /*go*/, uint32 /*eventType*/) -{ -} +void BattlegroundIC::EventPlayerDamagedGO(Player* /*player*/, GameObject* /*go*/, uint32 /*eventType*/) { } WorldSafeLocsEntry const* BattlegroundIC::GetClosestGraveYard(Player* player) { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp index 3ca9b6d4f72..d88c9c7a73f 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp @@ -73,9 +73,7 @@ void BattlegroundRV::PostUpdateImpl(uint32 diff) setTimer(getTimer() - diff); } -void BattlegroundRV::StartingEventCloseDoors() -{ -} +void BattlegroundRV::StartingEventCloseDoors() { } void BattlegroundRV::StartingEventOpenDoors() { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index e0581c6f46a..39ad3e40e5e 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -44,9 +44,7 @@ BattlegroundSA::BattlegroundSA() memset(&GraveyardStatus, 0, sizeof(GraveyardStatus)); } -BattlegroundSA::~BattlegroundSA() -{ -} +BattlegroundSA::~BattlegroundSA() { } void BattlegroundSA::Reset() { @@ -392,13 +390,9 @@ void BattlegroundSA::PostUpdateImpl(uint32 diff) } } -void BattlegroundSA::StartingEventCloseDoors() -{ -} +void BattlegroundSA::StartingEventCloseDoors() { } -void BattlegroundSA::StartingEventOpenDoors() -{ -} +void BattlegroundSA::StartingEventOpenDoors() { } void BattlegroundSA::FillInitialWorldStates(WorldPacket& data) { @@ -472,9 +466,7 @@ void BattlegroundSA::AddPlayer(Player* player) PlayerScores[player->GetGUID()] = sc; } -void BattlegroundSA::RemovePlayer(Player* /*player*/, uint64 /*guid*/, uint32 /*team*/) -{ -} +void BattlegroundSA::RemovePlayer(Player* /*player*/, uint64 /*guid*/, uint32 /*team*/) { } void BattlegroundSA::HandleAreaTrigger(Player* /*Source*/, uint32 /*Trigger*/) { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp index 67e092ab62b..0838adffcf0 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp @@ -56,9 +56,7 @@ BattlegroundWS::BattlegroundWS() _flagDebuffState = 0; } -BattlegroundWS::~BattlegroundWS() -{ -} +BattlegroundWS::~BattlegroundWS() { } void BattlegroundWS::PostUpdateImpl(uint32 diff) { diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp index 0aa46d0d10b..6973f4e81e5 100644 --- a/src/server/game/Calendar/CalendarMgr.cpp +++ b/src/server/game/Calendar/CalendarMgr.cpp @@ -34,9 +34,7 @@ CalendarEvent::~CalendarEvent() sCalendarMgr->FreeEventId(_eventId); } -CalendarMgr::CalendarMgr() -{ -} +CalendarMgr::CalendarMgr() { } CalendarMgr::~CalendarMgr() { diff --git a/src/server/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h index f03514461f8..74a0d622e80 100644 --- a/src/server/game/Chat/Channels/ChannelMgr.h +++ b/src/server/game/Chat/Channels/ChannelMgr.h @@ -51,7 +51,7 @@ class ChannelMgr void MakeNotOnPacket(WorldPacket* data, std::string const& name); }; -class AllianceChannelMgr : public ChannelMgr {}; -class HordeChannelMgr : public ChannelMgr {}; +class AllianceChannelMgr : public ChannelMgr { }; +class HordeChannelMgr : public ChannelMgr { }; #endif diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index 372f98644b5..09719d91e9e 100644 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -50,8 +50,8 @@ class ChatHandler { public: WorldSession* GetSession() { return m_session; } - explicit ChatHandler(WorldSession* session) : m_session(session), sentErrorMessage(false) {} - virtual ~ChatHandler() {} + explicit ChatHandler(WorldSession* session) : m_session(session), sentErrorMessage(false) { } + virtual ~ChatHandler() { } static void FillMessageData(WorldPacket* data, WorldSession* session, uint8 type, uint32 language, const char *channelName, uint64 target_guid, const char *message, Unit* speaker, const char* addonPrefix = NULL); @@ -129,7 +129,7 @@ class ChatHandler bool ShowHelpForCommand(ChatCommand* table, const char* cmd); protected: - explicit ChatHandler() : m_session(NULL), sentErrorMessage(false) {} // for CLI subclass + explicit ChatHandler() : m_session(NULL), sentErrorMessage(false) { } // for CLI subclass static bool SetDataForCommandInTable(ChatCommand* table, const char* text, uint32 permission, std::string const& help, std::string const& fullcommand); bool ExecuteCommandInTable(ChatCommand* table, const char* text, std::string const& fullcmd); bool ShowHelpForSubCommands(ChatCommand* table, char const* cmd, char const* subcmd); @@ -146,7 +146,7 @@ class CliHandler : public ChatHandler { public: typedef void Print(void*, char const*); - explicit CliHandler(void* callbackArg, Print* zprint) : m_callbackArg(callbackArg), m_print(zprint) {} + explicit CliHandler(void* callbackArg, Print* zprint) : m_callbackArg(callbackArg), m_print(zprint) { } // overwrite functions const char *GetTrinityString(int32 entry) const; diff --git a/src/server/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp index 9febb365c16..bc468d949ad 100644 --- a/src/server/game/Chat/ChatLink.cpp +++ b/src/server/game/Chat/ChatLink.cpp @@ -531,9 +531,7 @@ bool GlyphChatLink::Initialize(std::istringstream& iss) return true; } -LinkExtractor::LinkExtractor(const char* msg) : _iss(msg) -{ -} +LinkExtractor::LinkExtractor(const char* msg) : _iss(msg) { } LinkExtractor::~LinkExtractor() { diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp index b24979d9131..ed23a72bee1 100644 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -390,9 +390,7 @@ HostileReference* ThreatContainer::selectNextVictim(Creature* attacker, HostileR //=================== ThreatManager ========================== //============================================================ -ThreatManager::ThreatManager(Unit* owner) : iCurrentVictim(NULL), iOwner(owner), iUpdateTimer(THREAT_UPDATE_INTERVAL) -{ -} +ThreatManager::ThreatManager(Unit* owner) : iCurrentVictim(NULL), iOwner(owner), iUpdateTimer(THREAT_UPDATE_INTERVAL) { } //============================================================ diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h index 9b249bd4bee..2d13d8b61e2 100644 --- a/src/server/game/Combat/ThreatManager.h +++ b/src/server/game/Combat/ThreatManager.h @@ -281,7 +281,7 @@ namespace Trinity class ThreatOrderPred { public: - ThreatOrderPred(bool ascending = false) : m_ascending(ascending) {} + ThreatOrderPred(bool ascending = false) : m_ascending(ascending) { } bool operator() (HostileReference const* a, HostileReference const* b) const { return m_ascending ? a->getThreat() < b->getThreat() : a->getThreat() > b->getThreat(); diff --git a/src/server/game/Combat/UnitEvents.h b/src/server/game/Combat/UnitEvents.h index 21cd2d80964..0e568d139a8 100644 --- a/src/server/game/Combat/UnitEvents.h +++ b/src/server/game/Combat/UnitEvents.h @@ -123,8 +123,8 @@ class ThreatManagerEvent : public ThreatRefStatusChangeEvent private: ThreatContainer* iThreatContainer; public: - ThreatManagerEvent(uint32 pType) : ThreatRefStatusChangeEvent(pType), iThreatContainer(NULL) {} - ThreatManagerEvent(uint32 pType, HostileReference* pHostileReference) : ThreatRefStatusChangeEvent(pType, pHostileReference), iThreatContainer(NULL) {} + ThreatManagerEvent(uint32 pType) : ThreatRefStatusChangeEvent(pType), iThreatContainer(NULL) { } + ThreatManagerEvent(uint32 pType, HostileReference* pHostileReference) : ThreatRefStatusChangeEvent(pType, pHostileReference), iThreatContainer(NULL) { } void setThreatContainer(ThreatContainer* pThreatContainer) { iThreatContainer = pThreatContainer; } diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 34c6b63444f..c202ecd60c2 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -520,9 +520,7 @@ uint32 Condition::GetMaxAvailableConditionTargets() } } -ConditionMgr::ConditionMgr() -{ -} +ConditionMgr::ConditionMgr() { } ConditionMgr::~ConditionMgr() { diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 8bb7ee05e4f..fa75426f0d5 100644 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -2417,8 +2417,8 @@ typedef std::map<uint32, VectorArray> NameGenVectorArraysMap; // Structures not used for casting to loaded DBC data and not required then packing struct MapDifficulty { - MapDifficulty() : resetTime(0), maxPlayers(0), hasErrorMessage(false) {} - MapDifficulty(uint32 _resetTime, uint32 _maxPlayers, bool _hasErrorMessage) : resetTime(_resetTime), maxPlayers(_maxPlayers), hasErrorMessage(_hasErrorMessage) {} + MapDifficulty() : resetTime(0), maxPlayers(0), hasErrorMessage(false) { } + MapDifficulty(uint32 _resetTime, uint32 _maxPlayers, bool _hasErrorMessage) : resetTime(_resetTime), maxPlayers(_maxPlayers), hasErrorMessage(_hasErrorMessage) { } uint32 resetTime; uint32 maxPlayers; @@ -2427,8 +2427,8 @@ struct MapDifficulty struct TalentSpellPos { - TalentSpellPos() : talent_id(0), rank(0) {} - TalentSpellPos(uint16 _talent_id, uint8 _rank) : talent_id(_talent_id), rank(_rank) {} + TalentSpellPos() : talent_id(0), rank(0) { } + TalentSpellPos(uint16 _talent_id, uint8 _rank) : talent_id(_talent_id), rank(_rank) { } uint16 talent_id; uint8 rank; @@ -2438,8 +2438,8 @@ typedef std::map<uint32, TalentSpellPos> TalentSpellPosMap; struct TaxiPathBySourceAndDestination { - TaxiPathBySourceAndDestination() : ID(0), price(0) {} - TaxiPathBySourceAndDestination(uint32 _id, uint32 _price) : ID(_id), price(_price) {} + TaxiPathBySourceAndDestination() : ID(0), price(0) { } + TaxiPathBySourceAndDestination(uint32 _id, uint32 _price) : ID(_id), price(_price) { } uint32 ID; uint32 price; @@ -2449,8 +2449,8 @@ typedef std::map<uint32, TaxiPathSetForSource> TaxiPathSetBySource; struct TaxiPathNodePtr { - TaxiPathNodePtr() : i_ptr(NULL) {} - TaxiPathNodePtr(TaxiPathNodeEntry const* ptr) : i_ptr(ptr) {} + TaxiPathNodePtr() : i_ptr(NULL) { } + TaxiPathNodePtr(TaxiPathNodeEntry const* ptr) : i_ptr(ptr) { } TaxiPathNodeEntry const* i_ptr; operator TaxiPathNodeEntry const& () const { return *i_ptr; } }; diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index a55ff135110..8ecc6441612 100644 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -152,7 +152,7 @@ typedef UNORDERED_MAP<uint32, LFGDungeonData> LFGDungeonContainer; struct LfgJoinResultData { LfgJoinResultData(LfgJoinResult _result = LFG_JOIN_OK, LfgRoleCheckState _state = LFG_ROLECHECK_DEFAULT): - result(_result), state(_state) {} + result(_result), state(_state) { } LfgJoinResult result; LfgRoleCheckState state; LfgLockPartyMap lockmap; @@ -179,7 +179,7 @@ struct LfgQueueStatusData LfgQueueStatusData(uint8 _queueId = 0, uint32 _dungeonId = 0, time_t _joinTime = 0, int32 _waitTime = -1, int32 _waitTimeAvg = -1, int32 _waitTimeTank = -1, int32 _waitTimeHealer = -1, int32 _waitTimeDps = -1, uint32 _queuedTime = 0, uint8 _tanks = 0, uint8 _healers = 0, uint8 _dps = 0) : queueId(_queueId), dungeonId(_dungeonId), joinTime(_joinTime), waitTime(_waitTime), waitTimeAvg(_waitTimeAvg), waitTimeTank(_waitTimeTank), - waitTimeHealer(_waitTimeHealer), waitTimeDps(_waitTimeDps), queuedTime(_queuedTime), tanks(_tanks), healers(_healers), dps(_dps) {} + waitTimeHealer(_waitTimeHealer), waitTimeDps(_waitTimeDps), queuedTime(_queuedTime), tanks(_tanks), healers(_healers), dps(_dps) { } uint8 queueId; uint32 dungeonId; diff --git a/src/server/game/DungeonFinding/LFGPlayerData.cpp b/src/server/game/DungeonFinding/LFGPlayerData.cpp index e8ef430bc1f..305263cb73d 100644 --- a/src/server/game/DungeonFinding/LFGPlayerData.cpp +++ b/src/server/game/DungeonFinding/LFGPlayerData.cpp @@ -22,11 +22,9 @@ namespace lfg LfgPlayerData::LfgPlayerData(): m_State(LFG_STATE_NONE), m_OldState(LFG_STATE_NONE), m_Team(0), m_Group(0), m_Roles(0), m_Comment("") -{} +{ } -LfgPlayerData::~LfgPlayerData() -{ -} +LfgPlayerData::~LfgPlayerData() { } void LfgPlayerData::SetState(LfgState state) { diff --git a/src/server/game/DungeonFinding/LFGQueue.h b/src/server/game/DungeonFinding/LFGQueue.h index 4fb3ab95755..02320848f40 100644 --- a/src/server/game/DungeonFinding/LFGQueue.h +++ b/src/server/game/DungeonFinding/LFGQueue.h @@ -71,7 +71,7 @@ struct LfgQueueData struct LfgWaitTime { - LfgWaitTime(): time(-1), number(0) {} + LfgWaitTime(): time(-1), number(0) { } int32 time; ///< Wait time uint32 number; ///< Number of people used to get that wait time }; diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp index dca76bd5417..cf96f3316b4 100644 --- a/src/server/game/DungeonFinding/LFGScripts.cpp +++ b/src/server/game/DungeonFinding/LFGScripts.cpp @@ -32,9 +32,7 @@ namespace lfg { -LFGPlayerScript::LFGPlayerScript() : PlayerScript("LFGPlayerScript") -{ -} +LFGPlayerScript::LFGPlayerScript() : PlayerScript("LFGPlayerScript") { } void LFGPlayerScript::OnLevelChanged(Player* player, uint8 /*oldLevel*/) { @@ -120,9 +118,7 @@ void LFGPlayerScript::OnMapChanged(Player* player) player->RemoveAurasDueToSpell(LFG_SPELL_LUCK_OF_THE_DRAW); } -LFGGroupScript::LFGGroupScript() : GroupScript("LFGGroupScript") -{ -} +LFGGroupScript::LFGGroupScript() : GroupScript("LFGGroupScript") { } void LFGGroupScript::OnAddMember(Group* group, uint64 guid) { diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp index 759d84c2705..dff6e426793 100644 --- a/src/server/game/Entities/Corpse/Corpse.cpp +++ b/src/server/game/Entities/Corpse/Corpse.cpp @@ -41,9 +41,7 @@ Corpse::Corpse(CorpseType type) : WorldObject(type != CORPSE_BONES), m_type(type lootRecipient = NULL; } -Corpse::~Corpse() -{ -} +Corpse::~Corpse() { } void Corpse::AddToWorld() { diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 82e4ee2e7bc..a40d0646121 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -244,7 +244,7 @@ typedef UNORDERED_MAP<uint32, EquipmentInfoContainerInternal> EquipmentInfoConta // from `creature` table struct CreatureData { - CreatureData() : dbData(true) {} + CreatureData() : dbData(true) { } uint32 id; // entry in creature_template uint16 mapid; uint32 phaseMask; @@ -323,7 +323,7 @@ typedef UNORDERED_MAP<uint32, CreatureAddon> CreatureAddonContainer; struct VendorItem { VendorItem(uint32 _item, int32 _maxcount, uint32 _incrtime, uint32 _ExtendedCost, uint8 _Type) - : item(_item), maxcount(_maxcount), incrtime(_incrtime), ExtendedCost(_ExtendedCost), Type(_Type) {} + : item(_item), maxcount(_maxcount), incrtime(_incrtime), ExtendedCost(_ExtendedCost), Type(_Type) { } uint32 item; uint32 maxcount; // 0 for infinity item amount @@ -366,7 +366,7 @@ struct VendorItemData struct VendorItemCount { explicit VendorItemCount(uint32 _item, uint32 _count) - : itemId(_item), count(_count), lastIncrementTime(time(NULL)) {} + : itemId(_item), count(_count), lastIncrementTime(time(NULL)) { } uint32 itemId; uint32 count; @@ -398,7 +398,7 @@ typedef UNORDERED_MAP<uint32 /*spellid*/, TrainerSpell> TrainerSpellMap; struct TrainerSpellData { - TrainerSpellData() : trainerType(0) {} + TrainerSpellData() : trainerType(0) { } ~TrainerSpellData() { spellList.clear(); } TrainerSpellMap spellList; diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index 2a3829b7aeb..c060e11983c 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -80,7 +80,7 @@ void FormationMgr::LoadCreatureFormations() CreatureGroupMap.clear(); //Get group data - QueryResult result = WorldDatabase.Query("SELECT leaderGUID, memberGUID, dist, angle, groupAI FROM creature_formations ORDER BY leaderGUID"); + QueryResult result = WorldDatabase.Query("SELECT leaderGUID, memberGUID, dist, angle, groupAI, point_1, point_2 FROM creature_formations ORDER BY leaderGUID"); if (!result) { @@ -101,6 +101,8 @@ void FormationMgr::LoadCreatureFormations() group_member->leaderGUID = fields[0].GetUInt32(); uint32 memberGUID = fields[1].GetUInt32(); group_member->groupAI = fields[4].GetUInt32(); + group_member->point_1 = fields[5].GetUInt16(); + group_member->point_2 = fields[6].GetUInt16(); //If creature is group leader we may skip loading of dist/angle if (group_member->leaderGUID != memberGUID) { @@ -224,6 +226,14 @@ void CreatureGroup::LeaderMoveTo(float x, float y, float z) if (member == m_leader || !member->IsAlive() || member->GetVictim()) continue; + if (itr->second->point_1) + { + if (m_leader->GetCurrentWaypointID() == itr->second->point_1) + itr->second->follow_angle = (2 * M_PI) - itr->second->follow_angle; + if (m_leader->GetCurrentWaypointID() == itr->second->point_2) + itr->second->follow_angle = (2 * M_PI) + itr->second->follow_angle; + } + float angle = itr->second->follow_angle; float dist = itr->second->follow_dist; diff --git a/src/server/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h index fb5b823fbe9..ea115bd2efd 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.h +++ b/src/server/game/Entities/Creature/CreatureGroups.h @@ -32,6 +32,8 @@ struct FormationInfo float follow_dist; float follow_angle; uint8 groupAI; + uint16 point_1; + uint16 point_2; }; typedef UNORDERED_MAP<uint32/*memberDBGUID*/, FormationInfo*> CreatureGroupInfoType; @@ -60,8 +62,8 @@ class CreatureGroup public: //Group cannot be created empty - explicit CreatureGroup(uint32 id) : m_leader(NULL), m_groupID(id), m_Formed(false) {} - ~CreatureGroup() {} + explicit CreatureGroup(uint32 id) : m_leader(NULL), m_groupID(id), m_Formed(false) { } + ~CreatureGroup() { } Creature* getLeader() const { return m_leader; } uint32 GetId() const { return m_groupID; } diff --git a/src/server/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h index 46f5c1300a4..03fcd4cd74d 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.h +++ b/src/server/game/Entities/Creature/TemporarySummon.h @@ -41,14 +41,14 @@ class TempSummon : public Creature { public: explicit TempSummon(SummonPropertiesEntry const* properties, Unit* owner, bool isWorldObject); - virtual ~TempSummon() {} + virtual ~TempSummon() { } void Update(uint32 time); virtual void InitStats(uint32 lifetime); virtual void InitSummon(); virtual void UnSummon(uint32 msTime = 0); void RemoveFromWorld(); void SetTempSummonType(TempSummonType type); - void SaveToDB(uint32 /*mapid*/, uint8 /*spawnMask*/, uint32 /*phaseMask*/) {} + void SaveToDB(uint32 /*mapid*/, uint8 /*spawnMask*/, uint32 /*phaseMask*/) { } Unit* GetSummoner() const; Creature* GetSummonerCreatureBase() const; uint64 GetSummonerGUID() const { return m_summonerGUID; } diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index acfb5f48100..e1265f688cc 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -590,7 +590,7 @@ enum GOState // from `gameobject` struct GameObjectData { - explicit GameObjectData() : dbData(true) {} + explicit GameObjectData() : dbData(true) { } uint32 id; // entry in gamobject_template uint16 mapid; uint32 phaseMask; diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp index ba9604fcd52..1d0b7b66d6d 100644 --- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp +++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp @@ -33,10 +33,10 @@ struct EnchStoreItem float chance; EnchStoreItem() - : ench(0), chance(0) {} + : ench(0), chance(0) { } EnchStoreItem(uint32 _ench, float _chance) - : ench(_ench), chance(_chance) {} + : ench(_ench), chance(_chance) { } }; typedef std::vector<EnchStoreItem> EnchStoreList; diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index c0a7ea02cbb..2ccaf755fd6 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2057,7 +2057,7 @@ namespace Trinity { public: MonsterChatBuilder(WorldObject const& obj, ChatMsg msgtype, int32 textId, uint32 language, uint64 targetGUID) - : i_object(obj), i_msgtype(msgtype), i_textId(textId), i_language(language), i_targetGUID(targetGUID) {} + : i_object(obj), i_msgtype(msgtype), i_textId(textId), i_language(language), i_targetGUID(targetGUID) { } void operator()(WorldPacket& data, LocaleConstant loc_idx) { char const* text = sObjectMgr->GetTrinityString(i_textId, loc_idx); @@ -2078,7 +2078,7 @@ namespace Trinity { public: MonsterCustomChatBuilder(WorldObject const& obj, ChatMsg msgtype, const char* text, uint32 language, uint64 targetGUID) - : i_object(obj), i_msgtype(msgtype), i_text(text), i_language(language), i_targetGUID(targetGUID) {} + : i_object(obj), i_msgtype(msgtype), i_text(text), i_language(language), i_targetGUID(targetGUID) { } void operator()(WorldPacket& data, LocaleConstant loc_idx) { /// @todo i_object.GetName() also must be localized? @@ -2600,10 +2600,10 @@ namespace Trinity { public: NearUsedPosDo(WorldObject const& obj, WorldObject const* searcher, float angle, ObjectPosSelector& selector) - : i_object(obj), i_searcher(searcher), i_angle(angle), i_selector(selector) {} + : i_object(obj), i_searcher(searcher), i_angle(angle), i_selector(selector) { } - void operator()(Corpse*) const {} - void operator()(DynamicObject*) const {} + void operator()(Corpse*) const { } + void operator()(DynamicObject*) const { } void operator()(Creature* c) const { @@ -3025,7 +3025,7 @@ struct WorldObjectChangeAccumulator UpdateDataMapType& i_updateDatas; WorldObject& i_object; std::set<uint64> plr_list; - WorldObjectChangeAccumulator(WorldObject &obj, UpdateDataMapType &d) : i_updateDatas(d), i_object(obj) {} + WorldObjectChangeAccumulator(WorldObject &obj, UpdateDataMapType &d) : i_updateDatas(d), i_object(obj) { } void Visit(PlayerMapType &m) { Player* source = NULL; @@ -3087,7 +3087,7 @@ struct WorldObjectChangeAccumulator } } - template<class SKIP> void Visit(GridRefManager<SKIP> &) {} + template<class SKIP> void Visit(GridRefManager<SKIP> &) { } }; void WorldObject::BuildUpdate(UpdateDataMapType& data_map) diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index d74cc19b22a..9da5e1e034c 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -257,7 +257,7 @@ class Object virtual bool hasQuest(uint32 /* quest_id */) const { return false; } virtual bool hasInvolvedQuest(uint32 /* quest_id */) const { return false; } - virtual void BuildUpdate(UpdateDataMapType&) {} + virtual void BuildUpdate(UpdateDataMapType&) { } void BuildFieldsUpdate(Player*, UpdateDataMapType &) const; void SetFieldNotifyFlag(uint16 flag) { _fieldNotifyFlags |= flag; } @@ -335,13 +335,13 @@ struct Position { struct PositionXYZStreamer { - explicit PositionXYZStreamer(Position& pos) : m_pos(&pos) {} + explicit PositionXYZStreamer(Position& pos) : m_pos(&pos) { } Position* m_pos; }; struct PositionXYZOStreamer { - explicit PositionXYZOStreamer(Position& pos) : m_pos(&pos) {} + explicit PositionXYZOStreamer(Position& pos) : m_pos(&pos) { } Position* m_pos; }; @@ -610,7 +610,7 @@ class MapObject friend class ObjectGridLoader; //grid loader for loading creatures protected: - MapObject() : _moveState(MAP_OBJECT_CELL_MOVE_NONE) {} + MapObject() : _moveState(MAP_OBJECT_CELL_MOVE_NONE) { } private: Cell _currentCell; @@ -724,7 +724,7 @@ class WorldObject : public Object, public WorldLocation void SendObjectDeSpawnAnim(uint64 guid); - virtual void SaveRespawnTime() {} + virtual void SaveRespawnTime() { } void AddObjectToRemoveList(); float GetGridActivationRange() const; @@ -863,7 +863,7 @@ namespace Trinity class ObjectDistanceOrderPred { public: - ObjectDistanceOrderPred(WorldObject const* pRefObj, bool ascending = true) : m_refObj(pRefObj), m_ascending(ascending) {} + ObjectDistanceOrderPred(WorldObject const* pRefObj, bool ascending = true) : m_refObj(pRefObj), m_ascending(ascending) { } bool operator()(WorldObject const* pLeft, WorldObject const* pRight) const { return m_ascending ? m_refObj->GetDistanceOrder(pLeft, pRight) : !m_refObj->GetDistanceOrder(pLeft, pRight); diff --git a/src/server/game/Entities/Object/ObjectPosSelector.h b/src/server/game/Entities/Object/ObjectPosSelector.h index d381fb5627e..d3f43654969 100644 --- a/src/server/game/Entities/Object/ObjectPosSelector.h +++ b/src/server/game/Entities/Object/ObjectPosSelector.h @@ -34,7 +34,7 @@ struct ObjectPosSelector { struct UsedPos { - UsedPos(float sign_, float size_, float dist_) : sign(sign_), size(size_), dist(dist_) {} + UsedPos(float sign_, float size_, float dist_) : sign(sign_), size(size_), dist(dist_) { } float sign; diff --git a/src/server/game/Entities/Object/Updates/UpdateData.cpp b/src/server/game/Entities/Object/Updates/UpdateData.cpp index 09a423350b7..fa694d2ce2a 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.cpp +++ b/src/server/game/Entities/Object/Updates/UpdateData.cpp @@ -25,9 +25,7 @@ #include "World.h" #include "zlib.h" -UpdateData::UpdateData(uint16 map) : m_map(map), m_blockCount(0) -{ -} +UpdateData::UpdateData(uint16 map) : m_map(map), m_blockCount(0) { } void UpdateData::AddOutOfRangeGUID(std::set<uint64>& guids) { diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 2a96b32fcdc..83cae25bb37 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2197,26 +2197,8 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati if (!(options & TELE_TO_NOT_LEAVE_COMBAT)) CombatStop(); - // new final coordinates - float final_x = x; - float final_y = y; - float final_z = z; - float final_o = orientation; - - // Calculate final positions if on transport - if (m_transport) - { - float tx, ty, tz, to; - m_movementInfo.transport.pos.GetPosition(tx, ty, tz, to); - - final_x = x + tx * std::cos(orientation) - ty * std::sin(orientation); - final_y = y + ty * std::cos(orientation) + tx * std::sin(orientation); - final_z = z + tz; - final_o = Position::NormalizeOrientation(orientation + m_movementInfo.transport.pos.GetOrientation()); - } - // this will be used instead of the current location in SaveToDB - m_teleport_dest = WorldLocation(mapid, final_x, final_y, final_z, final_o); + m_teleport_dest = WorldLocation(mapid, x, y, z, orientation); SetFallInformation(0, z); // code for finish transfer called in WorldSession::HandleMovementOpcodes() @@ -2227,7 +2209,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati { Position oldPos; GetPosition(&oldPos); - Relocate(final_x, final_y, final_z, final_o); + Relocate(x, y, z, orientation); SendTeleportPacket(oldPos); // this automatically relocates to oldPos in order to broadcast the packet in the right place } } @@ -2328,25 +2310,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati if (oldmap) oldmap->RemovePlayerFromMap(this, false); - // new final coordinates - float final_x = x; - float final_y = y; - float final_z = z; - float final_o = orientation; - - // Calculate final positions if on transport - if (m_transport) - { - float tx, ty, tz, to; - m_movementInfo.transport.pos.GetPosition(tx, ty, tz, to); - - final_x = x + tx * std::cos(orientation) - ty * std::sin(orientation); - final_y = y + ty * std::cos(orientation) + tx * std::sin(orientation); - final_z = z + tz; - final_o = Position::NormalizeOrientation(orientation + m_movementInfo.transport.pos.GetOrientation()); - } - - m_teleport_dest = WorldLocation(mapid, final_x, final_y, final_z, final_o); + m_teleport_dest = WorldLocation(mapid, x, y, z, orientation); SetFallInformation(0, z); // if the player is saved before worldportack (at logout for example) // this will be used instead of the current location in SaveToDB @@ -22802,9 +22766,7 @@ inline void UpdateVisibilityOf_helper(std::set<uint64>& s64, Player* target, std } template<class T> -inline void BeforeVisibilityDestroy(T* /*t*/, Player* /*p*/) -{ -} +inline void BeforeVisibilityDestroy(T* /*t*/, Player* /*p*/) { } template<> inline void BeforeVisibilityDestroy<Creature>(Creature* t, Player* p) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 4804b4a1da2..62d7f1fc5a4 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -152,7 +152,7 @@ enum TalentTree // talent tabs // Spell modifier (used for modify other spells) struct SpellModifier { - SpellModifier(Aura* _ownerAura = NULL) : op(SPELLMOD_DAMAGE), type(SPELLMOD_FLAT), charges(0), value(0), mask(), spellId(0), ownerAura(_ownerAura) {} + SpellModifier(Aura* _ownerAura = NULL) : op(SPELLMOD_DAMAGE), type(SPELLMOD_FLAT), charges(0), value(0), mask(), spellId(0), ownerAura(_ownerAura) { } SpellModOp op : 8; SpellModType type : 8; int16 charges : 16; @@ -330,7 +330,7 @@ enum ReputationSource struct ActionButton { - ActionButton() : packedData(0), uState(ACTIONBUTTON_NEW) {} + ActionButton() : packedData(0), uState(ACTIONBUTTON_NEW) { } uint32 packedData; ActionButtonUpdateState uState; @@ -356,7 +356,7 @@ typedef std::map<uint8, ActionButton> ActionButtonList; struct PlayerCreateInfoItem { - PlayerCreateInfoItem(uint32 id, uint32 amount) : item_id(id), item_amount(amount) {} + PlayerCreateInfoItem(uint32 id, uint32 amount) : item_id(id), item_amount(amount) { } uint32 item_id; uint32 item_amount; @@ -375,8 +375,8 @@ typedef std::list<uint32> PlayerCreateInfoSpells; struct PlayerCreateInfoAction { - PlayerCreateInfoAction() : button(0), type(0), action(0) {} - PlayerCreateInfoAction(uint8 _button, uint32 _action, uint8 _type) : button(_button), type(_type), action(_action) {} + PlayerCreateInfoAction() : button(0), type(0), action(0) { } + PlayerCreateInfoAction(uint8 _button, uint32 _action, uint8 _type) : button(_button), type(_type), action(_action) { } uint8 button; uint8 type; @@ -407,7 +407,7 @@ struct PlayerInfo struct PvPInfo { - PvPInfo() : IsHostile(false), IsInHostileArea(false), IsInNoPvPArea(false), IsInFFAPvPArea(false), EndTimer(0) {} + PvPInfo() : IsHostile(false), IsInHostileArea(false), IsInNoPvPArea(false), IsInFFAPvPArea(false), EndTimer(0) { } bool IsHostile; bool IsInHostileArea; ///> Marks if player is in an area which forces PvP flag @@ -418,7 +418,7 @@ struct PvPInfo struct DuelInfo { - DuelInfo() : initiator(NULL), opponent(NULL), startTimer(0), startTime(0), outOfBound(0), isMounted(false) {} + DuelInfo() : initiator(NULL), opponent(NULL), startTimer(0), startTime(0), outOfBound(0), isMounted(false) { } Player* initiator; Player* opponent; @@ -480,7 +480,7 @@ struct Runes struct EnchantDuration { - EnchantDuration() : item(NULL), slot(MAX_ENCHANTMENT_SLOT), leftduration(0) {}; + EnchantDuration() : item(NULL), slot(MAX_ENCHANTMENT_SLOT), leftduration(0) { }; EnchantDuration(Item* _item, EnchantmentSlot _slot, uint32 _leftduration) : item(_item), slot(_slot), leftduration(_leftduration){ ASSERT(item); }; @@ -738,7 +738,7 @@ typedef std::map<uint32, EquipmentSet> EquipmentSets; struct ItemPosCount { - ItemPosCount(uint16 _pos, uint32 _count) : pos(_pos), count(_count) {} + ItemPosCount(uint16 _pos, uint32 _count) : pos(_pos), count(_count) { } bool isContainedIn(std::vector<ItemPosCount> const& vec) const; uint16 pos; uint32 count; @@ -909,7 +909,7 @@ struct InstancePlayerBind /* permanent PlayerInstanceBinds are created in Raid/Heroic instances for players that aren't already permanently bound when they are inside when a boss is killed or when they enter an instance that the group leader is permanently bound to. */ - InstancePlayerBind() : save(NULL), perm(false) {} + InstancePlayerBind() : save(NULL), perm(false) { } }; struct AccessRequirement @@ -970,7 +970,7 @@ class PlayerTaxi { public: PlayerTaxi(); - ~PlayerTaxi() {} + ~PlayerTaxi() { } // Nodes void InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level); void LoadTaxiMask(std::string const& data); diff --git a/src/server/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp index c257065afa6..163bc719ce6 100644 --- a/src/server/game/Entities/Player/SocialMgr.cpp +++ b/src/server/game/Entities/Player/SocialMgr.cpp @@ -192,13 +192,9 @@ bool PlayerSocial::HasIgnore(uint32 ignore_guid) return false; } -SocialMgr::SocialMgr() -{ -} +SocialMgr::SocialMgr() { } -SocialMgr::~SocialMgr() -{ -} +SocialMgr::~SocialMgr() { } void SocialMgr::GetFriendInfo(Player* player, uint32 friendGUID, FriendInfo &friendInfo) { diff --git a/src/server/game/Entities/Totem/Totem.h b/src/server/game/Entities/Totem/Totem.h index 61bd504d55c..fc10c9caa7f 100644 --- a/src/server/game/Entities/Totem/Totem.h +++ b/src/server/game/Entities/Totem/Totem.h @@ -39,7 +39,7 @@ class Totem : public Minion { public: Totem(SummonPropertiesEntry const* properties, Unit* owner); - virtual ~Totem() {} + virtual ~Totem() { } void Update(uint32 time); void InitStats(uint32 duration); void InitSummon(); @@ -51,12 +51,12 @@ class Totem : public Minion bool UpdateStats(Stats /*stat*/) { return true; } bool UpdateAllStats() { return true; } - void UpdateResistances(uint32 /*school*/) {} - void UpdateArmor() {} - void UpdateMaxHealth() {} - void UpdateMaxPower(Powers /*power*/) {} - void UpdateAttackPowerAndDamage(bool /*ranged*/) {} - void UpdateDamagePhysical(WeaponAttackType /*attType*/) {} + void UpdateResistances(uint32 /*school*/) { } + void UpdateArmor() { } + void UpdateMaxHealth() { } + void UpdateMaxPower(Powers /*power*/) { } + void UpdateAttackPowerAndDamage(bool /*ranged*/) { } + void UpdateDamagePhysical(WeaponAttackType /*attType*/) { } bool IsImmunedToSpellEffect(SpellInfo const* spellInfo, uint32 index) const; diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index 50526136ab5..bd099280fc0 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -163,13 +163,14 @@ void Transport::Update(uint32 diff) if (GetGOInfo()->moTransport.canBeStopped) SetGoState(GO_STATE_ACTIVE); - // Departure event - if (_currentFrame->IsTeleportFrame()) - TeleportTransport(_nextFrame->Node->mapid, _nextFrame->Node->x, _nextFrame->Node->y, _nextFrame->Node->z); - sScriptMgr->OnRelocate(this, _currentFrame->Node->index, _currentFrame->Node->mapid, _currentFrame->Node->x, _currentFrame->Node->y, _currentFrame->Node->z); TC_LOG_DEBUG(LOG_FILTER_TRANSPORTS, "Transport %u (%s) moved to node %u %u %f %f %f", GetEntry(), GetName().c_str(), _currentFrame->Node->index, _currentFrame->Node->mapid, _currentFrame->Node->x, _currentFrame->Node->y, _currentFrame->Node->z); + + // Departure event + if (_currentFrame->IsTeleportFrame()) + if (TeleportTransport(_nextFrame->Node->mapid, _nextFrame->Node->x, _nextFrame->Node->y, _nextFrame->Node->z)) + return; // Update more in new map thread } // Set position @@ -236,6 +237,10 @@ Creature* Transport::CreateNPCPassenger(uint32 guid, CreatureData const* data) creature->SetHomePosition(creature->GetPositionX(), creature->GetPositionY(), creature->GetPositionZ(), creature->GetOrientation()); creature->SetTransportHomePosition(creature->m_movementInfo.transport.pos); + /// @HACK - transport models are not added to map's dynamic LoS calculations + /// because the current GameObjectModel cannot be moved without recreating + creature->AddUnitState(UNIT_STATE_IGNORE_PATHFINDING); + if (!creature->IsPositionValid()) { TC_LOG_ERROR(LOG_FILTER_TRANSPORTS, "Creature (guidlow %d, entry %d) not created. Suggested coordinates aren't valid (X: %f Y: %f)",creature->GetGUIDLow(),creature->GetEntry(),creature->GetPositionX(),creature->GetPositionY()); @@ -293,30 +298,6 @@ GameObject* Transport::CreateGOPassenger(uint32 guid, GameObjectData const* data return go; } -void Transport::CalculatePassengerPosition(float& x, float& y, float& z, float* o /*= NULL*/) const -{ - float inx = x, iny = y, inz = z; - if (o) - *o = Position::NormalizeOrientation(GetOrientation() + *o); - - x = GetPositionX() + inx * std::cos(GetOrientation()) - iny * std::sin(GetOrientation()); - y = GetPositionY() + iny * std::cos(GetOrientation()) + inx * std::sin(GetOrientation()); - z = GetPositionZ() + inz; -} - -void Transport::CalculatePassengerOffset(float& x, float& y, float& z, float* o /*= NULL*/) const -{ - if (o) - *o = Position::NormalizeOrientation(*o - GetOrientation()); - - z -= GetPositionZ(); - y -= GetPositionY(); // y = searchedY * std::cos(o) + searchedX * std::sin(o) - x -= GetPositionX(); // x = searchedX * std::cos(o) + searchedY * std::sin(o + pi) - float inx = x, iny = y; - y = (iny - inx * std::tan(GetOrientation())) / (std::cos(GetOrientation()) + std::sin(GetOrientation()) * std::tan(GetOrientation())); - x = (inx + iny * std::tan(GetOrientation())) / (std::cos(GetOrientation()) + std::sin(GetOrientation()) * std::tan(GetOrientation())); -} - void Transport::UpdatePosition(float x, float y, float z, float o) { bool newActive = GetMap()->IsGridLoaded(x, y); @@ -421,7 +402,7 @@ float Transport::CalculateSegmentPos(float now) return segmentPos / frame.NextDistFromPrev; } -void Transport::TeleportTransport(uint32 newMapid, float x, float y, float z) +bool Transport::TeleportTransport(uint32 newMapid, float x, float y, float z) { Map const* oldMap = GetMap(); @@ -464,23 +445,27 @@ void Transport::TeleportTransport(uint32 newMapid, float x, float y, float z) { WorldObject* obj = (*itr++); + float destX, destY, destZ, destO; + obj->m_movementInfo.transport.pos.GetPosition(destX, destY, destZ, destO); + TransportBase::CalculatePassengerPosition(destX, destY, destZ, &destO, x, y, z, GetOrientation()); + switch (obj->GetTypeId()) { case TYPEID_UNIT: if (!IS_PLAYER_GUID(obj->ToUnit()->GetOwnerGUID())) // pets should be teleported with player - obj->ToCreature()->FarTeleportTo(newMap, x, y, z, obj->GetOrientation()); + obj->ToCreature()->FarTeleportTo(newMap, destX, destY, destZ, destO); break; case TYPEID_GAMEOBJECT: { GameObject* go = obj->ToGameObject(); go->GetMap()->RemoveFromMap(go, false); - Relocate(x, y, z, go->GetOrientation()); - SetMap(newMap); + go->Relocate(destX, destY, destZ, destO); + go->SetMap(newMap); newMap->AddToMap(go); break; } case TYPEID_PLAYER: - if (!obj->ToPlayer()->TeleportTo(newMapid, x, y, z, GetOrientation(), TELE_TO_NOT_LEAVE_TRANSPORT)) + if (!obj->ToPlayer()->TeleportTo(newMapid, destX, destY, destZ, destO, TELE_TO_NOT_LEAVE_TRANSPORT)) _passengers.erase(obj); break; default: @@ -488,17 +473,28 @@ void Transport::TeleportTransport(uint32 newMapid, float x, float y, float z) } } + Relocate(x, y, z, GetOrientation()); GetMap()->AddToMap<Transport>(this); + return true; } else { // Teleport players, they need to know it for (std::set<WorldObject*>::iterator itr = _passengers.begin(); itr != _passengers.end(); ++itr) + { if ((*itr)->GetTypeId() == TYPEID_PLAYER) - (*itr)->ToUnit()->NearTeleportTo(x, y, z, GetOrientation()); - } + { + float destX, destY, destZ, destO; + (*itr)->m_movementInfo.transport.pos.GetPosition(destX, destY, destZ, destO); + TransportBase::CalculatePassengerPosition(destX, destY, destZ, &destO, x, y, z, GetOrientation()); - UpdatePosition(x, y, z, GetOrientation()); + (*itr)->ToUnit()->NearTeleportTo(destX, destY, destZ, destO); + } + } + + UpdatePosition(x, y, z, GetOrientation()); + return false; + } } void Transport::UpdatePassengerPositions(std::set<WorldObject*>& passengers) diff --git a/src/server/game/Entities/Transport/Transport.h b/src/server/game/Entities/Transport/Transport.h index 0d020fe2c34..0145ec608ae 100644 --- a/src/server/game/Entities/Transport/Transport.h +++ b/src/server/game/Entities/Transport/Transport.h @@ -46,10 +46,16 @@ class Transport : public GameObject, public TransportBase GameObject* CreateGOPassenger(uint32 guid, GameObjectData const* data); /// This method transforms supplied transport offsets into global coordinates - void CalculatePassengerPosition(float& x, float& y, float& z, float* o = NULL) const; + void CalculatePassengerPosition(float& x, float& y, float& z, float* o /*= NULL*/) const + { + TransportBase::CalculatePassengerPosition(x, y, z, o, GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); + } /// This method transforms supplied global coordinates into local offsets - void CalculatePassengerOffset(float& x, float& y, float& z, float* o = NULL) const; + void CalculatePassengerOffset(float& x, float& y, float& z, float* o /*= NULL*/) const + { + TransportBase::CalculatePassengerOffset(x, y, z, o, GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); + } uint32 GetPeriod() const { return GetUInt32Value(GAMEOBJECT_LEVEL); } void SetPeriod(uint32 period) { SetUInt32Value(GAMEOBJECT_LEVEL, period); } @@ -72,7 +78,7 @@ class Transport : public GameObject, public TransportBase private: void MoveToNextWaypoint(); float CalculateSegmentPos(float perc); - void TeleportTransport(uint32 newMapid, float x, float y, float z); + bool TeleportTransport(uint32 newMapid, float x, float y, float z); void UpdatePassengerPositions(std::set<WorldObject*>& passengers); void DoEventIfAny(KeyFrame const& node, bool departure); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 247c845e289..7d112c23f11 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11853,9 +11853,7 @@ CharmInfo::CharmInfo(Unit* unit) } } -CharmInfo::~CharmInfo() -{ -} +CharmInfo::~CharmInfo() { } void CharmInfo::RestoreState() { diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 922efb59ed8..9ba93c38569 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -802,7 +802,7 @@ struct DiminishingReturn { DiminishingReturn(DiminishingGroup group, uint32 t, uint32 count) : DRGroup(group), stack(0), hitTime(t), hitCount(count) - {} + { } DiminishingGroup DRGroup:16; uint16 stack:16; @@ -820,7 +820,7 @@ class DispelInfo { public: explicit DispelInfo(Unit* dispeller, uint32 dispellerSpellId, uint8 chargesRemoved) : - _dispellerUnit(dispeller), _dispellerSpell(dispellerSpellId), _chargesRemoved(chargesRemoved) {} + _dispellerUnit(dispeller), _dispellerSpell(dispellerSpellId), _chargesRemoved(chargesRemoved) { } Unit* GetDispeller() const { return _dispellerUnit; } uint32 GetDispellerSpellId() const { return _dispellerSpell; } @@ -838,7 +838,7 @@ private: struct CleanDamage { CleanDamage(uint32 mitigated, uint32 absorbed, WeaponAttackType _attackType, MeleeHitOutcome _hitOutCome) : - absorbed_damage(absorbed), mitigated_damage(mitigated), attackType(_attackType), hitOutCome(_hitOutCome) {} + absorbed_damage(absorbed), mitigated_damage(mitigated), attackType(_attackType), hitOutCome(_hitOutCome) { } uint32 absorbed_damage; uint32 mitigated_damage; @@ -967,7 +967,7 @@ struct SpellNonMeleeDamage SpellNonMeleeDamage(Unit* _attacker, Unit* _target, uint32 _SpellID, uint32 _schoolMask) : target(_target), attacker(_attacker), SpellID(_SpellID), damage(0), overkill(0), schoolMask(_schoolMask), absorb(0), resist(0), physicalLog(false), unused(false), blocked(0), HitInfo(0), cleanDamage(0) - {} + { } Unit *target; Unit *attacker; @@ -988,7 +988,7 @@ struct SpellNonMeleeDamage struct SpellPeriodicAuraLogInfo { SpellPeriodicAuraLogInfo(AuraEffect const* _auraEff, uint32 _damage, uint32 _overDamage, uint32 _absorb, uint32 _resist, float _multiplier, bool _critical) - : auraEff(_auraEff), damage(_damage), overDamage(_overDamage), absorb(_absorb), resist(_resist), multiplier(_multiplier), critical(_critical){} + : auraEff(_auraEff), damage(_damage), overDamage(_overDamage), absorb(_absorb), resist(_resist), multiplier(_multiplier), critical(_critical){ } AuraEffect const* auraEff; uint32 damage; @@ -1043,7 +1043,7 @@ enum CurrentSpellTypes struct GlobalCooldown { - explicit GlobalCooldown(uint32 _dur = 0, uint32 _time = 0) : duration(_dur), cast_time(_time) {} + explicit GlobalCooldown(uint32 _dur = 0, uint32 _time = 0) : duration(_dur), cast_time(_time) { } uint32 duration; uint32 cast_time; @@ -1054,7 +1054,7 @@ typedef UNORDERED_MAP<uint32 /*category*/, GlobalCooldown> GlobalCooldownList; class GlobalCooldownMgr // Shared by Player and CharmInfo { public: - GlobalCooldownMgr() {} + GlobalCooldownMgr() { } public: bool HasGlobalCooldown(SpellInfo const* spellInfo) const; @@ -1097,7 +1097,7 @@ enum CommandStates struct UnitActionBarEntry { - UnitActionBarEntry() : packedData(uint32(ACT_DISABLED) << 24) {} + UnitActionBarEntry() : packedData(uint32(ACT_DISABLED) << 24) { } uint32 packedData; @@ -2269,7 +2269,7 @@ namespace Trinity class PowerPctOrderPred { public: - PowerPctOrderPred(Powers power, bool ascending = true) : m_power(power), m_ascending(ascending) {} + PowerPctOrderPred(Powers power, bool ascending = true) : m_power(power), m_ascending(ascending) { } bool operator() (const Unit* a, const Unit* b) const { float rA = a->GetMaxPower(m_power) ? float(a->GetPower(m_power)) / float(a->GetMaxPower(m_power)) : 0.0f; @@ -2285,7 +2285,7 @@ namespace Trinity class HealthPctOrderPred { public: - HealthPctOrderPred(bool ascending = true) : m_ascending(ascending) {} + HealthPctOrderPred(bool ascending = true) : m_ascending(ascending) { } bool operator() (const Unit* a, const Unit* b) const { float rA = a->GetMaxHealth() ? float(a->GetHealth()) / float(a->GetMaxHealth()) : 0.0f; diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 8dbe08990c5..86614da38fa 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -677,30 +677,6 @@ uint8 Vehicle::GetAvailableSeatCount() const return ret; } -void Vehicle::CalculatePassengerPosition(float& x, float& y, float& z, float* o /*= NULL*/) const -{ - float inx = x, iny = y, inz = z; - if (o) - *o = Position::NormalizeOrientation(GetBase()->GetOrientation() + *o); - - x = GetBase()->GetPositionX() + inx * std::cos(GetBase()->GetOrientation()) - iny * std::sin(GetBase()->GetOrientation()); - y = GetBase()->GetPositionY() + iny * std::cos(GetBase()->GetOrientation()) + inx * std::sin(GetBase()->GetOrientation()); - z = GetBase()->GetPositionZ() + inz; -} - -void Vehicle::CalculatePassengerOffset(float& x, float& y, float& z, float* o /*= NULL*/) const -{ - if (o) - *o = Position::NormalizeOrientation(*o - GetBase()->GetOrientation()); - - z -= GetBase()->GetPositionZ(); - y -= GetBase()->GetPositionY(); // y = searchedY * std::cos(o) + searchedX * std::sin(o) - x -= GetBase()->GetPositionX(); // x = searchedX * std::cos(o) + searchedY * std::sin(o + pi) - float inx = x, iny = y; - y = (iny - inx * std::tan(GetBase()->GetOrientation())) / (std::cos(GetBase()->GetOrientation()) + std::sin(GetBase()->GetOrientation()) * std::tan(GetBase()->GetOrientation())); - x = (inx + iny * std::tan(GetBase()->GetOrientation())) / (std::cos(GetBase()->GetOrientation()) + std::sin(GetBase()->GetOrientation()) * std::tan(GetBase()->GetOrientation())); -} - /** * @fn void Vehicle::RemovePendingEvent(VehicleJoinEvent* e) * diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h index 9fb1b6614b5..7dc9c36ecef 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.h +++ b/src/server/game/Entities/Vehicle/Vehicle.h @@ -89,10 +89,20 @@ class Vehicle : public TransportBase void InitMovementInfoForBase(); /// This method transforms supplied transport offsets into global coordinates - void CalculatePassengerPosition(float& x, float& y, float& z, float* o = NULL) const; + void CalculatePassengerPosition(float& x, float& y, float& z, float* o /*= NULL*/) const + { + TransportBase::CalculatePassengerPosition(x, y, z, o, + GetBase()->GetPositionX(), GetBase()->GetPositionY(), + GetBase()->GetPositionZ(), GetBase()->GetOrientation()); + } /// This method transforms supplied global coordinates into local offsets - void CalculatePassengerOffset(float& x, float& y, float& z, float* o = NULL) const; + void CalculatePassengerOffset(float& x, float& y, float& z, float* o /*= NULL*/) const + { + TransportBase::CalculatePassengerOffset(x, y, z, o, + GetBase()->GetPositionX(), GetBase()->GetPositionY(), + GetBase()->GetPositionZ(), GetBase()->GetOrientation()); + } void RemovePendingEvent(VehicleJoinEvent* e); void RemovePendingEventsForSeat(int8 seatId); @@ -114,7 +124,7 @@ class VehicleJoinEvent : public BasicEvent { friend class Vehicle; protected: - VehicleJoinEvent(Vehicle* v, Unit* u) : Target(v), Passenger(u), Seat(Target->Seats.end()) {} + VehicleJoinEvent(Vehicle* v, Unit* u) : Target(v), Passenger(u), Seat(Target->Seats.end()) { } ~VehicleJoinEvent(); bool Execute(uint64, uint32); void Abort(uint64); diff --git a/src/server/game/Entities/Vehicle/VehicleDefines.h b/src/server/game/Entities/Vehicle/VehicleDefines.h index 802e63346c1..77a50ef2f7e 100644 --- a/src/server/game/Entities/Vehicle/VehicleDefines.h +++ b/src/server/game/Entities/Vehicle/VehicleDefines.h @@ -103,7 +103,7 @@ struct VehicleSeat struct VehicleAccessory { VehicleAccessory(uint32 entry, int8 seatId, bool isMinion, uint8 summonType, uint32 summonTime) : - AccessoryEntry(entry), IsMinion(isMinion), SummonTime(summonTime), SeatId(seatId), SummonedType(summonType) {} + AccessoryEntry(entry), IsMinion(isMinion), SummonTime(summonTime), SeatId(seatId), SummonedType(summonType) { } uint32 AccessoryEntry; uint32 IsMinion; uint32 SummonTime; @@ -127,6 +127,31 @@ public: /// This method transforms supplied global coordinates into local offsets virtual void CalculatePassengerOffset(float& x, float& y, float& z, float* o = NULL) const = 0; + +protected: + static void CalculatePassengerPosition(float& x, float& y, float& z, float* o, float transX, float transY, float transZ, float transO) + { + float inx = x, iny = y, inz = z; + if (o) + *o = Position::NormalizeOrientation(transO + *o); + + x = transX + inx * std::cos(transO) - iny * std::sin(transO); + y = transY + iny * std::cos(transO) + inx * std::sin(transO); + z = transZ + inz; + } + + static void CalculatePassengerOffset(float& x, float& y, float& z, float* o, float transX, float transY, float transZ, float transO) + { + if (o) + *o = Position::NormalizeOrientation(*o - transO); + + z -= transZ; + y -= transY; // y = searchedY * std::cos(o) + searchedX * std::sin(o) + x -= transX; // x = searchedX * std::cos(o) + searchedY * std::sin(o + pi) + float inx = x, iny = y; + y = (iny - inx * std::tan(transO)) / (std::cos(transO) + std::sin(transO) * std::tan(transO)); + x = (inx + iny * std::tan(transO)) / (std::cos(transO) + std::sin(transO) * std::tan(transO)); + } }; #endif diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 74cea10809e..b38010dc8d4 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1494,9 +1494,7 @@ void GameEventMgr::UpdateWorldStates(uint16 event_id, bool Activate) } } -GameEventMgr::GameEventMgr() : isSystemInit(false) -{ -} +GameEventMgr::GameEventMgr() : isSystemInit(false) { } void GameEventMgr::HandleQuestComplete(uint32 quest_id) { diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index 994f32f75d6..bad27983235 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -55,7 +55,7 @@ typedef std::map<uint32 /*condition id*/, GameEventFinishCondition> GameEventCon struct GameEventData { - GameEventData() : start(1), end(0), nextstart(0), occurence(0), length(0), holiday_id(HOLIDAY_NONE), state(GAMEEVENT_NORMAL) {} + GameEventData() : start(1), end(0), nextstart(0), occurence(0), length(0), holiday_id(HOLIDAY_NONE), state(GAMEEVENT_NORMAL) { } time_t start; // occurs after this time time_t end; // occurs before this time time_t nextstart; // after this time the follow-up events count this phase completed @@ -99,7 +99,7 @@ class GameEventMgr private: GameEventMgr(); - ~GameEventMgr() {}; + ~GameEventMgr() { }; public: typedef std::set<uint16> ActiveEvents; diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index f5a0d9b6cac..c917f8370a1 100644 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -39,13 +39,9 @@ #include <cmath> -ObjectAccessor::ObjectAccessor() -{ -} +ObjectAccessor::ObjectAccessor() { } -ObjectAccessor::~ObjectAccessor() -{ -} +ObjectAccessor::~ObjectAccessor() { } template<class T> T* ObjectAccessor::GetObjectInWorld(uint32 mapid, float x, float y, uint64 guid, T* /*fake*/) { diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h index fa5f397e4b3..27bbee70c13 100644 --- a/src/server/game/Globals/ObjectAccessor.h +++ b/src/server/game/Globals/ObjectAccessor.h @@ -75,7 +75,7 @@ class HashMapHolder private: //Non instanceable only static - HashMapHolder() {} + HashMapHolder() { } static LockType i_lock; static MapType m_objectMap; diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index cf3c62f8699..5a628bcfc88 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -467,8 +467,8 @@ struct PetLevelInfo struct MailLevelReward { - MailLevelReward() : raceMask(0), mailTemplateId(0), senderEntry(0) {} - MailLevelReward(uint32 _raceMask, uint32 _mailTemplateId, uint32 _senderEntry) : raceMask(_raceMask), mailTemplateId(_mailTemplateId), senderEntry(_senderEntry) {} + MailLevelReward() : raceMask(0), mailTemplateId(0), senderEntry(0) { } + MailLevelReward(uint32 _raceMask, uint32 _mailTemplateId, uint32 _senderEntry) : raceMask(_raceMask), mailTemplateId(_mailTemplateId), senderEntry(_senderEntry) { } uint32 raceMask; uint32 mailTemplateId; @@ -556,8 +556,8 @@ struct QuestPOIPoint int32 x; int32 y; - QuestPOIPoint() : x(0), y(0) {} - QuestPOIPoint(int32 _x, int32 _y) : x(_x), y(_y) {} + QuestPOIPoint() : x(0), y(0) { } + QuestPOIPoint(int32 _x, int32 _y) : x(_x), y(_y) { } }; struct QuestPOI @@ -571,8 +571,8 @@ struct QuestPOI uint32 Unk4; std::vector<QuestPOIPoint> points; - QuestPOI() : Id(0), ObjectiveIndex(0), MapId(0), AreaId(0), Unk2(0), Unk3(0), Unk4(0) {} - QuestPOI(uint32 id, int32 objIndex, uint32 mapId, uint32 areaId, uint32 unk2, uint32 unk3, uint32 unk4) : Id(id), ObjectiveIndex(objIndex), MapId(mapId), AreaId(areaId), Unk2(unk2), Unk3(unk3), Unk4(unk4) {} + QuestPOI() : Id(0), ObjectiveIndex(0), MapId(0), AreaId(0), Unk2(0), Unk3(0), Unk4(0) { } + QuestPOI(uint32 id, int32 objIndex, uint32 mapId, uint32 areaId, uint32 unk2, uint32 unk3, uint32 unk4) : Id(id), ObjectiveIndex(objIndex), MapId(mapId), AreaId(areaId), Unk2(unk2), Unk3(unk3), Unk4(unk4) { } }; typedef std::vector<QuestPOI> QuestPOIVector; diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h index 33a26c62ce0..ecfdfd6ce05 100644 --- a/src/server/game/Grids/Cells/Cell.h +++ b/src/server/game/Grids/Cells/Cell.h @@ -31,8 +31,8 @@ class WorldObject; struct CellArea { - CellArea() {} - CellArea(CellCoord low, CellCoord high) : low_bound(low), high_bound(high) {} + CellArea() { } + CellArea(CellCoord low, CellCoord high) : low_bound(low), high_bound(high) { } bool operator!() const { return low_bound == high_bound; } diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h index 0a5e84b8ded..57f79538e2b 100644 --- a/src/server/game/Grids/Grid.h +++ b/src/server/game/Grids/Grid.h @@ -52,7 +52,7 @@ class Grid /** destructor to clean up its resources. This includes unloading the grid if it has not been unload. */ - ~Grid() {} + ~Grid() { } /** an object of interested enters the grid */ diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h index 1e4a9ca83b4..f07441bec0a 100644 --- a/src/server/game/Grids/GridDefines.h +++ b/src/server/game/Grids/GridDefines.h @@ -89,11 +89,11 @@ struct CoordPair { CoordPair(uint32 x=0, uint32 y=0) : x_coord(x), y_coord(y) - {} + { } CoordPair(const CoordPair<LIMIT> &obj) : x_coord(obj.x_coord), y_coord(obj.y_coord) - {} + { } CoordPair<LIMIT> & operator=(const CoordPair<LIMIT> &obj) { diff --git a/src/server/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h index 3d662684060..18403e27a45 100644 --- a/src/server/game/Grids/GridReference.h +++ b/src/server/game/Grids/GridReference.h @@ -45,7 +45,7 @@ class GridReference : public Reference<GridRefManager<OBJECT>, OBJECT> this->getTarget()->decSize(); } public: - GridReference() : Reference<GridRefManager<OBJECT>, OBJECT>() {} + GridReference() : Reference<GridRefManager<OBJECT>, OBJECT>() { } ~GridReference() { this->unlink(); } GridReference* next() { return (GridReference*)Reference<GridRefManager<OBJECT>, OBJECT>::next(); } }; diff --git a/src/server/game/Grids/GridStates.h b/src/server/game/Grids/GridStates.h index 09682c716a9..38728d11757 100644 --- a/src/server/game/Grids/GridStates.h +++ b/src/server/game/Grids/GridStates.h @@ -34,7 +34,7 @@ class GridState void setMagic() { i_Magic = MAGIC_TESTVAL; } unsigned int i_Magic; #endif - virtual ~GridState() {}; + virtual ~GridState() { }; virtual void Update(Map &, NGridType&, GridInfo &, uint32 t_diff) const = 0; }; diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h index 65cdd3a6033..2e244ecbc62 100644 --- a/src/server/game/Grids/NGrid.h +++ b/src/server/game/Grids/NGrid.h @@ -34,10 +34,10 @@ class GridInfo public: GridInfo() : i_timer(0), vis_Update(0, irand(0, DEFAULT_VISIBILITY_NOTIFY_PERIOD)), - i_unloadActiveLockCount(0), i_unloadExplicitLock(false), i_unloadReferenceLock(false) {} + 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)), - i_unloadActiveLockCount(0), i_unloadExplicitLock(!unload), i_unloadReferenceLock(false) {} + i_unloadActiveLockCount(0), i_unloadExplicitLock(!unload), i_unloadReferenceLock(false) { } const TimeTracker& getTimeTracker() const { return i_timer; } bool getUnloadLock() const { return i_unloadActiveLockCount || i_unloadExplicitLock || i_unloadReferenceLock; } void setUnloadExplicitLock(bool on) { i_unloadExplicitLock = on; } diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index e6b1bf28608..96cd4350c32 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -46,7 +46,7 @@ namespace Trinity std::set<Unit*> i_visibleNow; Player::ClientGUIDs vis_guids; - VisibleNotifier(Player &player) : i_player(player), i_data(player.GetMapId()), vis_guids(player.m_clientGUIDs) {} + VisibleNotifier(Player &player) : i_player(player), i_data(player.GetMapId()), vis_guids(player.m_clientGUIDs) { } template<class T> void Visit(GridRefManager<T> &m); void SendToSelf(void); }; @@ -55,8 +55,8 @@ namespace Trinity { WorldObject &i_object; - explicit VisibleChangesNotifier(WorldObject &object) : i_object(object) {} - template<class T> void Visit(GridRefManager<T> &) {} + explicit VisibleChangesNotifier(WorldObject &object) : i_object(object) { } + template<class T> void Visit(GridRefManager<T> &) { } void Visit(PlayerMapType &); void Visit(CreatureMapType &); void Visit(DynamicObjectMapType &); @@ -64,7 +64,7 @@ namespace Trinity struct PlayerRelocationNotifier : public VisibleNotifier { - PlayerRelocationNotifier(Player &player) : VisibleNotifier(player) {} + PlayerRelocationNotifier(Player &player) : VisibleNotifier(player) { } template<class T> void Visit(GridRefManager<T> &m) { VisibleNotifier::Visit(m); } void Visit(CreatureMapType &); @@ -74,8 +74,8 @@ namespace Trinity struct CreatureRelocationNotifier { Creature &i_creature; - CreatureRelocationNotifier(Creature &c) : i_creature(c) {} - template<class T> void Visit(GridRefManager<T> &) {} + CreatureRelocationNotifier(Creature &c) : i_creature(c) { } + template<class T> void Visit(GridRefManager<T> &) { } void Visit(CreatureMapType &); void Visit(PlayerMapType &); }; @@ -87,8 +87,8 @@ namespace Trinity CellCoord &p; const float i_radius; DelayedUnitRelocation(Cell &c, CellCoord &pair, Map &map, float radius) : - i_map(map), cell(c), p(pair), i_radius(radius) {} - template<class T> void Visit(GridRefManager<T> &) {} + i_map(map), cell(c), p(pair), i_radius(radius) { } + template<class T> void Visit(GridRefManager<T> &) { } void Visit(CreatureMapType &); void Visit(PlayerMapType &); }; @@ -97,8 +97,8 @@ namespace Trinity { Unit &i_unit; bool isCreature; - explicit AIRelocationNotifier(Unit &unit) : i_unit(unit), isCreature(unit.GetTypeId() == TYPEID_UNIT) {} - template<class T> void Visit(GridRefManager<T> &) {} + explicit AIRelocationNotifier(Unit &unit) : i_unit(unit), isCreature(unit.GetTypeId() == TYPEID_UNIT) { } + template<class T> void Visit(GridRefManager<T> &) { } void Visit(CreatureMapType &); }; @@ -106,7 +106,7 @@ namespace Trinity { GridType &i_grid; uint32 i_timeDiff; - GridUpdater(GridType &grid, uint32 diff) : i_grid(grid), i_timeDiff(diff) {} + GridUpdater(GridType &grid, uint32 diff) : i_grid(grid), i_timeDiff(diff) { } template<class T> void updateObjects(GridRefManager<T> &m) { @@ -143,7 +143,7 @@ namespace Trinity void Visit(PlayerMapType &m); void Visit(CreatureMapType &m); void Visit(DynamicObjectMapType &m); - template<class SKIP> void Visit(GridRefManager<SKIP> &) {} + template<class SKIP> void Visit(GridRefManager<SKIP> &) { } void SendPacket(Player* player) { @@ -162,11 +162,10 @@ namespace Trinity struct ObjectUpdater { uint32 i_timeDiff; - explicit ObjectUpdater(const uint32 diff) : i_timeDiff(diff) {} + explicit ObjectUpdater(const uint32 diff) : i_timeDiff(diff) { } template<class T> void Visit(GridRefManager<T> &m); - void Visit(PlayerMapType &) {} - void Visit(CorpseMapType &) {} - void Visit(CreatureMapType &); + void Visit(PlayerMapType &) { } + void Visit(CorpseMapType &) { } }; // SEARCHERS & LIST SEARCHERS & WORKERS @@ -182,7 +181,7 @@ namespace Trinity Check &i_check; WorldObjectSearcher(WorldObject const* searcher, WorldObject* & result, Check& check, uint32 mapTypeMask = GRID_MAP_TYPE_MASK_ALL) - : i_mapTypeMask(mapTypeMask), i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} + : i_mapTypeMask(mapTypeMask), i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) { } void Visit(GameObjectMapType &m); void Visit(PlayerMapType &m); @@ -191,7 +190,7 @@ namespace Trinity void Visit(DynamicObjectMapType &m); void Visit(AreaTriggerMapType &m); - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; template<class Check> @@ -203,7 +202,7 @@ namespace Trinity Check &i_check; WorldObjectLastSearcher(WorldObject const* searcher, WorldObject* & result, Check& check, uint32 mapTypeMask = GRID_MAP_TYPE_MASK_ALL) - : i_mapTypeMask(mapTypeMask), i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} + : i_mapTypeMask(mapTypeMask), i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) { } void Visit(GameObjectMapType &m); void Visit(PlayerMapType &m); @@ -212,7 +211,7 @@ namespace Trinity void Visit(DynamicObjectMapType &m); void Visit(AreaTriggerMapType &m); - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; template<class Check> @@ -224,7 +223,7 @@ namespace Trinity Check& i_check; WorldObjectListSearcher(WorldObject const* searcher, std::list<WorldObject*> &objects, Check & check, uint32 mapTypeMask = GRID_MAP_TYPE_MASK_ALL) - : i_mapTypeMask(mapTypeMask), i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) {} + : i_mapTypeMask(mapTypeMask), i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) { } void Visit(PlayerMapType &m); void Visit(CreatureMapType &m); @@ -233,7 +232,7 @@ namespace Trinity void Visit(DynamicObjectMapType &m); void Visit(AreaTriggerMapType &m); - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; template<class Do> @@ -244,7 +243,7 @@ namespace Trinity Do const& i_do; WorldObjectWorker(WorldObject const* searcher, Do const& _do, uint32 mapTypeMask = GRID_MAP_TYPE_MASK_ALL) - : i_mapTypeMask(mapTypeMask), i_phaseMask(searcher->GetPhaseMask()), i_do(_do) {} + : i_mapTypeMask(mapTypeMask), i_phaseMask(searcher->GetPhaseMask()), i_do(_do) { } void Visit(GameObjectMapType &m) { @@ -299,7 +298,7 @@ namespace Trinity i_do(itr->GetSource()); } - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; // Gameobject searchers @@ -312,11 +311,11 @@ namespace Trinity Check &i_check; GameObjectSearcher(WorldObject const* searcher, GameObject* & result, Check& check) - : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) { } void Visit(GameObjectMapType &m); - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; // Last accepted by Check GO if any (Check can change requirements at each call) @@ -328,11 +327,11 @@ namespace Trinity Check& i_check; GameObjectLastSearcher(WorldObject const* searcher, GameObject* & result, Check& check) - : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) { } void Visit(GameObjectMapType &m); - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; template<class Check> @@ -343,18 +342,18 @@ namespace Trinity Check& i_check; GameObjectListSearcher(WorldObject const* searcher, std::list<GameObject*> &objects, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) { } void Visit(GameObjectMapType &m); - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; template<class Functor> struct GameObjectWorker { GameObjectWorker(WorldObject const* searcher, Functor& func) - : _func(func), _phaseMask(searcher->GetPhaseMask()) {} + : _func(func), _phaseMask(searcher->GetPhaseMask()) { } void Visit(GameObjectMapType& m) { @@ -363,7 +362,7 @@ namespace Trinity _func(itr->GetSource()); } - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } private: Functor& _func; @@ -381,12 +380,12 @@ namespace Trinity Check & i_check; UnitSearcher(WorldObject const* searcher, Unit* & result, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) { } void Visit(CreatureMapType &m); void Visit(PlayerMapType &m); - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; // Last accepted by Check Unit if any (Check can change requirements at each call) @@ -398,12 +397,12 @@ namespace Trinity Check & i_check; UnitLastSearcher(WorldObject const* searcher, Unit* & result, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) { } void Visit(CreatureMapType &m); void Visit(PlayerMapType &m); - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; // All accepted by Check units if any @@ -415,12 +414,12 @@ namespace Trinity Check& i_check; UnitListSearcher(WorldObject const* searcher, std::list<Unit*> &objects, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) { } void Visit(PlayerMapType &m); void Visit(CreatureMapType &m); - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; // Creature searchers @@ -433,11 +432,11 @@ namespace Trinity Check & i_check; CreatureSearcher(WorldObject const* searcher, Creature* & result, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) { } void Visit(CreatureMapType &m); - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; // Last accepted by Check Creature if any (Check can change requirements at each call) @@ -449,11 +448,11 @@ namespace Trinity Check & i_check; CreatureLastSearcher(WorldObject const* searcher, Creature* & result, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) { } void Visit(CreatureMapType &m); - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; template<class Check> @@ -464,11 +463,11 @@ namespace Trinity Check& i_check; CreatureListSearcher(WorldObject const* searcher, std::list<Creature*> &objects, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) { } void Visit(CreatureMapType &m); - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; template<class Do> @@ -478,7 +477,7 @@ namespace Trinity Do& i_do; CreatureWorker(WorldObject const* searcher, Do& _do) - : i_phaseMask(searcher->GetPhaseMask()), i_do(_do) {} + : i_phaseMask(searcher->GetPhaseMask()), i_do(_do) { } void Visit(CreatureMapType &m) { @@ -487,7 +486,7 @@ namespace Trinity i_do(itr->GetSource()); } - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; // Player searchers @@ -500,11 +499,11 @@ namespace Trinity Check & i_check; PlayerSearcher(WorldObject const* searcher, Player* & result, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) { } void Visit(PlayerMapType &m); - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; template<class Check> @@ -515,11 +514,11 @@ namespace Trinity Check& i_check; PlayerListSearcher(WorldObject const* searcher, std::list<Player*> &objects, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) { } void Visit(PlayerMapType &m); - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; template<class Check> @@ -535,7 +534,7 @@ namespace Trinity void Visit(PlayerMapType& m); - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; template<class Do> @@ -545,7 +544,7 @@ namespace Trinity Do& i_do; PlayerWorker(WorldObject const* searcher, Do& _do) - : i_phaseMask(searcher->GetPhaseMask()), i_do(_do) {} + : i_phaseMask(searcher->GetPhaseMask()), i_do(_do) { } void Visit(PlayerMapType &m) { @@ -554,7 +553,7 @@ namespace Trinity i_do(itr->GetSource()); } - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; template<class Do> @@ -565,7 +564,7 @@ namespace Trinity Do& i_do; PlayerDistWorker(WorldObject const* searcher, float _dist, Do& _do) - : i_searcher(searcher), i_dist(_dist), i_do(_do) {} + : i_searcher(searcher), i_dist(_dist), i_do(_do) { } void Visit(PlayerMapType &m) { @@ -574,7 +573,7 @@ namespace Trinity i_do(itr->GetSource()); } - template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} + template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) { } }; // CHECKS && DO classes @@ -584,7 +583,7 @@ namespace Trinity class AnyDeadUnitObjectInRangeCheck { public: - AnyDeadUnitObjectInRangeCheck(Unit* searchObj, float range) : i_searchObj(searchObj), i_range(range) {} + AnyDeadUnitObjectInRangeCheck(Unit* searchObj, float range) : i_searchObj(searchObj), i_range(range) { } bool operator()(Player* u); bool operator()(Corpse* u); bool operator()(Creature* u); @@ -599,7 +598,7 @@ namespace Trinity public: AnyDeadUnitSpellTargetInRangeCheck(Unit* searchObj, float range, SpellInfo const* spellInfo, SpellTargetCheckTypes check) : AnyDeadUnitObjectInRangeCheck(searchObj, range), i_spellInfo(spellInfo), i_check(searchObj, searchObj, spellInfo, check, NULL) - {} + { } bool operator()(Player* u); bool operator()(Corpse* u); bool operator()(Creature* u); @@ -614,11 +613,11 @@ namespace Trinity class RespawnDo { public: - RespawnDo() {} + RespawnDo() { } void operator()(Creature* u) const { u->Respawn(); } void operator()(GameObject* u) const { u->Respawn(); } - void operator()(WorldObject*) const {} - void operator()(Corpse*) const {} + void operator()(WorldObject*) const { } + void operator()(Corpse*) const { } }; // GameObject checks @@ -626,7 +625,7 @@ namespace Trinity class GameObjectFocusCheck { public: - GameObjectFocusCheck(Unit const* unit, uint32 focusId) : i_unit(unit), i_focusId(focusId) {} + GameObjectFocusCheck(Unit const* unit, uint32 focusId) : i_unit(unit), i_focusId(focusId) { } bool operator()(GameObject* go) const { if (go->GetGOInfo()->type != GAMEOBJECT_TYPE_SPELL_FOCUS) @@ -648,7 +647,7 @@ namespace Trinity class NearestGameObjectFishingHole { public: - NearestGameObjectFishingHole(WorldObject const& obj, float range) : i_obj(obj), i_range(range) {} + NearestGameObjectFishingHole(WorldObject const& obj, float range) : i_obj(obj), i_range(range) { } bool operator()(GameObject* go) { if (go->GetGOInfo()->type == GAMEOBJECT_TYPE_FISHINGHOLE && go->isSpawned() && i_obj.IsWithinDistInMap(go, i_range) && i_obj.IsWithinDistInMap(go, (float)go->GetGOInfo()->fishinghole.radius)) @@ -670,7 +669,7 @@ namespace Trinity class NearestGameObjectCheck { public: - NearestGameObjectCheck(WorldObject const& obj) : i_obj(obj), i_range(999) {} + NearestGameObjectCheck(WorldObject const& obj) : i_obj(obj), i_range(999) { } bool operator()(GameObject* go) { if (i_obj.IsWithinDistInMap(go, i_range)) @@ -693,7 +692,7 @@ namespace Trinity class NearestGameObjectEntryInObjectRangeCheck { public: - NearestGameObjectEntryInObjectRangeCheck(WorldObject const& obj, uint32 entry, float range) : i_obj(obj), i_entry(entry), i_range(range) {} + NearestGameObjectEntryInObjectRangeCheck(WorldObject const& obj, uint32 entry, float range) : i_obj(obj), i_entry(entry), i_range(range) { } bool operator()(GameObject* go) { if (go->GetEntry() == i_entry && i_obj.IsWithinDistInMap(go, i_range)) @@ -717,7 +716,7 @@ namespace Trinity class NearestGameObjectTypeInObjectRangeCheck { public: - NearestGameObjectTypeInObjectRangeCheck(WorldObject const& obj, GameobjectTypes type, float range) : i_obj(obj), i_type(type), i_range(range) {} + NearestGameObjectTypeInObjectRangeCheck(WorldObject const& obj, GameobjectTypes type, float range) : i_obj(obj), i_type(type), i_range(range) { } bool operator()(GameObject* go) { if (go->GetGoType() == i_type && i_obj.IsWithinDistInMap(go, i_range)) @@ -740,7 +739,7 @@ namespace Trinity class GameObjectWithDbGUIDCheck { public: - GameObjectWithDbGUIDCheck(WorldObject const& /*obj*/, uint32 db_guid) : i_db_guid(db_guid) {} + GameObjectWithDbGUIDCheck(WorldObject const& /*obj*/, uint32 db_guid) : i_db_guid(db_guid) { } bool operator()(GameObject const* go) const { return go->GetDBTableGUIDLow() == i_db_guid; @@ -754,7 +753,7 @@ namespace Trinity class MostHPMissingInRange { public: - MostHPMissingInRange(Unit const* obj, float range, uint32 hp) : i_obj(obj), i_range(range), i_hp(hp) {} + MostHPMissingInRange(Unit const* obj, float range, uint32 hp) : i_obj(obj), i_range(range), i_hp(hp) { } bool operator()(Unit* u) { if (u->IsAlive() && u->IsInCombat() && !i_obj->IsHostileTo(u) && i_obj->IsWithinDistInMap(u, i_range) && u->GetMaxHealth() - u->GetHealth() > i_hp) @@ -773,7 +772,7 @@ namespace Trinity class FriendlyCCedInRange { public: - FriendlyCCedInRange(Unit const* obj, float range) : i_obj(obj), i_range(range) {} + FriendlyCCedInRange(Unit const* obj, float range) : i_obj(obj), i_range(range) { } bool operator()(Unit* u) { if (u->IsAlive() && u->IsInCombat() && !i_obj->IsHostileTo(u) && i_obj->IsWithinDistInMap(u, i_range) && @@ -791,7 +790,7 @@ namespace Trinity class FriendlyMissingBuffInRange { public: - FriendlyMissingBuffInRange(Unit const* obj, float range, uint32 spellid) : i_obj(obj), i_range(range), i_spell(spellid) {} + FriendlyMissingBuffInRange(Unit const* obj, float range, uint32 spellid) : i_obj(obj), i_range(range), i_spell(spellid) { } bool operator()(Unit* u) { if (u->IsAlive() && u->IsInCombat() && !i_obj->IsHostileTo(u) && i_obj->IsWithinDistInMap(u, i_range) && @@ -810,7 +809,7 @@ namespace Trinity class AnyUnfriendlyUnitInObjectRangeCheck { public: - AnyUnfriendlyUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) : i_obj(obj), i_funit(funit), i_range(range) {} + AnyUnfriendlyUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) : i_obj(obj), i_funit(funit), i_range(range) { } bool operator()(Unit* u) { if (u->IsAlive() && i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u)) @@ -827,7 +826,7 @@ namespace Trinity class AnyUnfriendlyNoTotemUnitInObjectRangeCheck { public: - AnyUnfriendlyNoTotemUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) : i_obj(obj), i_funit(funit), i_range(range) {} + AnyUnfriendlyNoTotemUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) : i_obj(obj), i_funit(funit), i_range(range) { } bool operator()(Unit* u) { if (!u->IsAlive()) @@ -854,7 +853,7 @@ namespace Trinity { public: AnyUnfriendlyAttackableVisibleUnitInObjectRangeCheck(Unit const* funit, float range) - : i_funit(funit), i_range(range) {} + : i_funit(funit), i_range(range) { } bool operator()(const Unit* u) { @@ -873,7 +872,7 @@ namespace Trinity class CreatureWithDbGUIDCheck { public: - CreatureWithDbGUIDCheck(WorldObject const* /*obj*/, uint32 lowguid) : i_lowguid(lowguid) {} + CreatureWithDbGUIDCheck(WorldObject const* /*obj*/, uint32 lowguid) : i_lowguid(lowguid) { } bool operator()(Creature* u) { return u->GetDBTableGUIDLow() == i_lowguid; @@ -885,7 +884,7 @@ namespace Trinity class AnyFriendlyUnitInObjectRangeCheck { public: - AnyFriendlyUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range, bool playerOnly = false) : i_obj(obj), i_funit(funit), i_range(range), i_playerOnly(playerOnly) {} + AnyFriendlyUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range, bool playerOnly = false) : i_obj(obj), i_funit(funit), i_range(range), i_playerOnly(playerOnly) { } bool operator()(Unit* u) { if (u->IsAlive() && i_obj->IsWithinDistInMap(u, i_range) && i_funit->IsFriendlyTo(u) && (!i_playerOnly || u->GetTypeId() == TYPEID_PLAYER)) @@ -903,7 +902,7 @@ namespace Trinity class AnyGroupedUnitInObjectRangeCheck { public: - AnyGroupedUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range, bool raid) : _source(obj), _refUnit(funit), _range(range), _raid(raid) {} + AnyGroupedUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range, bool raid) : _source(obj), _refUnit(funit), _range(range), _raid(raid) { } bool operator()(Unit* u) { if (G3D::fuzzyEq(_range, 0)) @@ -930,7 +929,7 @@ namespace Trinity class AnyUnitInObjectRangeCheck { public: - AnyUnitInObjectRangeCheck(WorldObject const* obj, float range) : i_obj(obj), i_range(range) {} + AnyUnitInObjectRangeCheck(WorldObject const* obj, float range) : i_obj(obj), i_range(range) { } bool operator()(Unit* u) { if (u->IsAlive() && i_obj->IsWithinDistInMap(u, i_range)) @@ -947,7 +946,7 @@ namespace Trinity class NearestAttackableUnitInObjectRangeCheck { public: - NearestAttackableUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) : i_obj(obj), i_funit(funit), i_range(range) {} + NearestAttackableUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) : i_obj(obj), i_funit(funit), i_range(range) { } bool operator()(Unit* u) { if (u->isTargetableForAttack() && i_obj->IsWithinDistInMap(u, i_range) && @@ -1007,7 +1006,7 @@ namespace Trinity public: CallOfHelpCreatureInRangeDo(Unit* funit, Unit* enemy, float range) : i_funit(funit), i_enemy(enemy), i_range(range) - {} + { } void operator()(Creature* u) { if (u == i_funit) @@ -1175,7 +1174,7 @@ namespace Trinity { public: NearestAssistCreatureInCreatureRangeCheck(Creature* obj, Unit* enemy, float range) - : i_obj(obj), i_enemy(enemy), i_range(range) {} + : i_obj(obj), i_enemy(enemy), i_range(range) { } bool operator()(Creature* u) { @@ -1208,7 +1207,7 @@ namespace Trinity { public: NearestCreatureEntryWithLiveStateInObjectRangeCheck(WorldObject const& obj, uint32 entry, bool alive, float range) - : i_obj(obj), i_entry(entry), i_alive(alive), i_range(range) {} + : i_obj(obj), i_entry(entry), i_alive(alive), i_range(range) { } bool operator()(Creature* u) { @@ -1233,7 +1232,7 @@ namespace Trinity class AnyPlayerInObjectRangeCheck { public: - AnyPlayerInObjectRangeCheck(WorldObject const* obj, float range, bool reqAlive = true) : _obj(obj), _range(range), _reqAlive(reqAlive) {} + AnyPlayerInObjectRangeCheck(WorldObject const* obj, float range, bool reqAlive = true) : _obj(obj), _range(range), _reqAlive(reqAlive) { } bool operator()(Player* u) { if (_reqAlive && !u->IsAlive()) @@ -1278,7 +1277,7 @@ namespace Trinity class AllFriendlyCreaturesInGrid { public: - AllFriendlyCreaturesInGrid(Unit const* obj) : unit(obj) {} + AllFriendlyCreaturesInGrid(Unit const* obj) : unit(obj) { } bool operator() (Unit* u) { if (u->IsAlive() && u->IsVisible() && u->IsFriendlyTo(unit)) @@ -1293,7 +1292,7 @@ namespace Trinity class AllGameObjectsWithEntryInRange { public: - AllGameObjectsWithEntryInRange(const WorldObject* object, uint32 entry, float maxRange) : m_pObject(object), m_uiEntry(entry), m_fRange(maxRange) {} + AllGameObjectsWithEntryInRange(const WorldObject* object, uint32 entry, float maxRange) : m_pObject(object), m_uiEntry(entry), m_fRange(maxRange) { } bool operator() (GameObject* go) { if (go->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(go, m_fRange, false)) @@ -1310,7 +1309,7 @@ namespace Trinity class AllCreaturesOfEntryInRange { public: - AllCreaturesOfEntryInRange(const WorldObject* object, uint32 entry, float maxRange) : m_pObject(object), m_uiEntry(entry), m_fRange(maxRange) {} + AllCreaturesOfEntryInRange(const WorldObject* object, uint32 entry, float maxRange) : m_pObject(object), m_uiEntry(entry), m_fRange(maxRange) { } bool operator() (Unit* unit) { if (unit->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(unit, m_fRange, false)) @@ -1328,7 +1327,7 @@ namespace Trinity class PlayerAtMinimumRangeAway { public: - PlayerAtMinimumRangeAway(Unit const* unit, float fMinRange) : unit(unit), fRange(fMinRange) {} + PlayerAtMinimumRangeAway(Unit const* unit, float fMinRange) : unit(unit), fRange(fMinRange) { } bool operator() (Player* player) { //No threat list check, must be done explicit if expected to be in combat with creature @@ -1347,7 +1346,7 @@ namespace Trinity { public: GameObjectInRangeCheck(float _x, float _y, float _z, float _range, uint32 _entry = 0) : - x(_x), y(_y), z(_z), range(_range), entry(_entry) {} + x(_x), y(_y), z(_z), range(_range), entry(_entry) { } bool operator() (GameObject* go) { if (!entry || (go->GetGOInfo() && go->GetGOInfo()->entry == entry)) @@ -1362,7 +1361,7 @@ namespace Trinity class AllWorldObjectsInRange { public: - AllWorldObjectsInRange(const WorldObject* object, float maxRange) : m_pObject(object), m_fRange(maxRange) {} + AllWorldObjectsInRange(const WorldObject* object, float maxRange) : m_pObject(object), m_fRange(maxRange) { } bool operator() (WorldObject* go) { return m_pObject->IsWithinDist(go, m_fRange, false) && m_pObject->InSamePhase(go); @@ -1375,7 +1374,7 @@ namespace Trinity class ObjectTypeIdCheck { public: - ObjectTypeIdCheck(TypeID typeId, bool equals) : _typeId(typeId), _equals(equals) {} + ObjectTypeIdCheck(TypeID typeId, bool equals) : _typeId(typeId), _equals(equals) { } bool operator()(WorldObject* object) { return (object->GetTypeId() == _typeId) == _equals; @@ -1389,7 +1388,7 @@ namespace Trinity class ObjectGUIDCheck { public: - ObjectGUIDCheck(uint64 GUID) : _GUID(GUID) {} + ObjectGUIDCheck(uint64 GUID) : _GUID(GUID) { } bool operator()(WorldObject* object) { return object->GetGUID() == _GUID; @@ -1421,7 +1420,7 @@ namespace Trinity class UnitAuraCheck { public: - UnitAuraCheck(bool present, uint32 spellId, uint64 casterGUID = 0) : _present(present), _spellId(spellId), _casterGUID(casterGUID) {} + UnitAuraCheck(bool present, uint32 spellId, uint64 casterGUID = 0) : _present(present), _spellId(spellId), _casterGUID(casterGUID) { } bool operator()(Unit* unit) const { return unit->HasAura(_spellId, _casterGUID) == _present; @@ -1445,7 +1444,7 @@ namespace Trinity class LocalizedPacketDo { public: - explicit LocalizedPacketDo(Builder& builder) : i_builder(builder) {} + explicit LocalizedPacketDo(Builder& builder) : i_builder(builder) { } ~LocalizedPacketDo() { @@ -1465,7 +1464,7 @@ namespace Trinity { public: typedef std::vector<WorldPacket*> WorldPacketList; - explicit LocalizedPacketListDo(Builder& builder) : i_builder(builder) {} + explicit LocalizedPacketListDo(Builder& builder) : i_builder(builder) { } ~LocalizedPacketListDo() { diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h index 3e71794a7e7..288d61aa3d5 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h +++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h @@ -38,13 +38,6 @@ inline void Trinity::VisibleNotifier::Visit(GridRefManager<T> &m) } } -inline void Trinity::ObjectUpdater::Visit(CreatureMapType &m) -{ - for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) - if (iter->GetSource()->IsInWorld()) - iter->GetSource()->Update(i_timeDiff); -} - // SEARCHERS & LIST SEARCHERS & WORKERS // WorldObject searchers & workers diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index c823f0df1cc..d85655ae24b 100644 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -65,7 +65,7 @@ class ObjectWorldLoader public: explicit ObjectWorldLoader(ObjectGridLoader& gloader) : i_cell(gloader.i_cell), i_map(gloader.i_map), i_corpses (0) - {} + { } void Visit(CorpseMapType &m); @@ -78,9 +78,7 @@ class ObjectWorldLoader uint32 i_corpses; }; -template<class T> void ObjectGridLoader::SetObjectCell(T* /*obj*/, CellCoord const& /*cellCoord*/) -{ -} +template<class T> void ObjectGridLoader::SetObjectCell(T* /*obj*/, CellCoord const& /*cellCoord*/) { } template<> void ObjectGridLoader::SetObjectCell(Creature* obj, CellCoord const& cellCoord) { diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h index dafc3954939..8369600c6e1 100644 --- a/src/server/game/Grids/ObjectGridLoader.h +++ b/src/server/game/Grids/ObjectGridLoader.h @@ -34,13 +34,13 @@ class ObjectGridLoader public: ObjectGridLoader(NGridType &grid, Map* map, const Cell &cell) : i_cell(cell), i_grid(grid), i_map(map), i_gameObjects(0), i_creatures(0), i_corpses (0) - {} + { } void Visit(GameObjectMapType &m); void Visit(CreatureMapType &m); - void Visit(CorpseMapType &) const {} - void Visit(DynamicObjectMapType&) const {} - void Visit(AreaTriggerMapType &) const {} + void Visit(CorpseMapType &) const { } + void Visit(DynamicObjectMapType&) const { } + void Visit(AreaTriggerMapType &) const { } void LoadN(void); @@ -60,7 +60,7 @@ class ObjectGridStoper { public: void Visit(CreatureMapType &m); - template<class T> void Visit(GridRefManager<T> &) {} + template<class T> void Visit(GridRefManager<T> &) { } }; //Move the foreign creatures back to respawn positions before unloading the NGrid @@ -69,7 +69,7 @@ class ObjectGridEvacuator public: void Visit(CreatureMapType &m); void Visit(GameObjectMapType &m); - template<class T> void Visit(GridRefManager<T> &) {} + template<class T> void Visit(GridRefManager<T> &) { } }; //Clean up and remove from world diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index c7bc229f4a9..144b4ddffa0 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -39,13 +39,9 @@ Roll::Roll(uint64 _guid, LootItem const& li) : itemGUID(_guid), itemid(li.itemid), itemRandomPropId(li.randomPropertyId), itemRandomSuffix(li.randomSuffix), itemCount(li.count), totalPlayersRolling(0), totalNeed(0), totalGreed(0), totalPass(0), itemSlot(0), -rollVoteMask(ROLL_ALL_TYPE_NO_DISENCHANT) -{ -} +rollVoteMask(ROLL_ALL_TYPE_NO_DISENCHANT) { } -Roll::~Roll() -{ -} +Roll::~Roll() { } void Roll::setLoot(Loot* pLoot) { diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index 8bc52e158c7..b82fc7b9bb5 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -156,7 +156,7 @@ struct InstanceGroupBind bool perm; /* permanent InstanceGroupBinds exist if the leader has a permanent PlayerInstanceBind for the same instance. */ - InstanceGroupBind() : save(NULL), perm(false) {} + InstanceGroupBind() : save(NULL), perm(false) { } }; /** request member stats checken **/ diff --git a/src/server/game/Groups/GroupReference.h b/src/server/game/Groups/GroupReference.h index 6c68710aeb5..6e323eefa27 100644 --- a/src/server/game/Groups/GroupReference.h +++ b/src/server/game/Groups/GroupReference.h @@ -32,7 +32,7 @@ class GroupReference : public Reference<Group, Player> void targetObjectDestroyLink(); void sourceObjectDestroyLink(); public: - GroupReference() : Reference<Group, Player>(), iSubGroup(0) {} + GroupReference() : Reference<Group, Player>(), iSubGroup(0) { } ~GroupReference() { unlink(); } GroupReference* next() { return (GroupReference*)Reference<Group, Player>::next(); } GroupReference const* next() const { return (GroupReference const*)Reference<Group, Player>::next(); } diff --git a/src/server/game/Handlers/AddonHandler.cpp b/src/server/game/Handlers/AddonHandler.cpp index 7110768cf1f..31404113eca 100644 --- a/src/server/game/Handlers/AddonHandler.cpp +++ b/src/server/game/Handlers/AddonHandler.cpp @@ -22,13 +22,9 @@ #include "Opcodes.h" #include "Log.h" -AddonHandler::AddonHandler() -{ -} +AddonHandler::AddonHandler() { } -AddonHandler::~AddonHandler() -{ -} +AddonHandler::~AddonHandler() { } bool AddonHandler::BuildAddonPacket(WorldPacket* source, WorldPacket* target) { diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index d145c3359e2..fa8731946e7 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -676,7 +676,7 @@ namespace Trinity { public: EmoteChatBuilder(Player const& player, uint32 text_emote, uint32 emote_num, Unit const* target) - : i_player(player), i_text_emote(text_emote), i_emote_num(emote_num), i_target(target) {} + : i_player(player), i_text_emote(text_emote), i_emote_num(emote_num), i_target(target) { } void operator()(WorldPacket& data, LocaleConstant loc_idx) { diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index c11467db7b6..4d8b162ece4 100644 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -521,9 +521,7 @@ void WorldSession::HandlePetCancelAuraOpcode(WorldPacket& recvPacket) pet->AddCreatureSpellCooldown(spellId); } -void WorldSession::HandleCancelGrowthAuraOpcode(WorldPacket& /*recvPacket*/) -{ -} +void WorldSession::HandleCancelGrowthAuraOpcode(WorldPacket& /*recvPacket*/) { } void WorldSession::HandleCancelAutoRepeatSpellOpcode(WorldPacket& /*recvPacket*/) { diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index d7ffb70ccfa..d552f822f0a 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -163,9 +163,7 @@ void InstanceSaveManager::RemoveInstanceSave(uint32 InstanceId) InstanceSave::InstanceSave(uint16 MapId, uint32 InstanceId, Difficulty difficulty, time_t resetTime, bool canReset) : m_resetTime(resetTime), m_instanceid(InstanceId), m_mapid(MapId), - m_difficulty(difficulty), m_canReset(canReset), m_toDelete(false) -{ -} + m_difficulty(difficulty), m_canReset(canReset), m_toDelete(false) { } InstanceSave::~InstanceSave() { diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h index e3717a934c3..5dda4eb620e 100644 --- a/src/server/game/Instances/InstanceSaveMgr.h +++ b/src/server/game/Instances/InstanceSaveMgr.h @@ -148,7 +148,7 @@ class InstanceSaveManager friend class InstanceSave; private: - InstanceSaveManager() : lock_instLists(false) {}; + InstanceSaveManager() : lock_instLists(false) { }; ~InstanceSaveManager(); public: @@ -163,9 +163,9 @@ class InstanceSaveManager uint16 mapid; uint16 instanceId; - InstResetEvent() : type(0), difficulty(DUNGEON_DIFFICULTY_NORMAL), mapid(0), instanceId(0) {} + InstResetEvent() : type(0), difficulty(DUNGEON_DIFFICULTY_NORMAL), mapid(0), instanceId(0) { } InstResetEvent(uint8 t, uint32 _mapid, Difficulty d, uint16 _instanceid) - : type(t), difficulty(d), mapid(_mapid), instanceId(_instanceid) {} + : type(t), difficulty(d), mapid(_mapid), instanceId(_instanceid) { } bool operator == (const InstResetEvent& e) const { return e.instanceId == instanceId; } }; typedef std::multimap<time_t /*resetTime*/, InstResetEvent> ResetTimeQueue; diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index 44c149ba9ac..e53a9c3c5c4 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -104,7 +104,7 @@ struct MinionData struct BossInfo { - BossInfo() : state(TO_BE_DECIDED) {} + BossInfo() : state(TO_BE_DECIDED) { } EncounterState state; DoorSet door[MAX_DOOR_TYPES]; MinionSet minion; @@ -114,7 +114,7 @@ struct BossInfo struct DoorInfo { explicit DoorInfo(BossInfo* _bossInfo, DoorType _type, BoundaryType _boundary) - : bossInfo(_bossInfo), type(_type), boundary(_boundary) {} + : bossInfo(_bossInfo), type(_type), boundary(_boundary) { } BossInfo* bossInfo; DoorType type; BoundaryType boundary; @@ -122,7 +122,7 @@ struct DoorInfo struct MinionInfo { - explicit MinionInfo(BossInfo* _bossInfo) : bossInfo(_bossInfo) {} + explicit MinionInfo(BossInfo* _bossInfo) : bossInfo(_bossInfo) { } BossInfo* bossInfo; }; @@ -134,14 +134,14 @@ typedef std::map<uint32 /*entry*/, MinionInfo> MinionInfoMap; class InstanceScript : public ZoneScript { public: - explicit InstanceScript(Map* map) : instance(map), completedEncounters(0) {} + explicit InstanceScript(Map* map) : instance(map), completedEncounters(0) { } - virtual ~InstanceScript() {} + virtual ~InstanceScript() { } Map* instance; //On creation, NOT load. - virtual void Initialize() {} + virtual void Initialize() { } //On load virtual void Load(char const* data) { LoadBossState(data); } @@ -151,14 +151,14 @@ class InstanceScript : public ZoneScript void SaveToDB(); - virtual void Update(uint32 /*diff*/) {} + virtual void Update(uint32 /*diff*/) { } //Used by the map's CanEnter function. //This is to prevent players from entering during boss encounters. virtual bool IsEncounterInProgress() const; //Called when a player successfully enters the instance. - virtual void OnPlayerEnter(Player* /*player*/) {} + virtual void OnPlayerEnter(Player* /*player*/) { } //Handle open / close objects //use HandleGameObject(0, boolen, GO); in OnObjectCreate in instance scripts @@ -215,7 +215,7 @@ class InstanceScript : public ZoneScript void SendEncounterUnit(uint32 type, Unit* unit = NULL, uint8 param1 = 0, uint8 param2 = 0); - virtual void FillInitialWorldStates(WorldPacket& /*data*/) {} + virtual void FillInitialWorldStates(WorldPacket& /*data*/) { } // ReCheck PhaseTemplate related conditions void UpdatePhasing(); diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index c2f74aab701..895d09fe7ad 100644 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -117,7 +117,7 @@ struct LootStoreItem LootStoreItem(uint32 _itemid, float _chanceOrQuestChance, uint16 _lootmode, uint8 _group, int32 _mincountOrRef, uint8 _maxcount) : itemid(_itemid), chance(fabs(_chanceOrQuestChance)), mincountOrRef(_mincountOrRef), lootmode(_lootmode), group(_group), needs_quest(_chanceOrQuestChance < 0), maxcount(_maxcount) - {} + { } bool Roll(bool rate) const; // Checks if the entry takes it's chance (at loot generation) bool IsValid(LootStore const& store, uint32 entry) const; @@ -148,7 +148,7 @@ struct LootItem explicit LootItem(LootStoreItem const& li); // Empty constructor for creating an empty LootItem to be filled in with DB data - LootItem() : canSave(true){}; + LootItem() : canSave(true){ }; // Basic checks for player/item compatibility - if false no chance to see the item in the loot bool AllowedForPlayer(Player const* player) const; @@ -162,10 +162,10 @@ struct QuestItem bool is_looted; QuestItem() - : index(0), is_looted(false) {} + : index(0), is_looted(false) { } QuestItem(uint8 _index, bool _islooted = false) - : index(_index), is_looted(_islooted) {} + : index(_index), is_looted(_islooted) { } }; struct Loot; @@ -183,7 +183,7 @@ class LootStore { public: explicit LootStore(char const* name, char const* entryName, bool ratesAllowed) - : m_name(name), m_entryName(entryName), m_ratesAllowed(ratesAllowed) {} + : m_name(name), m_entryName(entryName), m_ratesAllowed(ratesAllowed) { } virtual ~LootStore() { Clear(); } @@ -256,9 +256,9 @@ class LootTemplate class LootValidatorRef : public Reference<Loot, LootValidatorRef> { public: - LootValidatorRef() {} - void targetObjectDestroyLink() {} - void sourceObjectDestroyLink() {} + LootValidatorRef() { } + void targetObjectDestroyLink() { } + void sourceObjectDestroyLink() { } }; //===================================================== @@ -303,7 +303,7 @@ struct Loot // Only set for inventory items that can be right-click looted uint32 containerID; - Loot(uint32 _gold = 0) : gold(_gold), unlootedCount(0), loot_type(LOOT_CORPSE), maxDuplicates(1), containerID(0) {} + Loot(uint32 _gold = 0) : gold(_gold), unlootedCount(0), loot_type(LOOT_CORPSE), maxDuplicates(1), containerID(0) { } ~Loot() { clear(); } // For deleting items at loot removal since there is no backward interface to the Item() @@ -381,7 +381,7 @@ struct LootView Player* viewer; PermissionTypes permission; LootView(Loot &_loot, Player* _viewer, PermissionTypes _permission = ALL_PERMISSION) - : loot(_loot), viewer(_viewer), permission(_permission) {} + : loot(_loot), viewer(_viewer), permission(_permission) { } }; extern LootStore LootTemplates_Creature; diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index 2fa0a03e63f..fd4bcbd5dc0 100644 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -62,9 +62,7 @@ MailSender::MailSender(CalendarEvent* sender) } MailSender::MailSender(AuctionEntry* sender) - : m_messageType(MAIL_AUCTION), m_senderId(sender->GetHouseId()), m_stationery(MAIL_STATIONERY_AUCTION) -{ -} + : m_messageType(MAIL_AUCTION), m_senderId(sender->GetHouseId()), m_stationery(MAIL_STATIONERY_AUCTION) { } MailSender::MailSender(Player* sender) { @@ -73,9 +71,7 @@ MailSender::MailSender(Player* sender) m_senderId = sender->GetGUIDLow(); } -MailReceiver::MailReceiver(Player* receiver) : m_receiver(receiver), m_receiver_lowguid(receiver->GetGUIDLow()) -{ -} +MailReceiver::MailReceiver(Player* receiver) : m_receiver(receiver), m_receiver_lowguid(receiver->GetGUIDLow()) { } MailReceiver::MailReceiver(Player* receiver, uint32 receiver_lowguid) : m_receiver(receiver), m_receiver_lowguid(receiver_lowguid) { diff --git a/src/server/game/Mails/Mail.h b/src/server/game/Mails/Mail.h index a53694841ee..35e94ce2111 100644 --- a/src/server/game/Mails/Mail.h +++ b/src/server/game/Mails/Mail.h @@ -102,7 +102,7 @@ class MailSender class MailReceiver { public: // Constructors - explicit MailReceiver(uint32 receiver_lowguid) : m_receiver(NULL), m_receiver_lowguid(receiver_lowguid) {} + explicit MailReceiver(uint32 receiver_lowguid) : m_receiver(NULL), m_receiver_lowguid(receiver_lowguid) { } MailReceiver(Player* receiver); MailReceiver(Player* receiver, uint32 receiver_lowguid); public: // Accessors @@ -120,9 +120,9 @@ class MailDraft public: // Constructors explicit MailDraft(uint16 mailTemplateId, bool need_items = true) : m_mailTemplateId(mailTemplateId), m_mailTemplateItemsNeed(need_items), m_money(0), m_COD(0) - {} + { } MailDraft(std::string const& subject, std::string const& body) - : m_mailTemplateId(0), m_mailTemplateItemsNeed(false), m_subject(subject), m_body(body), m_money(0), m_COD(0) {} + : m_mailTemplateId(0), m_mailTemplateItemsNeed(false), m_subject(subject), m_body(body), m_money(0), m_COD(0) { } public: // Accessors uint16 GetMailTemplateId() const { return m_mailTemplateId; } std::string const& GetSubject() const { return m_subject; } diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 7e165564583..dc7b3b82ea3 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -295,9 +295,7 @@ void Map::AddToGrid(GameObject* obj, Cell const& cell) } template<class T> -void Map::SwitchGridContainers(T* /*obj*/, bool /*on*/) -{ -} +void Map::SwitchGridContainers(T* /*obj*/, bool /*on*/) { } template<> void Map::SwitchGridContainers(Creature* obj, bool on) @@ -492,9 +490,7 @@ bool Map::AddPlayerToMap(Player* player) } template<class T> -void Map::InitializeObject(T* /*obj*/) -{ -} +void Map::InitializeObject(T* /*obj*/) { } template<> void Map::InitializeObject(Creature* obj) @@ -693,7 +689,7 @@ struct ResetNotifier for (typename GridRefManager<T>::iterator iter=m.begin(); iter != m.end(); ++iter) iter->GetSource()->ResetAllNotifies(); } - template<class T> void Visit(GridRefManager<T> &) {} + template<class T> void Visit(GridRefManager<T> &) { } void Visit(CreatureMapType &m) { resetNotify<Creature>(m);} void Visit(PlayerMapType &m) { resetNotify<Player>(m);} }; @@ -2430,8 +2426,20 @@ void Map::RemoveAllObjectsInRemoveList() bool on = itr->second; i_objectsToSwitch.erase(itr); - if ((obj->GetTypeId() == TYPEID_UNIT || obj->GetTypeId() == TYPEID_GAMEOBJECT) && !obj->IsPermanentWorldObject()) - SwitchGridContainers(obj, on); + if (!obj->IsPermanentWorldObject()) + { + switch (obj->GetTypeId()) + { + case TYPEID_UNIT: + SwitchGridContainers<Creature>(obj->ToCreature(), on); + break; + case TYPEID_GAMEOBJECT: + SwitchGridContainers<GameObject>(obj->ToGameObject(), on); + break; + default: + break; + } + } } //TC_LOG_DEBUG(LOG_FILTER_MAPS, "Object remover 1 check."); @@ -2564,9 +2572,7 @@ void Map::AddToActive(DynamicObject* d) } template<class T> -void Map::RemoveFromActive(T* /*obj*/) -{ -} +void Map::RemoveFromActive(T* /*obj*/) { } template <> void Map::RemoveFromActive(Creature* c) diff --git a/src/server/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h index 06a5f3e04a5..0955acc1432 100644 --- a/src/server/game/Maps/MapInstanced.h +++ b/src/server/game/Maps/MapInstanced.h @@ -30,7 +30,7 @@ class MapInstanced : public Map typedef UNORDERED_MAP< uint32, Map*> InstancedMaps; MapInstanced(uint32 id, time_t expiry); - ~MapInstanced() {} + ~MapInstanced() { } // functions overwrite Map versions void Update(const uint32); diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index 9f960c4d4bb..45a860a0622 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -45,9 +45,7 @@ MapManager::MapManager() i_timer.SetInterval(sWorld->getIntConfig(CONFIG_INTERVAL_MAPUPDATE)); } -MapManager::~MapManager() -{ -} +MapManager::~MapManager() { } void MapManager::Initialize() { @@ -296,9 +294,7 @@ void MapManager::Update(uint32 diff) i_timer.SetCurrent(0); } -void MapManager::DoDelayedMovesAndRemoves() -{ -} +void MapManager::DoDelayedMovesAndRemoves() { } bool MapManager::ExistMapAndVMap(uint32 mapid, float x, float y) { diff --git a/src/server/game/Maps/MapReference.h b/src/server/game/Maps/MapReference.h index f2f35e0955e..25c4b3870c5 100644 --- a/src/server/game/Maps/MapReference.h +++ b/src/server/game/Maps/MapReference.h @@ -42,7 +42,7 @@ class MapReference : public Reference<Map, Player> getTarget()->m_mapRefManager.decSize(); } public: - MapReference() : Reference<Map, Player>() {} + MapReference() : Reference<Map, Player>() { } ~MapReference() { unlink(); } MapReference* next() { return (MapReference*)Reference<Map, Player>::next(); } MapReference const* next() const { return (MapReference const*)Reference<Map, Player>::next(); } diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp index 5e5f520505c..f3a5a66bf66 100644 --- a/src/server/game/Maps/MapUpdater.cpp +++ b/src/server/game/Maps/MapUpdater.cpp @@ -58,9 +58,7 @@ class MapUpdateRequest : public ACE_Method_Request }; MapUpdater::MapUpdater(): -m_executor(), m_mutex(), m_condition(m_mutex), pending_requests(0) -{ -} +m_executor(), m_mutex(), m_condition(m_mutex), pending_requests(0) { } MapUpdater::~MapUpdater() { diff --git a/src/server/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp index fe49be5607d..c0da12c5614 100644 --- a/src/server/game/Maps/TransportMgr.cpp +++ b/src/server/game/Maps/TransportMgr.cpp @@ -32,13 +32,9 @@ TransportTemplate::~TransportTemplate() delete *itr; } -TransportMgr::TransportMgr() -{ -} +TransportMgr::TransportMgr() { } -TransportMgr::~TransportMgr() -{ -} +TransportMgr::~TransportMgr() { } void TransportMgr::Unload() { diff --git a/src/server/game/Maps/ZoneScript.h b/src/server/game/Maps/ZoneScript.h index ce7168a4040..a745b94f466 100644 --- a/src/server/game/Maps/ZoneScript.h +++ b/src/server/game/Maps/ZoneScript.h @@ -26,8 +26,8 @@ class GameObject; class ZoneScript { public: - ZoneScript() {} - virtual ~ZoneScript() {} + ZoneScript() { } + virtual ~ZoneScript() { } virtual uint32 GetCreatureEntry(uint32 /*guidlow*/, CreatureData const* data) { return data->id; } virtual uint32 GetGameObjectEntry(uint32 /*guidlow*/, uint32 entry) { return entry; } @@ -42,13 +42,13 @@ class ZoneScript //All-purpose data storage 64 bit virtual uint64 GetData64(uint32 /*DataId*/) const { return 0; } - virtual void SetData64(uint32 /*DataId*/, uint64 /*Value*/) {} + virtual void SetData64(uint32 /*DataId*/, uint64 /*Value*/) { } //All-purpose data storage 32 bit virtual uint32 GetData(uint32 /*DataId*/) const { return 0; } - virtual void SetData(uint32 /*DataId*/, uint32 /*Value*/) {} + virtual void SetData(uint32 /*DataId*/, uint32 /*Value*/) { } - virtual void ProcessEvent(WorldObject* /*obj*/, uint32 /*eventId*/) {} + virtual void ProcessEvent(WorldObject* /*obj*/, uint32 /*eventId*/) { } }; #endif diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index dc254d60012..ddca3a92fd8 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -4060,7 +4060,7 @@ struct MmapTileHeader bool usesLiquids : 1; MmapTileHeader() : mmapMagic(MMAP_MAGIC), dtVersion(DT_NAVMESH_VERSION), - mmapVersion(MMAP_VERSION), size(0), usesLiquids(true) {} + mmapVersion(MMAP_VERSION), size(0), usesLiquids(true) { } }; enum NavTerrain diff --git a/src/server/game/Movement/MovementGenerator.cpp b/src/server/game/Movement/MovementGenerator.cpp index 408614833bb..b102f554c2f 100644 --- a/src/server/game/Movement/MovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerator.cpp @@ -18,6 +18,4 @@ #include "MovementGenerator.h" -MovementGenerator::~MovementGenerator() -{ -} +MovementGenerator::~MovementGenerator() { } diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h index 39394a75513..92195037e23 100755 --- a/src/server/game/Movement/MovementGenerator.h +++ b/src/server/game/Movement/MovementGenerator.h @@ -79,13 +79,13 @@ class MovementGeneratorMedium : public MovementGenerator struct SelectableMovement : public FactoryHolder<MovementGenerator, MovementGeneratorType> { - SelectableMovement(MovementGeneratorType mgt) : FactoryHolder<MovementGenerator, MovementGeneratorType>(mgt) {} + SelectableMovement(MovementGeneratorType mgt) : FactoryHolder<MovementGenerator, MovementGeneratorType>(mgt) { } }; template<class REAL_MOVEMENT> struct MovementGeneratorFactory : public SelectableMovement { - MovementGeneratorFactory(MovementGeneratorType mgt) : SelectableMovement(mgt) {} + MovementGeneratorFactory(MovementGeneratorType mgt) : SelectableMovement(mgt) { } MovementGenerator* Create(void *) const; }; diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h index da29b8aa12e..1fa9465d6e8 100755 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h @@ -26,7 +26,7 @@ template<class T> class ConfusedMovementGenerator : public MovementGeneratorMedium< T, ConfusedMovementGenerator<T> > { public: - explicit ConfusedMovementGenerator() : i_nextMoveTime(0) {} + explicit ConfusedMovementGenerator() : i_nextMoveTime(0) { } void DoInitialize(T*); void DoFinalize(T*); diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h index 33a7c705564..b44bebdbfdf 100755 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h @@ -25,7 +25,7 @@ template<class T> class FleeingMovementGenerator : public MovementGeneratorMedium< T, FleeingMovementGenerator<T> > { public: - FleeingMovementGenerator(uint64 fright) : i_frightGUID(fright), i_nextCheckTime(0) {} + FleeingMovementGenerator(uint64 fright) : i_frightGUID(fright), i_nextCheckTime(0) { } void DoInitialize(T*); void DoFinalize(T*); @@ -47,7 +47,7 @@ class TimedFleeingMovementGenerator : public FleeingMovementGenerator<Creature> public: TimedFleeingMovementGenerator(uint64 fright, uint32 time) : FleeingMovementGenerator<Creature>(fright), - i_totalFleeTime(time) {} + i_totalFleeTime(time) { } MovementGeneratorType GetMovementGeneratorType() { return TIMED_FLEEING_MOTION_TYPE; } bool Update(Unit*, uint32); diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp index a94ef5d4f87..2d9fe4dd27f 100644 --- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp @@ -39,9 +39,7 @@ void HomeMovementGenerator<Creature>::DoFinalize(Creature* owner) } } -void HomeMovementGenerator<Creature>::DoReset(Creature*) -{ -} +void HomeMovementGenerator<Creature>::DoReset(Creature*) { } void HomeMovementGenerator<Creature>::_setTargetLocation(Creature* owner) { diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h index 3d6c6ab18c9..c5bf8879b7b 100644 --- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h @@ -31,8 +31,8 @@ class HomeMovementGenerator<Creature> : public MovementGeneratorMedium< Creature { public: - HomeMovementGenerator() : arrived(false) {} - ~HomeMovementGenerator() {} + HomeMovementGenerator() : arrived(false) { } + ~HomeMovementGenerator() { } void DoInitialize(Creature*); void DoFinalize(Creature*); diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h index 0043891db2c..3c5b9c6d20f 100755 --- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h @@ -37,7 +37,7 @@ extern IdleMovementGenerator si_idleMovement; class RotateMovementGenerator : public MovementGenerator { public: - explicit RotateMovementGenerator(uint32 time, RotateDirection direction) : m_duration(time), m_maxDuration(time), m_direction(direction) {} + explicit RotateMovementGenerator(uint32 time, RotateDirection direction) : m_duration(time), m_maxDuration(time), m_direction(direction) { } void Initialize(Unit*); void Finalize(Unit*); @@ -53,7 +53,7 @@ class RotateMovementGenerator : public MovementGenerator class DistractMovementGenerator : public MovementGenerator { public: - explicit DistractMovementGenerator(uint32 timer) : m_timer(timer) {} + explicit DistractMovementGenerator(uint32 timer) : m_timer(timer) { } void Initialize(Unit*); void Finalize(Unit*); @@ -69,7 +69,7 @@ class AssistanceDistractMovementGenerator : public DistractMovementGenerator { public: AssistanceDistractMovementGenerator(uint32 timer) : - DistractMovementGenerator(timer) {} + DistractMovementGenerator(timer) { } MovementGeneratorType GetMovementGeneratorType() { return ASSISTANCE_DISTRACT_MOTION_TYPE; } void Finalize(Unit*); diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp index 917872c5960..f4968b21bd8 100755 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp @@ -102,9 +102,7 @@ void PointMovementGenerator<T>::DoReset(T* unit) } template<class T> -void PointMovementGenerator<T>::MovementInform(T* /*unit*/) -{ -} +void PointMovementGenerator<T>::MovementInform(T* /*unit*/) { } template <> void PointMovementGenerator<Creature>::MovementInform(Creature* unit) { diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h index 421736ca4ec..35e4afacb1a 100644 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h @@ -27,7 +27,7 @@ class PointMovementGenerator : public MovementGeneratorMedium< T, PointMovementG { public: PointMovementGenerator(uint32 _id, float _x, float _y, float _z, bool _generatePath, float _speed = 0.0f) : id(_id), - i_x(_x), i_y(_y), i_z(_z), speed(_speed), m_generatePath(_generatePath), i_recalculateSpeed(false) {} + i_x(_x), i_y(_y), i_z(_z), speed(_speed), m_generatePath(_generatePath), i_recalculateSpeed(false) { } void DoInitialize(T*); void DoFinalize(T*); @@ -53,7 +53,7 @@ class AssistanceMovementGenerator : public PointMovementGenerator<Creature> { public: AssistanceMovementGenerator(float _x, float _y, float _z) : - PointMovementGenerator<Creature>(0, _x, _y, _z, true) {} + PointMovementGenerator<Creature>(0, _x, _y, _z, true) { } MovementGeneratorType GetMovementGeneratorType() { return ASSISTANCE_MOTION_TYPE; } void Finalize(Unit*); @@ -63,10 +63,10 @@ class AssistanceMovementGenerator : public PointMovementGenerator<Creature> class EffectMovementGenerator : public MovementGenerator { public: - explicit EffectMovementGenerator(uint32 Id) : m_Id(Id) {} - void Initialize(Unit*) {} + explicit EffectMovementGenerator(uint32 Id) : m_Id(Id) { } + void Initialize(Unit*) { } void Finalize(Unit*); - void Reset(Unit*) {} + void Reset(Unit*) { } bool Update(Unit*, uint32); MovementGeneratorType GetMovementGeneratorType() { return EFFECT_MOTION_TYPE; } private: diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h index a6159e995fe..ef2807a5f48 100644 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h @@ -25,7 +25,7 @@ template<class T> class RandomMovementGenerator : public MovementGeneratorMedium< T, RandomMovementGenerator<T> > { public: - RandomMovementGenerator(float spawn_dist = 0.0f) : i_nextMoveTime(0), wander_distance(spawn_dist) {} + RandomMovementGenerator(float spawn_dist = 0.0f) : i_nextMoveTime(0), wander_distance(spawn_dist) { } void _setRandomLocation(T*); void DoInitialize(T*); diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index f457443dc8c..f71eddd2f89 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -216,9 +216,7 @@ void ChaseMovementGenerator<T>::DoReset(T* owner) } template<class T> -void ChaseMovementGenerator<T>::MovementInform(T* /*unit*/) -{ -} +void ChaseMovementGenerator<T>::MovementInform(T* /*unit*/) { } template<> void ChaseMovementGenerator<Creature>::MovementInform(Creature* unit) @@ -290,9 +288,7 @@ void FollowMovementGenerator<T>::DoReset(T* owner) } template<class T> -void FollowMovementGenerator<T>::MovementInform(T* /*unit*/) -{ -} +void FollowMovementGenerator<T>::MovementInform(T* /*unit*/) { } template<> void FollowMovementGenerator<Creature>::MovementInform(Creature* unit) diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h index 14d0ab0ec66..6358aa19cde 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h @@ -68,10 +68,10 @@ class ChaseMovementGenerator : public TargetedMovementGeneratorMedium<T, ChaseMo { public: ChaseMovementGenerator(Unit* target) - : TargetedMovementGeneratorMedium<T, ChaseMovementGenerator<T> >(target) {} + : TargetedMovementGeneratorMedium<T, ChaseMovementGenerator<T> >(target) { } ChaseMovementGenerator(Unit* target, float offset, float angle) - : TargetedMovementGeneratorMedium<T, ChaseMovementGenerator<T> >(target, offset, angle) {} - ~ChaseMovementGenerator() {} + : TargetedMovementGeneratorMedium<T, ChaseMovementGenerator<T> >(target, offset, angle) { } + ~ChaseMovementGenerator() { } MovementGeneratorType GetMovementGeneratorType() { return CHASE_MOTION_TYPE; } @@ -92,10 +92,10 @@ class FollowMovementGenerator : public TargetedMovementGeneratorMedium<T, Follow { public: FollowMovementGenerator(Unit* target) - : TargetedMovementGeneratorMedium<T, FollowMovementGenerator<T> >(target){} + : TargetedMovementGeneratorMedium<T, FollowMovementGenerator<T> >(target){ } FollowMovementGenerator(Unit* target, float offset, float angle) - : TargetedMovementGeneratorMedium<T, FollowMovementGenerator<T> >(target, offset, angle) {} - ~FollowMovementGenerator() {} + : TargetedMovementGeneratorMedium<T, FollowMovementGenerator<T> >(target, offset, angle) { } + ~FollowMovementGenerator() { } MovementGeneratorType GetMovementGeneratorType() { return FOLLOW_MOTION_TYPE; } @@ -108,7 +108,7 @@ class FollowMovementGenerator : public TargetedMovementGeneratorMedium<T, Follow static void _addUnitStateMove(T* u) { u->AddUnitState(UNIT_STATE_FOLLOW_MOVE); } bool EnableWalking() const; bool _lostTarget(T*) const { return false; } - void _reachTarget(T*) {} + void _reachTarget(T*) { } private: void _updateSpeed(T* owner); }; diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h index 72650570e12..c22b0c5296f 100755 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h @@ -42,8 +42,8 @@ template<class T, class P> class PathMovementBase { public: - PathMovementBase() : i_path(NULL), i_currentNode(0) {} - virtual ~PathMovementBase() {}; + PathMovementBase() : i_path(NULL), i_currentNode(0) { } + virtual ~PathMovementBase() { }; // template pattern, not defined .. override required void LoadPath(T &); @@ -63,7 +63,7 @@ class WaypointMovementGenerator<Creature> : public MovementGeneratorMedium< Crea { public: WaypointMovementGenerator(uint32 _path_id = 0, bool _repeating = true) - : i_nextMoveTime(0), m_isArrivalDone(false), path_id(_path_id), repeating(_repeating) {} + : i_nextMoveTime(0), m_isArrivalDone(false), path_id(_path_id), repeating(_repeating) { } ~WaypointMovementGenerator() { i_path = NULL; } void DoInitialize(Creature*); void DoFinalize(Creature*); diff --git a/src/server/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp index 1a35271c8c6..9aafd52db37 100644 --- a/src/server/game/Movement/Spline/MoveSpline.cpp +++ b/src/server/game/Movement/Spline/MoveSpline.cpp @@ -92,7 +92,7 @@ inline uint32 computeDuration(float length, float velocity) struct FallInitializer { - FallInitializer(float _start_elevation) : start_elevation(_start_elevation) {} + FallInitializer(float _start_elevation) : start_elevation(_start_elevation) { } float start_elevation; inline int32 operator()(Spline<int32>& s, int32 i) { @@ -106,7 +106,7 @@ enum{ struct CommonInitializer { - CommonInitializer(float _velocity) : velocityInv(1000.f/_velocity), time(minimal_duration) {} + CommonInitializer(float _velocity) : velocityInv(1000.f/_velocity), time(minimal_duration) { } float velocityInv; int32 time; inline int32 operator()(Spline<int32>& s, int32 i) diff --git a/src/server/game/Movement/Spline/MoveSpline.h b/src/server/game/Movement/Spline/MoveSpline.h index 75ea89bee81..209f978d658 100644 --- a/src/server/game/Movement/Spline/MoveSpline.h +++ b/src/server/game/Movement/Spline/MoveSpline.h @@ -26,10 +26,10 @@ namespace Movement { struct Location : public Vector3 { - Location() : orientation(0) {} - Location(float x, float y, float z, float o) : Vector3(x, y, z), orientation(o) {} - Location(const Vector3& v) : Vector3(v), orientation(0) {} - Location(const Vector3& v, float o) : Vector3(v), orientation(o) {} + Location() : orientation(0) { } + Location(float x, float y, float z, float o) : Vector3(x, y, z), orientation(o) { } + Location(const Vector3& v) : Vector3(v), orientation(0) { } + Location(const Vector3& v, float o) : Vector3(v), orientation(o) { } float orientation; }; diff --git a/src/server/game/Movement/Spline/MoveSplineInitArgs.h b/src/server/game/Movement/Spline/MoveSplineInitArgs.h index 474541cbf15..12c22898b6d 100644 --- a/src/server/game/Movement/Spline/MoveSplineInitArgs.h +++ b/src/server/game/Movement/Spline/MoveSplineInitArgs.h @@ -36,9 +36,9 @@ namespace Movement uint64 target; float angle; - FacingInfo(float o) : angle(o) {} - FacingInfo(uint64 t) : target(t) {} - FacingInfo() {} + FacingInfo(float o) : angle(o) { } + FacingInfo(uint64 t) : target(t) { } + FacingInfo() { } }; struct MoveSplineInitArgs diff --git a/src/server/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h index d4b100ee46e..dab31e957f1 100644 --- a/src/server/game/Movement/Spline/Spline.h +++ b/src/server/game/Movement/Spline/Spline.h @@ -86,7 +86,7 @@ protected: public: - explicit SplineBase() : index_lo(0), index_hi(0), m_mode(UninitializedMode), cyclic(false) {} + explicit SplineBase() : index_lo(0), index_hi(0), m_mode(UninitializedMode), cyclic(false) { } /** Caclulates the position for given segment Idx, and percent of segment length t @param t - percent of segment length, assumes that t in range [0, 1] @@ -144,7 +144,7 @@ protected: index_type computeIndexInBounds(length_type length) const; public: - explicit Spline(){} + explicit Spline(){ } /** Calculates the position for given t @param t - percent of spline's length, assumes that t in range [0, 1]. */ diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp index 27df7b8a47f..406ac95322a 100644 --- a/src/server/game/Movement/Waypoints/WaypointManager.cpp +++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp @@ -22,9 +22,7 @@ #include "MapManager.h" #include "Log.h" -WaypointMgr::WaypointMgr() -{ -} +WaypointMgr::WaypointMgr() { } WaypointMgr::~WaypointMgr() { diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index 73b5399fa89..4d68e03a1c6 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -231,9 +231,7 @@ void OutdoorPvP::DeleteSpawns() m_capturePoints.clear(); } -OutdoorPvP::OutdoorPvP() : m_sendUpdate(true) -{ -} +OutdoorPvP::OutdoorPvP() : m_sendUpdate(true) { } OutdoorPvP::~OutdoorPvP() { @@ -257,9 +255,7 @@ void OutdoorPvP::HandlePlayerLeaveZone(Player* player, uint32 /*zone*/) TC_LOG_DEBUG(LOG_FILTER_OUTDOORPVP, "Player %s left an outdoorpvp zone", player->GetName().c_str()); } -void OutdoorPvP::HandlePlayerResurrects(Player* /*player*/, uint32 /*zone*/) -{ -} +void OutdoorPvP::HandlePlayerResurrects(Player* /*player*/, uint32 /*zone*/) { } bool OutdoorPvP::Update(uint32 diff) { diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h index 662e80eba7f..9371a7a3963 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.h +++ b/src/server/game/OutdoorPvP/OutdoorPvP.h @@ -92,9 +92,9 @@ class OPvPCapturePoint OPvPCapturePoint(OutdoorPvP* pvp); - virtual ~OPvPCapturePoint() {} + virtual ~OPvPCapturePoint() { } - virtual void FillInitialWorldStates(WorldPacket & /*data*/) {} + virtual void FillInitialWorldStates(WorldPacket & /*data*/) { } // send world state update to all players present void SendUpdateWorldState(uint32 field, uint32 value); @@ -118,7 +118,7 @@ class OPvPCapturePoint virtual void ChangeState() = 0; - virtual void ChangeTeam(TeamId /*oldTeam*/) {} + virtual void ChangeTeam(TeamId /*oldTeam*/) { } virtual void SendChangePhase(); @@ -204,7 +204,7 @@ class OutdoorPvP : public ZoneScript typedef std::map<uint32/*lowguid*/, OPvPCapturePoint*> OPvPCapturePointMap; - virtual void FillInitialWorldStates(WorldPacket & /*data*/) {} + virtual void FillInitialWorldStates(WorldPacket & /*data*/) { } // called when a player triggers an areatrigger virtual bool HandleAreaTrigger(Player* player, uint32 trigger); @@ -220,7 +220,7 @@ class OutdoorPvP : public ZoneScript void OnGameObjectCreate(GameObject* go); void OnGameObjectRemove(GameObject* go); - void OnCreatureCreate(Creature*) {} + void OnCreatureCreate(Creature*) { } // send world state update to all players present void SendUpdateWorldState(uint32 field, uint32 value); @@ -230,13 +230,13 @@ class OutdoorPvP : public ZoneScript // handle npc/player kill virtual void HandleKill(Player* killer, Unit* killed); - virtual void HandleKillImpl(Player* /*killer*/, Unit* /*killed*/) {} + virtual void HandleKillImpl(Player* /*killer*/, Unit* /*killed*/) { } // checks if player is in range of a capture credit marker bool IsInsideObjective(Player* player) const; // awards rewards for player kill - virtual void AwardKillBonus(Player* /*player*/) {} + virtual void AwardKillBonus(Player* /*player*/) { } uint32 GetTypeId() {return m_TypeId;} @@ -260,7 +260,7 @@ class OutdoorPvP : public ZoneScript bool m_sendUpdate; // world state stuff - virtual void SendRemoveWorldStates(Player* /*player*/) {} + virtual void SendRemoveWorldStates(Player* /*player*/) { } void BroadcastPacket(WorldPacket & data) const; diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h index 8a93987c878..2d8acb56252 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h +++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h @@ -42,7 +42,7 @@ class OutdoorPvPMgr private: OutdoorPvPMgr(); - ~OutdoorPvPMgr() {}; + ~OutdoorPvPMgr() { }; public: // create outdoor pvp events diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index 1ea2ff9894a..8cb0c8e6191 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -525,22 +525,16 @@ void PoolGroup<GameObject>::ReSpawn1Object(PoolObject* obj) // Nothing to do for a child Pool template <> -void PoolGroup<Pool>::ReSpawn1Object(PoolObject* /*obj*/) -{ -} +void PoolGroup<Pool>::ReSpawn1Object(PoolObject* /*obj*/) { } // Nothing to do for a quest template <> -void PoolGroup<Quest>::ReSpawn1Object(PoolObject* /*obj*/) -{ -} +void PoolGroup<Quest>::ReSpawn1Object(PoolObject* /*obj*/) { } //////////////////////////////////////////////////////////// // Methods of class PoolMgr -PoolMgr::PoolMgr() : max_pool_id(0) -{ -} +PoolMgr::PoolMgr() : max_pool_id(0) { } void PoolMgr::Initialize() { diff --git a/src/server/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h index 8a9b4a953dd..c5ded289215 100644 --- a/src/server/game/Pools/PoolMgr.h +++ b/src/server/game/Pools/PoolMgr.h @@ -34,7 +34,7 @@ struct PoolObject { uint32 guid; float chance; - PoolObject(uint32 _guid, float _chance): guid(_guid), chance(fabs(_chance)) {} + PoolObject(uint32 _guid, float _chance): guid(_guid), chance(fabs(_chance)) { } }; class Pool // for Pool of Pool case @@ -73,7 +73,7 @@ class PoolGroup public: explicit PoolGroup() : poolId(0) { } void SetPoolId(uint32 pool_id) { poolId = pool_id; } - ~PoolGroup() {}; + ~PoolGroup() { }; bool isEmpty() const { return ExplicitlyChanced.empty() && EqualChanced.empty(); } void AddEntry(PoolObject& poolitem, uint32 maxentries); bool CheckPool() const; @@ -108,7 +108,7 @@ class PoolMgr private: PoolMgr(); - ~PoolMgr() {}; + ~PoolMgr() { }; public: void LoadFromDB(); diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h index adc1df32f8a..e02cc5b62e0 100644 --- a/src/server/game/Reputation/ReputationMgr.h +++ b/src/server/game/Reputation/ReputationMgr.h @@ -65,8 +65,8 @@ class ReputationMgr { public: // constructors and global modifiers explicit ReputationMgr(Player* owner) : _player(owner), - _visibleFactionCount(0), _honoredFactionCount(0), _reveredFactionCount(0), _exaltedFactionCount(0), _sendFactionIncreased(false) {} - ~ReputationMgr() {} + _visibleFactionCount(0), _honoredFactionCount(0), _reveredFactionCount(0), _exaltedFactionCount(0), _sendFactionIncreased(false) { } + ~ReputationMgr() { } void SaveToDB(SQLTransaction& trans); void LoadFromDB(PreparedQueryResult result); diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index 0eb96bc52e9..b014ff85562 100644 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -270,7 +270,6 @@ void AddSC_ironforge(); void AddSC_isle_of_queldanas(); void AddSC_loch_modan(); void AddSC_redridge_mountains(); -void AddSC_silvermoon_city(); void AddSC_silverpine_forest(); void AddSC_stormwind_city(); void AddSC_stranglethorn_vale(); @@ -968,7 +967,6 @@ void AddEasternKingdomsScripts() AddSC_isle_of_queldanas(); AddSC_loch_modan(); AddSC_redridge_mountains(); - AddSC_silvermoon_city(); AddSC_silverpine_forest(); AddSC_stormwind_city(); AddSC_stranglethorn_vale(); diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index ef62af88fd6..b4fe3ef8640 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -176,13 +176,9 @@ struct TSpellSummary } *SpellSummary; ScriptMgr::ScriptMgr() - : _scriptCount(0), _scheduledScripts(0) -{ -} + : _scriptCount(0), _scheduledScripts(0) { } -ScriptMgr::~ScriptMgr() -{ -} +ScriptMgr::~ScriptMgr() { } void ScriptMgr::Initialize() { diff --git a/src/server/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h index 0641cebd18f..af2e50bae36 100644 --- a/src/server/game/Scripting/ScriptSystem.h +++ b/src/server/game/Scripting/ScriptSystem.h @@ -49,8 +49,8 @@ typedef std::vector<ScriptPointMove> ScriptPointVector; class SystemMgr { friend class ACE_Singleton<SystemMgr, ACE_Null_Mutex>; - SystemMgr() {} - ~SystemMgr() {} + SystemMgr() { } + ~SystemMgr() { } public: typedef UNORDERED_MAP<uint32, ScriptPointVector> PointMoveMap; diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 7b6389698f4..4954d099dab 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -89,7 +89,7 @@ enum AccountDataType struct AccountData { - AccountData() : Time(0), Data("") {} + AccountData() : Time(0), Data("") { } time_t Time; std::string Data; @@ -136,8 +136,8 @@ enum CharterTypes class PacketFilter { public: - explicit PacketFilter(WorldSession* pSession) : m_pSession(pSession) {} - virtual ~PacketFilter() {} + explicit PacketFilter(WorldSession* pSession) : m_pSession(pSession) { } + virtual ~PacketFilter() { } virtual bool Process(WorldPacket* /*packet*/) { return true; } virtual bool ProcessLogout() const { return true; } @@ -150,8 +150,8 @@ protected: class MapSessionFilter : public PacketFilter { public: - explicit MapSessionFilter(WorldSession* pSession) : PacketFilter(pSession) {} - ~MapSessionFilter() {} + explicit MapSessionFilter(WorldSession* pSession) : PacketFilter(pSession) { } + ~MapSessionFilter() { } virtual bool Process(WorldPacket* packet); //in Map::Update() we do not process player logout! @@ -163,8 +163,8 @@ public: class WorldSessionFilter : public PacketFilter { public: - explicit WorldSessionFilter(WorldSession* pSession) : PacketFilter(pSession) {} - ~WorldSessionFilter() {} + explicit WorldSessionFilter(WorldSession* pSession) : PacketFilter(pSession) { } + ~WorldSessionFilter() { } virtual bool Process(WorldPacket* packet); }; @@ -180,7 +180,7 @@ class CharacterCreateInfo CharacterCreateInfo(std::string const& name, uint8 race, uint8 cclass, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair, uint8 outfitId, WorldPacket& data) : Name(name), Race(race), Class(cclass), Gender(gender), Skin(skin), Face(face), HairStyle(hairStyle), HairColor(hairColor), FacialHair(facialHair), OutfitId(outfitId), Data(data), CharCount(0) - {} + { } /// User specified variables std::string Name; @@ -365,10 +365,10 @@ class WorldSession void ResetClientTimeDelay() { m_clientTimeDelay = 0; } uint32 getDialogStatus(Player* player, Object* questgiver, uint32 defstatus); - time_t m_timeOutTime; + ACE_Atomic_Op<ACE_Thread_Mutex, time_t> m_timeOutTime; void UpdateTimeOutTime(uint32 diff) { - if (time_t(diff) > m_timeOutTime) + if (time_t(diff) > m_timeOutTime.value()) m_timeOutTime = 0; else m_timeOutTime -= diff; @@ -978,7 +978,7 @@ class WorldSession { friend class World; public: - DosProtection(WorldSession* s) : Session(s), _policy((Policy)sWorld->getIntConfig(CONFIG_PACKET_SPOOF_POLICY)) {} + DosProtection(WorldSession* s) : Session(s), _policy((Policy)sWorld->getIntConfig(CONFIG_PACKET_SPOOF_POLICY)) { } bool EvaluateOpcode(WorldPacket& p) const; void AllowOpcode(uint16 opcode, bool allow) { _isOpcodeAllowed[opcode] = allow; } protected: diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index 57a77773d52..12da93fb537 100644 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -217,9 +217,7 @@ WorldSocketMgr::WorldSocketMgr() : m_SockOutKBuff(-1), m_SockOutUBuff(65536), m_UseNoDelay(true), - m_Acceptor (0) -{ -} + m_Acceptor (0) { } WorldSocketMgr::~WorldSocketMgr() { diff --git a/src/server/game/Skills/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp index 27e7f66fd1a..94fd0ac4428 100644 --- a/src/server/game/Skills/SkillDiscovery.cpp +++ b/src/server/game/Skills/SkillDiscovery.cpp @@ -33,10 +33,10 @@ struct SkillDiscoveryEntry float chance; // chance SkillDiscoveryEntry() - : spellId(0), reqSkillValue(0), chance(0) {} + : spellId(0), reqSkillValue(0), chance(0) { } SkillDiscoveryEntry(uint32 _spellId, uint32 req_skill_val, float _chance) - : spellId(_spellId), reqSkillValue(req_skill_val), chance(_chance) {} + : spellId(_spellId), reqSkillValue(req_skill_val), chance(_chance) { } }; typedef std::list<SkillDiscoveryEntry> SkillDiscoveryList; diff --git a/src/server/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp index 66ad6fc190a..ddd8d1908fa 100644 --- a/src/server/game/Skills/SkillExtraItems.cpp +++ b/src/server/game/Skills/SkillExtraItems.cpp @@ -37,10 +37,10 @@ struct SkillExtraItemEntry uint8 additionalMaxNum; SkillExtraItemEntry() - : requiredSpecialization(0), additionalCreateChance(0.0f), additionalMaxNum(0) {} + : requiredSpecialization(0), additionalCreateChance(0.0f), additionalMaxNum(0) { } SkillExtraItemEntry(uint32 rS, float aCC, uint8 aMN) - : requiredSpecialization(rS), additionalCreateChance(aCC), additionalMaxNum(aMN) {} + : requiredSpecialization(rS), additionalCreateChance(aCC), additionalMaxNum(aMN) { } }; // map to store the extra item creation info, the key is the spellId of the creation spell, the mapped value is the assigned SkillExtraItemEntry diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 1ab396c69e5..140038a7698 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -101,9 +101,7 @@ SpellCastTargets::SpellCastTargets() : m_elevation(0), m_speed(0), m_strTarget() m_targetMask = 0; } -SpellCastTargets::~SpellCastTargets() -{ -} +SpellCastTargets::~SpellCastTargets() { } void SpellCastTargets::Read(ByteBuffer& data, Unit* caster) { @@ -7395,9 +7393,7 @@ bool WorldObjectSpellTargetCheck::operator()(WorldObject* target) WorldObjectSpellNearbyTargetCheck::WorldObjectSpellNearbyTargetCheck(float range, Unit* caster, SpellInfo const* spellInfo, SpellTargetCheckTypes selectionType, ConditionList* condList) - : WorldObjectSpellTargetCheck(caster, caster, spellInfo, selectionType, condList), _range(range), _position(caster) -{ -} + : WorldObjectSpellTargetCheck(caster, caster, spellInfo, selectionType, condList), _range(range), _position(caster) { } bool WorldObjectSpellNearbyTargetCheck::operator()(WorldObject* target) { @@ -7412,9 +7408,7 @@ bool WorldObjectSpellNearbyTargetCheck::operator()(WorldObject* target) WorldObjectSpellAreaTargetCheck::WorldObjectSpellAreaTargetCheck(float range, Position const* position, Unit* caster, Unit* referer, SpellInfo const* spellInfo, SpellTargetCheckTypes selectionType, ConditionList* condList) - : WorldObjectSpellTargetCheck(caster, referer, spellInfo, selectionType, condList), _range(range), _position(position) -{ -} + : WorldObjectSpellTargetCheck(caster, referer, spellInfo, selectionType, condList), _range(range), _position(position) { } bool WorldObjectSpellAreaTargetCheck::operator()(WorldObject* target) { @@ -7425,9 +7419,7 @@ bool WorldObjectSpellAreaTargetCheck::operator()(WorldObject* target) WorldObjectSpellConeTargetCheck::WorldObjectSpellConeTargetCheck(float coneAngle, float range, Unit* caster, SpellInfo const* spellInfo, SpellTargetCheckTypes selectionType, ConditionList* condList) - : WorldObjectSpellAreaTargetCheck(range, caster, caster, caster, spellInfo, selectionType, condList), _coneAngle(coneAngle) -{ -} + : WorldObjectSpellAreaTargetCheck(range, caster, caster, caster, spellInfo, selectionType, condList), _coneAngle(coneAngle) { } bool WorldObjectSpellConeTargetCheck::operator()(WorldObject* target) { @@ -7450,9 +7442,7 @@ bool WorldObjectSpellConeTargetCheck::operator()(WorldObject* target) } WorldObjectSpellTrajTargetCheck::WorldObjectSpellTrajTargetCheck(float range, Position const* position, Unit* caster, SpellInfo const* spellInfo) - : WorldObjectSpellAreaTargetCheck(range, position, caster, caster, spellInfo, TARGET_CHECK_DEFAULT, NULL) -{ -} + : WorldObjectSpellAreaTargetCheck(range, position, caster, caster, spellInfo, TARGET_CHECK_DEFAULT, NULL) { } bool WorldObjectSpellTrajTargetCheck::operator()(WorldObject* target) { diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index 82b2a68f46a..ebae8edd0b5 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -258,7 +258,7 @@ public: float DeltaScalingMultiplier; float ComboScalingMultiplier; - SpellEffectInfo() {} + SpellEffectInfo() { } SpellEffectInfo(SpellEntry const* spellEntry, SpellInfo const* spellInfo, uint8 effIndex, SpellEffectEntry const* effect); bool IsEffect() const; diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 2d23a38b079..d8ad267b26b 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -350,9 +350,7 @@ bool IsDiminishingReturnsGroupDurationLimited(DiminishingGroup group) } } -SpellMgr::SpellMgr() -{ -} +SpellMgr::SpellMgr() { } SpellMgr::~SpellMgr() { diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index bb9aab023af..172a9dbcc52 100644 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -204,9 +204,7 @@ void SpellScript::HitHandler::Call(SpellScript* spellScript) } SpellScript::TargetHook::TargetHook(uint8 _effectIndex, uint16 _targetType, bool _area) - : _SpellScript::EffectHook(_effectIndex), targetType(_targetType), area(_area) -{ -} + : _SpellScript::EffectHook(_effectIndex), targetType(_targetType), area(_area) { } std::string SpellScript::TargetHook::ToString() { @@ -727,9 +725,7 @@ void AuraScript::AuraDispelHandler::Call(AuraScript* auraScript, DispelInfo* _di } AuraScript::EffectBase::EffectBase(uint8 _effIndex, uint16 _effName) - : _SpellScript::EffectAuraNameCheck(_effName), _SpellScript::EffectHook(_effIndex) -{ -} + : _SpellScript::EffectAuraNameCheck(_effName), _SpellScript::EffectHook(_effIndex) { } bool AuraScript::EffectBase::CheckEffect(SpellInfo const* spellEntry, uint8 effIndex) { diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index f7940b2b8da..fe5f102dbe9 100644 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -60,8 +60,8 @@ class _SpellScript virtual bool _Validate(SpellInfo const* entry); public: - _SpellScript() : m_currentScriptState(SPELL_SCRIPT_STATE_NONE) {} - virtual ~_SpellScript() {} + _SpellScript() : m_currentScriptState(SPELL_SCRIPT_STATE_NONE) { } + virtual ~_SpellScript() { } virtual void _Register(); virtual void _Unload(); virtual void _Init(std::string const* scriptname, uint32 spellId); @@ -230,12 +230,12 @@ class SpellScript : public _SpellScript }; #define SPELLSCRIPT_FUNCTION_CAST_DEFINES(CLASSNAME) \ - class CastHandlerFunction : public SpellScript::CastHandler { public: CastHandlerFunction(SpellCastFnType _pCastHandlerScript) : SpellScript::CastHandler((SpellScript::SpellCastFnType)_pCastHandlerScript) {} }; \ - class CheckCastHandlerFunction : public SpellScript::CheckCastHandler { public: CheckCastHandlerFunction(SpellCheckCastFnType _checkCastHandlerScript) : SpellScript::CheckCastHandler((SpellScript::SpellCheckCastFnType)_checkCastHandlerScript) {} }; \ - class EffectHandlerFunction : public SpellScript::EffectHandler { public: EffectHandlerFunction(SpellEffectFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : SpellScript::EffectHandler((SpellScript::SpellEffectFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ - class HitHandlerFunction : public SpellScript::HitHandler { public: HitHandlerFunction(SpellHitFnType _pHitHandlerScript) : SpellScript::HitHandler((SpellScript::SpellHitFnType)_pHitHandlerScript) {} }; \ - class ObjectAreaTargetSelectHandlerFunction : public SpellScript::ObjectAreaTargetSelectHandler { public: ObjectAreaTargetSelectHandlerFunction(SpellObjectAreaTargetSelectFnType _pObjectAreaTargetSelectHandlerScript, uint8 _effIndex, uint16 _targetType) : SpellScript::ObjectAreaTargetSelectHandler((SpellScript::SpellObjectAreaTargetSelectFnType)_pObjectAreaTargetSelectHandlerScript, _effIndex, _targetType) {} }; \ - class ObjectTargetSelectHandlerFunction : public SpellScript::ObjectTargetSelectHandler { public: ObjectTargetSelectHandlerFunction(SpellObjectTargetSelectFnType _pObjectTargetSelectHandlerScript, uint8 _effIndex, uint16 _targetType) : SpellScript::ObjectTargetSelectHandler((SpellScript::SpellObjectTargetSelectFnType)_pObjectTargetSelectHandlerScript, _effIndex, _targetType) {} }; + class CastHandlerFunction : public SpellScript::CastHandler { public: CastHandlerFunction(SpellCastFnType _pCastHandlerScript) : SpellScript::CastHandler((SpellScript::SpellCastFnType)_pCastHandlerScript) { } }; \ + class CheckCastHandlerFunction : public SpellScript::CheckCastHandler { public: CheckCastHandlerFunction(SpellCheckCastFnType _checkCastHandlerScript) : SpellScript::CheckCastHandler((SpellScript::SpellCheckCastFnType)_checkCastHandlerScript) { } }; \ + class EffectHandlerFunction : public SpellScript::EffectHandler { public: EffectHandlerFunction(SpellEffectFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : SpellScript::EffectHandler((SpellScript::SpellEffectFnType)_pEffectHandlerScript, _effIndex, _effName) { } }; \ + class HitHandlerFunction : public SpellScript::HitHandler { public: HitHandlerFunction(SpellHitFnType _pHitHandlerScript) : SpellScript::HitHandler((SpellScript::SpellHitFnType)_pHitHandlerScript) { } }; \ + class ObjectAreaTargetSelectHandlerFunction : public SpellScript::ObjectAreaTargetSelectHandler { public: ObjectAreaTargetSelectHandlerFunction(SpellObjectAreaTargetSelectFnType _pObjectAreaTargetSelectHandlerScript, uint8 _effIndex, uint16 _targetType) : SpellScript::ObjectAreaTargetSelectHandler((SpellScript::SpellObjectAreaTargetSelectFnType)_pObjectAreaTargetSelectHandlerScript, _effIndex, _targetType) { } }; \ + class ObjectTargetSelectHandlerFunction : public SpellScript::ObjectTargetSelectHandler { public: ObjectTargetSelectHandlerFunction(SpellObjectTargetSelectFnType _pObjectTargetSelectHandlerScript, uint8 _effIndex, uint16 _targetType) : SpellScript::ObjectTargetSelectHandler((SpellScript::SpellObjectTargetSelectFnType)_pObjectTargetSelectHandlerScript, _effIndex, _targetType) { } }; #define PrepareSpellScript(CLASSNAME) SPELLSCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) SPELLSCRIPT_FUNCTION_CAST_DEFINES(CLASSNAME) public: @@ -589,26 +589,26 @@ class AuraScript : public _SpellScript }; #define AURASCRIPT_FUNCTION_CAST_DEFINES(CLASSNAME) \ - class CheckAreaTargetFunction : public AuraScript::CheckAreaTargetHandler { public: CheckAreaTargetFunction(AuraCheckAreaTargetFnType _pHandlerScript) : AuraScript::CheckAreaTargetHandler((AuraScript::AuraCheckAreaTargetFnType)_pHandlerScript) {} }; \ - class AuraDispelFunction : public AuraScript::AuraDispelHandler { public: AuraDispelFunction(AuraDispelFnType _pHandlerScript) : AuraScript::AuraDispelHandler((AuraScript::AuraDispelFnType)_pHandlerScript) {} }; \ - class EffectPeriodicHandlerFunction : public AuraScript::EffectPeriodicHandler { public: EffectPeriodicHandlerFunction(AuraEffectPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectPeriodicHandler((AuraScript::AuraEffectPeriodicFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ - class EffectUpdatePeriodicHandlerFunction : public AuraScript::EffectUpdatePeriodicHandler { public: EffectUpdatePeriodicHandlerFunction(AuraEffectUpdatePeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectUpdatePeriodicHandler((AuraScript::AuraEffectUpdatePeriodicFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ - class EffectCalcAmountHandlerFunction : public AuraScript::EffectCalcAmountHandler { public: EffectCalcAmountHandlerFunction(AuraEffectCalcAmountFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectCalcAmountHandler((AuraScript::AuraEffectCalcAmountFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ - class EffectCalcPeriodicHandlerFunction : public AuraScript::EffectCalcPeriodicHandler { public: EffectCalcPeriodicHandlerFunction(AuraEffectCalcPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectCalcPeriodicHandler((AuraScript::AuraEffectCalcPeriodicFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ - class EffectCalcSpellModHandlerFunction : public AuraScript::EffectCalcSpellModHandler { public: EffectCalcSpellModHandlerFunction(AuraEffectCalcSpellModFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectCalcSpellModHandler((AuraScript::AuraEffectCalcSpellModFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ - class EffectApplyHandlerFunction : public AuraScript::EffectApplyHandler { public: EffectApplyHandlerFunction(AuraEffectApplicationModeFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName, AuraEffectHandleModes _mode) : AuraScript::EffectApplyHandler((AuraScript::AuraEffectApplicationModeFnType)_pEffectHandlerScript, _effIndex, _effName, _mode) {} }; \ - class EffectAbsorbFunction : public AuraScript::EffectAbsorbHandler { public: EffectAbsorbFunction(AuraEffectAbsorbFnType _pEffectHandlerScript, uint8 _effIndex) : AuraScript::EffectAbsorbHandler((AuraScript::AuraEffectAbsorbFnType)_pEffectHandlerScript, _effIndex) {} }; \ - class EffectManaShieldFunction : public AuraScript::EffectManaShieldHandler { public: EffectManaShieldFunction(AuraEffectAbsorbFnType _pEffectHandlerScript, uint8 _effIndex) : AuraScript::EffectManaShieldHandler((AuraScript::AuraEffectAbsorbFnType)_pEffectHandlerScript, _effIndex) {} }; \ - class EffectSplitFunction : public AuraScript::EffectSplitHandler { public: EffectSplitFunction(AuraEffectSplitFnType _pEffectHandlerScript, uint8 _effIndex) : AuraScript::EffectSplitHandler((AuraScript::AuraEffectSplitFnType)_pEffectHandlerScript, _effIndex) {} }; \ - class CheckProcHandlerFunction : public AuraScript::CheckProcHandler { public: CheckProcHandlerFunction(AuraCheckProcFnType handlerScript) : AuraScript::CheckProcHandler((AuraScript::AuraCheckProcFnType)handlerScript) {} }; \ - class AuraProcHandlerFunction : public AuraScript::AuraProcHandler { public: AuraProcHandlerFunction(AuraProcFnType handlerScript) : AuraScript::AuraProcHandler((AuraScript::AuraProcFnType)handlerScript) {} }; \ - class EffectProcHandlerFunction : public AuraScript::EffectProcHandler { public: EffectProcHandlerFunction(AuraEffectProcFnType effectHandlerScript, uint8 effIndex, uint16 effName) : AuraScript::EffectProcHandler((AuraScript::AuraEffectProcFnType)effectHandlerScript, effIndex, effName) {} }; \ + class CheckAreaTargetFunction : public AuraScript::CheckAreaTargetHandler { public: CheckAreaTargetFunction(AuraCheckAreaTargetFnType _pHandlerScript) : AuraScript::CheckAreaTargetHandler((AuraScript::AuraCheckAreaTargetFnType)_pHandlerScript) { } }; \ + class AuraDispelFunction : public AuraScript::AuraDispelHandler { public: AuraDispelFunction(AuraDispelFnType _pHandlerScript) : AuraScript::AuraDispelHandler((AuraScript::AuraDispelFnType)_pHandlerScript) { } }; \ + class EffectPeriodicHandlerFunction : public AuraScript::EffectPeriodicHandler { public: EffectPeriodicHandlerFunction(AuraEffectPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectPeriodicHandler((AuraScript::AuraEffectPeriodicFnType)_pEffectHandlerScript, _effIndex, _effName) { } }; \ + class EffectUpdatePeriodicHandlerFunction : public AuraScript::EffectUpdatePeriodicHandler { public: EffectUpdatePeriodicHandlerFunction(AuraEffectUpdatePeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectUpdatePeriodicHandler((AuraScript::AuraEffectUpdatePeriodicFnType)_pEffectHandlerScript, _effIndex, _effName) { } }; \ + class EffectCalcAmountHandlerFunction : public AuraScript::EffectCalcAmountHandler { public: EffectCalcAmountHandlerFunction(AuraEffectCalcAmountFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectCalcAmountHandler((AuraScript::AuraEffectCalcAmountFnType)_pEffectHandlerScript, _effIndex, _effName) { } }; \ + class EffectCalcPeriodicHandlerFunction : public AuraScript::EffectCalcPeriodicHandler { public: EffectCalcPeriodicHandlerFunction(AuraEffectCalcPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectCalcPeriodicHandler((AuraScript::AuraEffectCalcPeriodicFnType)_pEffectHandlerScript, _effIndex, _effName) { } }; \ + class EffectCalcSpellModHandlerFunction : public AuraScript::EffectCalcSpellModHandler { public: EffectCalcSpellModHandlerFunction(AuraEffectCalcSpellModFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectCalcSpellModHandler((AuraScript::AuraEffectCalcSpellModFnType)_pEffectHandlerScript, _effIndex, _effName) { } }; \ + class EffectApplyHandlerFunction : public AuraScript::EffectApplyHandler { public: EffectApplyHandlerFunction(AuraEffectApplicationModeFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName, AuraEffectHandleModes _mode) : AuraScript::EffectApplyHandler((AuraScript::AuraEffectApplicationModeFnType)_pEffectHandlerScript, _effIndex, _effName, _mode) { } }; \ + class EffectAbsorbFunction : public AuraScript::EffectAbsorbHandler { public: EffectAbsorbFunction(AuraEffectAbsorbFnType _pEffectHandlerScript, uint8 _effIndex) : AuraScript::EffectAbsorbHandler((AuraScript::AuraEffectAbsorbFnType)_pEffectHandlerScript, _effIndex) { } }; \ + class EffectManaShieldFunction : public AuraScript::EffectManaShieldHandler { public: EffectManaShieldFunction(AuraEffectAbsorbFnType _pEffectHandlerScript, uint8 _effIndex) : AuraScript::EffectManaShieldHandler((AuraScript::AuraEffectAbsorbFnType)_pEffectHandlerScript, _effIndex) { } }; \ + class EffectSplitFunction : public AuraScript::EffectSplitHandler { public: EffectSplitFunction(AuraEffectSplitFnType _pEffectHandlerScript, uint8 _effIndex) : AuraScript::EffectSplitHandler((AuraScript::AuraEffectSplitFnType)_pEffectHandlerScript, _effIndex) { } }; \ + class CheckProcHandlerFunction : public AuraScript::CheckProcHandler { public: CheckProcHandlerFunction(AuraCheckProcFnType handlerScript) : AuraScript::CheckProcHandler((AuraScript::AuraCheckProcFnType)handlerScript) { } }; \ + class AuraProcHandlerFunction : public AuraScript::AuraProcHandler { public: AuraProcHandlerFunction(AuraProcFnType handlerScript) : AuraScript::AuraProcHandler((AuraScript::AuraProcFnType)handlerScript) { } }; \ + class EffectProcHandlerFunction : public AuraScript::EffectProcHandler { public: EffectProcHandlerFunction(AuraEffectProcFnType effectHandlerScript, uint8 effIndex, uint16 effName) : AuraScript::EffectProcHandler((AuraScript::AuraEffectProcFnType)effectHandlerScript, effIndex, effName) { } }; \ #define PrepareAuraScript(CLASSNAME) AURASCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) AURASCRIPT_FUNCTION_CAST_DEFINES(CLASSNAME) public: AuraScript() : _SpellScript(), m_aura(NULL), m_auraApplication(NULL), m_defaultActionPrevented(false) - {} + { } bool _Validate(SpellInfo const* entry); bool _Load(Aura* aura); void _PrepareScriptCall(AuraScriptHookType hookType, AuraApplication const* aurApp = NULL); @@ -627,7 +627,7 @@ class AuraScript : public _SpellScript bool _defaultActionPrevented; ScriptStateStore(uint8 currentScriptState, AuraApplication const* auraApplication, bool defaultActionPrevented) : _auraApplication(auraApplication), _currentScriptState(currentScriptState), _defaultActionPrevented(defaultActionPrevented) - {} + { } }; typedef std::stack<ScriptStateStore> ScriptStateStack; ScriptStateStack m_scriptStates; diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h index c32e35e8770..198877bfe86 100644 --- a/src/server/game/Texts/CreatureTextMgr.h +++ b/src/server/game/Texts/CreatureTextMgr.h @@ -82,10 +82,10 @@ typedef UNORDERED_MAP<uint64, CreatureTextRepeatGroup> CreatureTextRepeatMap;//g class CreatureTextMgr { friend class ACE_Singleton<CreatureTextMgr, ACE_Null_Mutex>; - CreatureTextMgr() {}; + CreatureTextMgr() { }; public: - ~CreatureTextMgr() {}; + ~CreatureTextMgr() { }; void LoadCreatureTexts(); void LoadCreatureTextLocales(); CreatureTextMap const& GetTextMap() const { return mTextMap; } diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp index f5d10bac70a..50ed1bff8fc 100644 --- a/src/server/game/Tickets/TicketMgr.cpp +++ b/src/server/game/Tickets/TicketMgr.cpp @@ -245,9 +245,7 @@ void GmTicket::SetChatLog(std::list<uint32> time, std::string const& log) /////////////////////////////////////////////////////////////////////////////////////////////////// // Ticket manager TicketMgr::TicketMgr() : _status(true), _lastTicketId(0), _lastSurveyId(0), _openTicketCount(0), - _lastChange(time(NULL)) -{ -} + _lastChange(time(NULL)) { } TicketMgr::~TicketMgr() { diff --git a/src/server/game/Tools/PlayerDump.h b/src/server/game/Tools/PlayerDump.h index c9b763febae..e435f000e3b 100644 --- a/src/server/game/Tools/PlayerDump.h +++ b/src/server/game/Tools/PlayerDump.h @@ -65,13 +65,13 @@ enum DumpReturn class PlayerDump { protected: - PlayerDump() {} + PlayerDump() { } }; class PlayerDumpWriter : public PlayerDump { public: - PlayerDumpWriter() {} + PlayerDumpWriter() { } bool GetDump(uint32 guid, std::string& dump); DumpReturn WriteDump(std::string const& file, uint32 guid); @@ -90,7 +90,7 @@ class PlayerDumpWriter : public PlayerDump class PlayerDumpReader : public PlayerDump { public: - PlayerDumpReader() {} + PlayerDumpReader() { } DumpReturn LoadDump(std::string const& file, uint32 account, std::string name, uint32 guid); }; diff --git a/src/server/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp index f02cbf321b3..5e2cd82f6cc 100644 --- a/src/server/game/Warden/Warden.cpp +++ b/src/server/game/Warden/Warden.cpp @@ -30,9 +30,7 @@ #include "Warden.h" #include "AccountMgr.h" -Warden::Warden() : _inputCrypto(16), _outputCrypto(16), _checkTimer(10000/*10 sec*/), _clientResponseTimer(0), _dataSent(false), _initialized(false) -{ -} +Warden::Warden() : _inputCrypto(16), _outputCrypto(16), _checkTimer(10000/*10 sec*/), _clientResponseTimer(0), _dataSent(false), _initialized(false) { } Warden::~Warden() { diff --git a/src/server/game/Warden/WardenCheckMgr.cpp b/src/server/game/Warden/WardenCheckMgr.cpp index a8bcd61db73..cdd2a2f6bac 100644 --- a/src/server/game/Warden/WardenCheckMgr.cpp +++ b/src/server/game/Warden/WardenCheckMgr.cpp @@ -25,9 +25,7 @@ #include "WardenCheckMgr.h" #include "Warden.h" -WardenCheckMgr::WardenCheckMgr() -{ -} +WardenCheckMgr::WardenCheckMgr() { } WardenCheckMgr::~WardenCheckMgr() { diff --git a/src/server/game/Warden/WardenMac.cpp b/src/server/game/Warden/WardenMac.cpp index 27e859e741d..1cd4a4ea877 100644 --- a/src/server/game/Warden/WardenMac.cpp +++ b/src/server/game/Warden/WardenMac.cpp @@ -30,13 +30,9 @@ #include "WardenMac.h" #include "WardenModuleMac.h" -WardenMac::WardenMac() : Warden() -{ -} +WardenMac::WardenMac() : Warden() { } -WardenMac::~WardenMac() -{ -} +WardenMac::~WardenMac() { } void WardenMac::Init(WorldSession* pClient, BigNumber* K) { diff --git a/src/server/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp index 60a1fecedc9..a9fcc041ff6 100644 --- a/src/server/game/Warden/WardenWin.cpp +++ b/src/server/game/Warden/WardenWin.cpp @@ -34,13 +34,9 @@ #include "WardenCheckMgr.h" #include "AccountMgr.h" -WardenWin::WardenWin() : Warden() -{ -} +WardenWin::WardenWin() : Warden() { } -WardenWin::~WardenWin() -{ -} +WardenWin::~WardenWin() { } void WardenWin::Init(WorldSession* session, BigNumber* k) { diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 092b5c454bd..0d6ce27dc07 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2206,7 +2206,7 @@ namespace Trinity { public: typedef std::vector<WorldPacket*> WorldPacketList; - explicit WorldWorldTextBuilder(int32 textId, va_list* args = NULL) : i_textId(textId), i_args(args) {} + explicit WorldWorldTextBuilder(int32 textId, va_list* args = NULL) : i_textId(textId), i_args(args) { } void operator()(WorldPacketList& data_list, LocaleConstant loc_idx) { char const* text = sObjectMgr->GetTrinityString(i_textId, loc_idx); diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 09adc8f55b3..57097e41831 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1654,7 +1654,7 @@ public: // Output III. LANG_PINFO_BANNED if ban exists and is applied if (banTime >= 0) - handler->PSendSysMessage(LANG_PINFO_BANNED, banType.c_str(), banTime > 0 ? secsToTimeString(banTime - time(NULL), true).c_str() : "permanently", banReason.c_str(), bannedBy.c_str()); + handler->PSendSysMessage(LANG_PINFO_BANNED, banType.c_str(), banReason.c_str(), banTime > 0 ? secsToTimeString(banTime - time(NULL), true).c_str() : "permanently", bannedBy.c_str()); // Output IV. LANG_PINFO_MUTED if mute is applied if (muteTime > 0) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp index 89b4dc5324f..1f393205bc1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp @@ -634,8 +634,8 @@ public: } } - void EnterCombat(Unit* who) OVERRIDE {} - void Reset() OVERRIDE {} + void EnterCombat(Unit* who) OVERRIDE { } + void Reset() OVERRIDE { } void JustDied(Unit* killer) OVERRIDE { @@ -804,7 +804,7 @@ public: } } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void JustDied(Unit* slayer) OVERRIDE { @@ -1019,7 +1019,7 @@ public: break; } } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void JustDied(Unit* slayer) OVERRIDE { @@ -1127,8 +1127,8 @@ public: { npc_tobias_seecherAI(Creature* creature) : npc_escortAI(creature) { } - void EnterCombat(Unit* who) OVERRIDE {} - void Reset() OVERRIDE {} + void EnterCombat(Unit* who) OVERRIDE { } + void Reset() OVERRIDE { } void JustDied(Unit* killer) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp index feadc006daf..75f85ace2bd 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -47,7 +47,7 @@ public: Spirit_Timer = 24000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void SummonSpirits(Unit* victim) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp index 83869ddc631..84964ba375a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp @@ -57,7 +57,7 @@ public: EnvelopingWeb_Timer = 16000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp index 40d176b574b..869479a7ae0 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp @@ -55,7 +55,7 @@ public: Medics = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void SummonAdds(Unit* victim) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp index 3ac15bfcab4..1c2953a6a22 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp @@ -49,7 +49,7 @@ public: Frenzy_Timer =0; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index f381a1e2a9c..86748977749 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -54,7 +54,7 @@ public: ShadowShield_Timer = 8000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp index 2c1d078fd36..f4c63f630c3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp @@ -53,7 +53,7 @@ public: WarStomp_Timer =0; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp index 21c357d3b31..c647737bea9 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp @@ -56,7 +56,7 @@ public: Smite_Timer = 8000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index c24f533d41c..aff7f840a12 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -218,7 +218,7 @@ public: } } - void JustSummoned(Creature* /*summon*/) OVERRIDE {} + void JustSummoned(Creature* /*summon*/) OVERRIDE { } void SetData(uint32 type, uint32 data) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/CMakeLists.txt b/src/server/scripts/EasternKingdoms/CMakeLists.txt index 73c8fb5cf5c..e776467fedb 100644 --- a/src/server/scripts/EasternKingdoms/CMakeLists.txt +++ b/src/server/scripts/EasternKingdoms/CMakeLists.txt @@ -171,7 +171,6 @@ set(scripts_STAT_SRCS EasternKingdoms/ScarletMonastery/boss_herod.cpp EasternKingdoms/ScarletMonastery/boss_scorn.cpp EasternKingdoms/zone_undercity.cpp - EasternKingdoms/zone_silvermoon_city.cpp EasternKingdoms/zone_loch_modan.cpp EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 48a6712c4ae..071a5e83d2f 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -90,7 +90,7 @@ public: ResetTimer = 2000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void KilledUnit(Unit* /*victim*/) OVERRIDE { @@ -142,7 +142,7 @@ public: me->SetVisible(true); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void KilledUnit(Unit* /*victim*/) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index ff85c53de7a..fc37c42be85 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -462,7 +462,7 @@ public: struct boss_baron_rafe_dreugerAI : public boss_moroes_guestAI { //Retr Pally - boss_baron_rafe_dreugerAI(Creature* creature) : boss_moroes_guestAI(creature){} + boss_baron_rafe_dreugerAI(Creature* creature) : boss_moroes_guestAI(creature){ } uint32 HammerOfJustice_Timer; uint32 SealOfCommand_Timer; @@ -589,7 +589,7 @@ public: struct boss_lady_keira_berrybuckAI : public boss_moroes_guestAI { //Holy Pally - boss_lady_keira_berrybuckAI(Creature* creature) : boss_moroes_guestAI(creature) {} + boss_lady_keira_berrybuckAI(Creature* creature) : boss_moroes_guestAI(creature) { } uint32 Cleanse_Timer; uint32 GreaterBless_Timer; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 762547e551c..7c6cdd4cb3e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -117,9 +117,9 @@ public: uint64 malchezaar; InfernalPoint *point; - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 66489fb8840..2d3fabb810b 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -529,7 +529,7 @@ public: CastTimer = 2000 + (rand()%3000); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index e3eea359426..6355fe33724 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -156,9 +156,9 @@ public: SacrificeGUID = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void JustDied(Unit* /*killer*/) OVERRIDE @@ -185,7 +185,7 @@ public: struct npc_fiendish_portalAI : public PassiveAI { - npc_fiendish_portalAI(Creature* creature) : PassiveAI(creature), summons(me){} + npc_fiendish_portalAI(Creature* creature) : PassiveAI(creature), summons(me){ } SummonList summons; @@ -230,7 +230,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 383cb9182c7..beff85b730f 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -249,7 +249,7 @@ public: YipTimer = 10000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void JustDied(Unit* /*killer*/) OVERRIDE { @@ -733,7 +733,7 @@ public: MoveTimer = 1000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void MoveInLineOfSight(Unit* /*who*/) OVERRIDE @@ -1073,7 +1073,7 @@ public: RomuloDead = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void AttackStart(Unit* who) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 679f52343eb..6997b7123bc 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -176,7 +176,7 @@ public: Start(false, false); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void WaypointReached(uint32 waypointId) OVERRIDE { @@ -512,7 +512,7 @@ public: me->RemoveCorpse(); } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void MovementInform(uint32 type, uint32 id) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index dc8f8bb185a..074ad3f1b96 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -461,8 +461,8 @@ public: DoCast(me, SPELL_FLAMESTRIKE2, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -509,7 +509,7 @@ public: FakeDeath = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void DamageTaken(Unit* /*killer*/, uint32 &damage) OVERRIDE { @@ -609,8 +609,8 @@ public: HatchTimer = 10000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE @@ -652,7 +652,7 @@ public: DoCast(me, SPELL_ARCANE_SPHERE_PASSIVE, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index a514f723900..c31eb1bea11 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -334,12 +334,12 @@ public: { npc_fel_crystalAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } void JustDied(Unit* /*killer*/) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 3694fa4a864..24b48112bb6 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -222,7 +222,7 @@ public: me->SetDisplayId(me->GetCreatureTemplate()->Modelid2); } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void JustDied(Unit* slayer) OVERRIDE { @@ -233,10 +233,10 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE { } }; }; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 52c791a2fcb..97359ba65a9 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -1678,10 +1678,10 @@ public: struct npc_the_lich_king_tirion_dawnAI : public ScriptedAI { npc_the_lich_king_tirion_dawnAI(Creature* creature) : ScriptedAI(creature) { Reset(); } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void AttackStart(Unit* /*who*/) { } // very sample, just don't make them aggreesive OVERRIDE - void UpdateAI(uint32 /*diff*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void JustDied(Unit* /*killer*/) OVERRIDE { } }; }; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp index 83269f43f25..6f028e33726 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp @@ -58,7 +58,7 @@ public: Terrify_Timer = 20000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 10c208aa1e3..463e88b670b 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -162,8 +162,8 @@ public: uint32 delay; uint32 spell; uint32 spell2; - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } void SetType(uint32 _type) { switch (Creaturetype = _type) @@ -254,7 +254,7 @@ public: laugh = urand(15000, 30000); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void SaySound(uint8 textEntry, Unit* target = 0) { @@ -821,7 +821,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index 45ae86b252b..40fe93155a5 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -148,9 +148,9 @@ public: uint32 Start_Timer; - void Reset() OVERRIDE {} - void WaypointReached(uint32 /*waypointId*/) OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void WaypointReached(uint32 /*waypointId*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp index 8e267319054..b2289f324f3 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp @@ -61,7 +61,7 @@ public: FrostNova_Timer = 30000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp index e468c435c8d..451fd46938d 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp @@ -69,7 +69,7 @@ public: DoCast(me, SPELL_ICEARMOR, true); } - void EnterCombat(Unit* /*who*/)OVERRIDE {} + void EnterCombat(Unit* /*who*/)OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index d5c3d27eed3..8d89592090e 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -145,8 +145,8 @@ public: } } - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } }; }; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp index 98f4d9f8e4d..b67c039ec74 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp @@ -61,7 +61,7 @@ class boss_postmaster_malown : public CreatureScript { boss_postmaster_malownAI(Creature* creature) : BossAI(creature, TYPE_MALOWN) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void EnterCombat(Unit* /*who*/) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 34b79473fb7..1b15f30353b 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -107,7 +107,7 @@ public: Talk(SAY_ZAPPED); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } }; }; @@ -155,7 +155,7 @@ public: Tagged = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { @@ -235,7 +235,7 @@ public: Tagged = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index a84e89d61a3..692f9ae5440 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -689,7 +689,7 @@ public: KillTimer = 15000; } - void EnterCombat(Unit* /*who*/)OVERRIDE {} + void EnterCombat(Unit* /*who*/)OVERRIDE { } void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index a74e2cc87b1..561ba361f26 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -531,7 +531,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetSpeed(MOVE_RUN, 0.8f); } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); @@ -565,12 +565,12 @@ public: me->SetTarget(me->GetGUID()); me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 0.01f); // core bug } - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } }; }; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 1753cc8ca10..e36310f85b1 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -525,7 +525,7 @@ public: struct npc_void_sentinelAI : public ScriptedAI { - npc_void_sentinelAI(Creature* creature) : ScriptedAI(creature){} + npc_void_sentinelAI(Creature* creature) : ScriptedAI(creature){ } uint32 PulseTimer; uint32 VoidBlastTimer; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp index 2db77197eb0..4b190f04a70 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp @@ -62,6 +62,4 @@ enum LiadrinnSpeeches #define CS_GOSSIP3 "Why did they stop?" #define CS_GOSSIP4 "Your insight is appreciated." -void AddSC_sunwell_plateau() -{ -} +void AddSC_sunwell_plateau() { } diff --git a/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp b/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp index 808515269ad..e575965987c 100644 --- a/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp +++ b/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp @@ -23,13 +23,6 @@ SDComment: SDCategory: Burning Steppes EndScriptData */ - -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "Player.h" - - void AddSC_burning_steppes() { diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp index 01305d923b1..ed14875b36d 100644 --- a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp @@ -45,9 +45,9 @@ public: { npc_ghoul_flayerAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void JustDied(Unit* killer) OVERRIDE { @@ -129,7 +129,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } }; }; diff --git a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp index 1f9384c1db2..aa41ee7adbb 100644 --- a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp @@ -81,7 +81,7 @@ public: Summon = false; } - void EnterCombat(Unit* /*who*/)OVERRIDE {} + void EnterCombat(Unit* /*who*/)OVERRIDE { } void JustSummoned(Creature* summoned) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp index a5db2968b7a..cbfab9047b2 100644 --- a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp @@ -86,7 +86,7 @@ public: { npc_00x09hlAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() { } + void Reset() OVERRIDE { } void WaypointReached(uint32 waypointId) { diff --git a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp index a2861606951..ac0b83b72bc 100644 --- a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp @@ -67,9 +67,9 @@ public: Timer = 2500; } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp deleted file mode 100644 index 36abdead399..00000000000 --- a/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> - * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -/* ScriptData -SDName: Silvermoon_City -SD%Complete: 100 -SDComment: Quest support: 9685 -SDCategory: Silvermoon City -EndScriptData */ - -/* ContentData -npc_blood_knight_stillblade -EndContentData */ - -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "Player.h" -#include "SpellInfo.h" - -/*####### -# npc_blood_knight_stillblade -#######*/ -enum StillbladeData -{ - SAY_HEAL = 0, - - QUEST_REDEEMING_THE_DEAD = 9685, - SPELL_SHIMMERING_VESSEL = 31225, - SPELL_REVIVE_SELF = 32343, -}; - -class npc_blood_knight_stillblade : public CreatureScript -{ -public: - npc_blood_knight_stillblade() : CreatureScript("npc_blood_knight_stillblade") { } - - CreatureAI* GetAI(Creature* creature) const OVERRIDE - { - return new npc_blood_knight_stillbladeAI(creature); - } - - struct npc_blood_knight_stillbladeAI : public ScriptedAI - { - npc_blood_knight_stillbladeAI(Creature* creature) : ScriptedAI(creature) { } - - uint32 lifeTimer; - bool spellHit; - - void Reset() OVERRIDE - { - lifeTimer = 120000; - me->SetStandState(UNIT_STAND_STATE_DEAD); - me->SetUInt32Value(UNIT_FIELD_BYTES_1, 7); // lay down - spellHit = false; - } - - void EnterCombat(Unit* /*who*/) OVERRIDE - { - } - - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE - - { - } - - void UpdateAI(uint32 diff) OVERRIDE - { - if (me->IsStandState()) - { - if (lifeTimer <= diff) - me->AI()->EnterEvadeMode(); - else - lifeTimer -= diff; - } - } - - void SpellHit(Unit* caster, const SpellInfo* Spellkind) OVERRIDE - { - if (Spellkind->Id != SPELL_SHIMMERING_VESSEL || spellHit) - return; - - Player* player = caster->ToPlayer(); - if (!player || !player->IsActiveQuest(QUEST_REDEEMING_THE_DEAD)) - return; - - player->AreaExploredOrEventHappens(QUEST_REDEEMING_THE_DEAD); - DoCast(me, SPELL_REVIVE_SELF); - me->SetStandState(UNIT_STAND_STATE_STAND); - me->SetUInt32Value(UNIT_DYNAMIC_FLAGS, 0); - //me->RemoveAllAuras(); - Talk(SAY_HEAL); - spellHit = true; - } - }; -}; - -void AddSC_silvermoon_city() -{ - new npc_blood_knight_stillblade(); -} diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp index 5541171fa7e..2074b1116fb 100644 --- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp @@ -107,7 +107,7 @@ public: } } - void Reset() {} + void Reset() OVERRIDE { } void EnterCombat(Unit* who) { diff --git a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp index 4dc41e5551c..91bf802abf7 100644 --- a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp @@ -82,7 +82,7 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index f193a0cc95c..d205fe8cb40 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -124,7 +124,7 @@ public: MultiShotTimer = 10000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void JustSummoned(Creature* summoned) OVERRIDE { @@ -246,7 +246,7 @@ public: EventCast = true; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp index 3247c194579..7077e3d9a31 100644 --- a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp @@ -174,9 +174,9 @@ public: { npc_the_scourge_cauldronAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void DoDie() { @@ -393,7 +393,7 @@ public: } } - void EnterCombat(Unit* /*who*/)OVERRIDE {} + void EnterCombat(Unit* /*who*/)OVERRIDE { } void JustDied(Unit* /*killer*/) OVERRIDE { diff --git a/src/server/scripts/EasternKingdoms/zone_westfall.cpp b/src/server/scripts/EasternKingdoms/zone_westfall.cpp index 311a82bdea8..3869ee5bbb5 100644 --- a/src/server/scripts/EasternKingdoms/zone_westfall.cpp +++ b/src/server/scripts/EasternKingdoms/zone_westfall.cpp @@ -269,7 +269,7 @@ public: Talk(SAY_AGGRO, who->GetGUID()); } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } }; }; diff --git a/src/server/scripts/Examples/example_spell.cpp b/src/server/scripts/Examples/example_spell.cpp index 8e22c4b66c8..4652eef3faa 100644 --- a/src/server/scripts/Examples/example_spell.cpp +++ b/src/server/scripts/Examples/example_spell.cpp @@ -442,7 +442,7 @@ class spell_ex : public SpellScriptLoader //bool Validate(SpellInfo const* spellEntry){return true;} OVERRIDE //bool Load(){return true;} - //void Unload(){} + //void Unload(){ } //void Function(SpellEffIndex effIndex) //OnEffect += SpellEffectFn(spell_ex_SpellScript::Function, EFFECT_ANY, SPELL_EFFECT_ANY); //void Function() //OnHit += SpellEffectFn(spell_ex_SpellScript::Function); @@ -469,7 +469,7 @@ class spell_ex : public SpellScriptLoader PrepareAuraScript(spell_ex) //bool Validate(SpellInfo const* spellEntry){return true;} OVERRIDE //bool Load(){return true;} - //void Unload(){} + //void Unload(){ } //void spell_ex_SpellScript::Function(AuraEffect const* aurEff, AuraEffectHandleModes mode) //OnEffectApply += AuraEffectApplyFn(spell_ex_SpellScript::Function, EFFECT_ANY, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL); //void spell_ex_SpellScript::Function(AuraEffect const* aurEff, AuraEffectHandleModes mode) //OnEffectRemove += AuraEffectRemoveFn(spell_ex_SpellScript::Function, EFFECT_ANY, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index b030c8b33a3..41cc1d0241d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -108,7 +108,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { @@ -148,11 +148,11 @@ public: { npc_doomfireAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { @@ -195,7 +195,7 @@ public: TargetGUID = who->GetGUID(); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { @@ -638,7 +638,7 @@ public: DoMeleeAttackIfReady(); } - void WaypointReached(uint32 /*waypointId*/) OVERRIDE {} + void WaypointReached(uint32 /*waypointId*/) OVERRIDE { } }; }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 24d0422e06e..43d75fad876 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -443,7 +443,7 @@ public: imol = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void WaypointReached(uint32 waypointId) OVERRIDE { @@ -594,7 +594,7 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -697,7 +697,7 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -820,7 +820,7 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -918,7 +918,7 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -1017,7 +1017,7 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -1107,7 +1107,7 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -1206,7 +1206,7 @@ public: me->SetPosition(x, y, z, 0); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index ffa0eea14f6..46978366224 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -639,8 +639,8 @@ public: } } - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp index 0d67426d039..c929a1b6a55 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp @@ -59,7 +59,7 @@ public: { boss_aeonusAI(Creature* creature) : BossAI(creature, TYPE_AEONUS) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void EnterCombat(Unit* /*who*/) OVERRIDE { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp index a181c0fe43e..fe91f3ab712 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp @@ -60,7 +60,7 @@ public: { boss_chrono_lord_dejaAI(Creature* creature) : BossAI(creature, TYPE_CRONO_LORD_DEJA) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void EnterCombat(Unit* /*who*/) OVERRIDE { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp index 4bd06546a88..4d94edf7339 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp @@ -59,7 +59,7 @@ public: { boss_temporusAI(Creature* creature) : BossAI(creature, TYPE_TEMPORUS) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void EnterCombat(Unit* /*who*/) OVERRIDE { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index 70c569a3259..8cdf5f246d0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -151,7 +151,7 @@ public: //ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { @@ -303,7 +303,7 @@ public: else mWaveId = 1; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void DoSummonAtRift(uint32 creature_entry) { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp index 39d3df823f6..2a00565e4bd 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -58,7 +58,7 @@ public: CorruptForcesTimer = 30000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void JustDied(Unit* /*killer*/) OVERRIDE { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp index 1196c21b0dd..6478c6eae75 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp @@ -61,7 +61,7 @@ public: Invisible = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void SummonAdds(Unit* victim) { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index 95632edfe9b..654ef986a17 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -62,7 +62,7 @@ public: RepulsiveGazeTimer = 23000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void JustDied(Unit* /*killer*/) OVERRIDE { diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index 33f825421bb..ee8618eacc9 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -118,7 +118,7 @@ public: } } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void EnterCombat(Unit* /*who*/) OVERRIDE { diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index dbc7abe7bf7..e433884c24a 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -79,7 +79,7 @@ public: Enraged = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index b1c2566cdce..dbcf054f8f4 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -229,7 +229,7 @@ class npc_ruul_snowhoof : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void Reset() OVERRIDE { diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index f169b7b9349..ce33f4dbba6 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -95,7 +95,7 @@ public: me->SetStandState(UNIT_STAND_STATE_SLEEP); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void MoveInLineOfSight(Unit* who) OVERRIDE @@ -318,12 +318,12 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } }; }; @@ -398,7 +398,7 @@ public: Talk(SAY_AGGRO, who->GetGUID()); } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } }; }; @@ -457,7 +457,7 @@ public: StartEvent(); } - void EnterCombat(Unit* /*who*/)OVERRIDE {} + void EnterCombat(Unit* /*who*/)OVERRIDE { } void StartEvent() { @@ -614,7 +614,7 @@ public: struct npc_death_ravagerAI : public ScriptedAI { - npc_death_ravagerAI(Creature* creature) : ScriptedAI(creature){} + npc_death_ravagerAI(Creature* creature) : ScriptedAI(creature){ } uint32 RendTimer; uint32 EnragingBiteTimer; diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 0f2c72eb298..694d63d5295 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -54,9 +54,9 @@ public: { npc_webbed_creatureAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void JustDied(Unit* killer) OVERRIDE { diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index 30e9906e3e1..ed3247a3cfa 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -565,7 +565,7 @@ public: Talk(SAY_ATTACKED_1, who->GetGUID()); } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void JustDied(Unit* /*killer*/) OVERRIDE { diff --git a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp index 8cf84de20ec..d1b442a9443 100644 --- a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp +++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp @@ -15,11 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "Player.h" - void AddSC_orgrimmar() { } diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 7fcfde25cd0..ff2eaaa9789 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -840,7 +840,7 @@ public: hasTarget = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void JustDied(Unit* /*slayer*/) OVERRIDE; void UpdateAI(uint32 diff) OVERRIDE diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index 601bc5d0ca4..233c184777c 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -266,7 +266,7 @@ public: } void EnterCombat(Unit* /*who*/) OVERRIDE { } - void Reset() {} + void Reset() OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -398,7 +398,7 @@ public: } } - void Reset(){} + void Reset()OVERRIDE { } void EnterCombat(Unit* /*who*/) OVERRIDE { diff --git a/src/server/scripts/Kalimdor/zone_teldrassil.cpp b/src/server/scripts/Kalimdor/zone_teldrassil.cpp index 8cf08953fc2..14f8f2a9dac 100644 --- a/src/server/scripts/Kalimdor/zone_teldrassil.cpp +++ b/src/server/scripts/Kalimdor/zone_teldrassil.cpp @@ -68,7 +68,7 @@ public: { npc_mistAI(Creature* creature) : FollowerAI(creature) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void MoveInLineOfSight(Unit* who) OVERRIDE diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 66e5b3ea89e..b23710b3d00 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -121,7 +121,7 @@ public: { npc_giltharesAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void WaypointReached(uint32 waypointId) OVERRIDE { @@ -235,7 +235,7 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -340,7 +340,7 @@ public: BigWill = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void MoveInLineOfSight(Unit* who) OVERRIDE @@ -357,7 +357,7 @@ public: } } - void KilledUnit(Unit* /*victim*/) OVERRIDE {} + void KilledUnit(Unit* /*victim*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index f5976333ee6..18df584e64a 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -159,7 +159,7 @@ public: _dialogueArray(dialogueArray), _currentEntry(NULL), _actionTimer(0) - {} + { } // The array MUST be terminated by {0, 0, 0, 0, 0} /// Function to initialize the dialogue helper for instances. If not used with instances, GetSpeakerByEntry MUST be overwritten to obtain the speakers diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp index a0f7fe23a8a..977aa97a974 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp @@ -189,8 +189,8 @@ public: DoCast(me, SPELL_HEALTHY_MUSHROOM_POTENT_FUNGUS, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*victim*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*victim*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp index a5f738ea834..ae4406353bf 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -235,12 +235,12 @@ public: creature->UpdateAllStats(); } - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*victim*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*victim*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } }; CreatureAI* GetAI(Creature* creature) const OVERRIDE diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index 78513fec486..a68a122bc31 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -541,10 +541,10 @@ public: bool bCasted; bool bCasted2; - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*victim*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*victim*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 /*diff*/) OVERRIDE diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index ab2c22455ba..143ccc29e0d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -325,7 +325,7 @@ public: struct npc_anub_ar_warriorAI : public ScriptedAI { - npc_anub_ar_warriorAI(Creature* creature) : ScriptedAI(creature){} + npc_anub_ar_warriorAI(Creature* creature) : ScriptedAI(creature){ } uint32 uiCleaveTimer; uint32 uiStrikeTimer; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 3056ec90807..2088ef2fa2e 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -1536,8 +1536,8 @@ public: m_uiHatchEggTimer -= uiDiff; } - void AttackStart(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } }; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 44485919d31..6f6b28851ad 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -490,7 +490,7 @@ class boss_twilight_halion : public CreatureScript } // Never evade - void EnterEvadeMode() OVERRIDE {} + void EnterEvadeMode() OVERRIDE { } void KilledUnit(Unit* victim) OVERRIDE { @@ -1024,8 +1024,8 @@ class npc_meteor_strike_initial : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} - void EnterEvadeMode() OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void EnterEvadeMode() OVERRIDE { } private: InstanceScript* _instance; std::list<Creature*> _meteorList; @@ -1165,7 +1165,7 @@ class npc_combustion_consumption : public CreatureScript summoner->CastCustomSpell(_explosionSpell, SPELLVALUE_BASE_POINT0, damage, summoner); } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } private: InstanceScript* _instance; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 6fd8811b270..4cea1ea5b06 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -296,7 +296,7 @@ class npc_infernal_volcano : public CreatureScript me->DespawnOrUnsummon(); } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } private: SummonList _summons; @@ -400,7 +400,7 @@ class npc_nether_portal : public CreatureScript me->DespawnOrUnsummon(); } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } private: SummonList _summons; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index fdf39519409..ff7092590e7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -124,7 +124,7 @@ class npc_announcer_toc10 : public CreatureScript pAlly->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void AttackStart(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE { } }; bool OnGossipHello(Player* player, Creature* creature) OVERRIDE @@ -547,9 +547,9 @@ class npc_tirion_toc : public CreatureScript _instance = me->GetInstanceScript(); } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 uiDiff) OVERRIDE { @@ -835,9 +835,9 @@ class npc_garrosh_toc : public CreatureScript _instance = me->GetInstanceScript(); } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 uiDiff) OVERRIDE { @@ -919,9 +919,9 @@ class npc_varian_toc : public CreatureScript _instance = me->GetInstanceScript(); } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 uiDiff) OVERRIDE { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index 003b313d28c..d8a4dd01f90 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -407,7 +407,7 @@ class player_overlord_brandAI : public PlayerAI me->CastCustomSpell(SPELL_OVERLORD_BRAND_HEAL, SPELLVALUE_BASE_POINT0, int32(addHealth*5.5f), tyrannus, true, NULL, NULL, tyrannus->GetGUID()); } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } private: uint64 _tyrannus; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp index 26a090f6bcf..a864d679b89 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp @@ -56,10 +56,10 @@ public: { boss_commander_kolurgAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 /*diff*/) OVERRIDE { @@ -69,7 +69,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE {} + void JustDied(Unit* /*killer*/) OVERRIDE { } }; }; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp index 25669c12ed9..93c5710d351 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp @@ -49,9 +49,9 @@ public: { boss_commander_stoutbeardAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} - void AttackStart(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void AttackStart(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 /*diff*/) OVERRIDE { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 9e98fddd21d..69f009a2ca2 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -858,7 +858,7 @@ class npc_pool_of_tar : public CreatureScript me->CastSpell(me, SPELL_BLAZE, true); } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } }; CreatureAI* GetAI(Creature* creature) const OVERRIDE diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index e28e86ade96..31c635c7de5 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -851,7 +851,7 @@ class npc_darkrune_watcher : public CreatureScript struct npc_darkrune_watcherAI : public ScriptedAI { - npc_darkrune_watcherAI(Creature* creature) : ScriptedAI(creature){} + npc_darkrune_watcherAI(Creature* creature) : ScriptedAI(creature){ } uint32 ChainTimer; uint32 LightTimer; @@ -900,7 +900,7 @@ class npc_darkrune_guardian : public CreatureScript struct npc_darkrune_guardianAI : public ScriptedAI { - npc_darkrune_guardianAI(Creature* creature) : ScriptedAI(creature){} + npc_darkrune_guardianAI(Creature* creature) : ScriptedAI(creature){ } uint32 StormTimer; @@ -955,7 +955,7 @@ class npc_darkrune_sentinel : public CreatureScript struct npc_darkrune_sentinelAI : public ScriptedAI { - npc_darkrune_sentinelAI(Creature* creature) : ScriptedAI(creature){} + npc_darkrune_sentinelAI(Creature* creature) : ScriptedAI(creature){ } uint32 HeroicTimer; uint32 WhirlTimer; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index bed7bd86b91..12925f1c6e1 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -459,7 +459,7 @@ class npc_xt002_heart : public CreatureScript SetCombatMovement(false); } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } void JustDied(Unit* /*killer*/) OVERRIDE { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index 7fcb624c35e..4ba6d948f1a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -1047,7 +1047,7 @@ class boss_brain_of_yogg_saron : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } void DoAction(int32 action) OVERRIDE { @@ -1132,7 +1132,7 @@ class npc_ominous_cloud : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } void DoAction(int32 action) OVERRIDE { @@ -1400,7 +1400,7 @@ class npc_influence_tentacle : public CreatureScript brain->AI()->DoAction(ACTION_TENTACLE_KILLED); } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } private: InstanceScript* _instance; @@ -1431,7 +1431,7 @@ class npc_descend_into_madness : public CreatureScript me->DespawnOrUnsummon(); } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } private: InstanceScript* _instance; @@ -1544,7 +1544,7 @@ class npc_observation_ring_keeper : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } }; CreatureAI* GetAI(Creature* creature) const OVERRIDE @@ -1914,7 +1914,7 @@ class npc_laughing_skull : public CreatureScript } // don't evade, otherwise the Lunatic Gaze aura is removed - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } }; CreatureAI* GetAI(Creature* creature) const OVERRIDE diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index b8fa87106a4..818631788b6 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -514,7 +514,7 @@ public: { npc_spectatorAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void MovementInform(uint32 motionType, uint32 pointId) OVERRIDE { diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 8f44e47dd74..80ebc01debc 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -87,7 +87,7 @@ public: instance->SetData(DATA_CYANIGOSA_EVENT, IN_PROGRESS); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 0052d7bc87e..883ea8fa0c0 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -142,7 +142,7 @@ public: } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE @@ -303,7 +303,7 @@ public: } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index efaa9a8644b..4852b6cea07 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -206,7 +206,7 @@ public: return 0; } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 uiDiff) OVERRIDE diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 5eaeaab8dc0..964f6b75e72 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -100,7 +100,7 @@ public: } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 2d53fdebde7..d5dd41e7a90 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -93,7 +93,7 @@ public: } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 20f7e7952fe..8b39c48fb92 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -152,7 +152,7 @@ public: } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 uiDiff) OVERRIDE diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index a3c84e248e7..3db389ac703 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -123,7 +123,7 @@ public: } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index db382dd9d72..c78a1ee1740 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -578,9 +578,9 @@ public: bPortalGuardianOrKeeperOrEliteSpawn = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE @@ -1342,7 +1342,7 @@ public: DoCast(me, SPELL_ARCANE_SPHERE_PASSIVE, true); } - void EnterCombat(Unit * /*who*/) OVERRIDE {} + void EnterCombat(Unit * /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 935860a6b0c..f5700358150 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -64,7 +64,7 @@ public: struct npc_sinkhole_kill_creditAI : public ScriptedAI { - npc_sinkhole_kill_creditAI(Creature* creature) : ScriptedAI(creature){} + npc_sinkhole_kill_creditAI(Creature* creature) : ScriptedAI(creature){ } uint32 phaseTimer; uint8 phase; @@ -90,7 +90,7 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -357,9 +357,9 @@ public: { npc_nerubar_victimAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void JustDied(Unit* killer) OVERRIDE @@ -557,8 +557,8 @@ public: go_caribouGUID = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void JustDied(Unit* /*killer*/) OVERRIDE @@ -672,7 +672,7 @@ public: struct npc_lurgglbrAI : public npc_escortAI { - npc_lurgglbrAI(Creature* creature) : npc_escortAI(creature){} + npc_lurgglbrAI(Creature* creature) : npc_escortAI(creature){ } uint32 IntroTimer; uint32 IntroPhase; @@ -2235,9 +2235,9 @@ public: m_uiTimer = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 uiDiff) OVERRIDE { diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index 6d6e2193c1b..99dd9569504 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -64,11 +64,11 @@ public: creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); } - void Reset()OVERRIDE {} + void Reset()OVERRIDE { } - void EnterCombat(Unit* /*who*/)OVERRIDE {} + void EnterCombat(Unit* /*who*/)OVERRIDE { } - void AttackStart(Unit* /*who*/)OVERRIDE {} + void AttackStart(Unit* /*who*/)OVERRIDE { } void MoveInLineOfSight(Unit* who) OVERRIDE @@ -118,7 +118,7 @@ public: return; } - void UpdateAI(uint32 /*diff*/)OVERRIDE {} + void UpdateAI(uint32 /*diff*/)OVERRIDE { } }; CreatureAI* GetAI(Creature* creature) const OVERRIDE diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index d942f05e5b0..9ea3023de01 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -219,7 +219,7 @@ public: { npc_mrfloppyAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void EnterCombat(Unit* Who) OVERRIDE { @@ -239,9 +239,9 @@ public: } } - void EnterEvadeMode() OVERRIDE {} + void EnterEvadeMode() OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 /*diff*/) OVERRIDE @@ -508,87 +508,6 @@ public: } }; -/*Lightning Sentry - if you kill it when you have your Minion with you, you will get a quest credit*/ -enum Sentry -{ - //Creature - NPC_LIGHTNING_SENTRY = 26407, - NPC_WAR_GOLEM = 27017, - // Quest - QUEST_OR_MAYBE_WE_DONT_A = 12138, - QUEST_OR_MAYBE_WE_DONT_H = 12198, - // Spell - SPELL_CHARGED_SENTRY_TOTEM = 52703, - SPELL_WAR_GOLEM_CHARGE_CREDIT = 47797, -}; - -enum SentryEvents -{ - EVENT_SENTRY = 1 -}; - -class npc_lightning_sentry : public CreatureScript -{ -public: - npc_lightning_sentry() : CreatureScript("npc_lightning_sentry") { } - - struct npc_lightning_sentryAI : public ScriptedAI - { - npc_lightning_sentryAI(Creature* creature) : ScriptedAI(creature) { } - - void Reset() OVERRIDE - { - _events.ScheduleEvent(EVENT_SENTRY, urand(10000, 12000)); - } - - void UpdateAI(uint32 diff) OVERRIDE - { - if (!UpdateVictim()) - return; - - _events.Update(diff); - - while (uint32 eventId = _events.ExecuteEvent()) - { - switch (eventId) - { - case EVENT_SENTRY: - DoCast(SPELL_CHARGED_SENTRY_TOTEM); - _events.ScheduleEvent(EVENT_SENTRY, urand(10000, 12000)); - break; - default: - break; - } - } - - if (!UpdateVictim()) - return; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* killer) OVERRIDE - { - if (killer->ToPlayer() && killer->ToPlayer()->GetTypeId() == TYPEID_PLAYER) - { - if (me->FindNearestCreature(NPC_WAR_GOLEM, 10.0f, true)) - { - if (killer->ToPlayer()->GetQuestStatus(QUEST_OR_MAYBE_WE_DONT_A) == QUEST_STATUS_INCOMPLETE || - killer->ToPlayer()->GetQuestStatus(QUEST_OR_MAYBE_WE_DONT_H) == QUEST_STATUS_INCOMPLETE) - DoCast(killer, SPELL_WAR_GOLEM_CHARGE_CREDIT); - } - } - } - private: - EventMap _events; - }; - - CreatureAI* GetAI(Creature* creature) const OVERRIDE - { - return new npc_lightning_sentryAI(creature); - } -}; - /*Venture co. Straggler - when you cast Smoke Bomb, he will yell and run away*/ enum SmokeEmOut { @@ -838,7 +757,6 @@ void AddSC_grizzly_hills() new npc_tallhorn_stag(); new npc_amberpine_woodsman(); new npc_wounded_skirmisher(); - new npc_lightning_sentry(); new npc_venture_co_straggler(); new npc_lake_frog(); } diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 4626ffabd79..671628e4cbc 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -71,7 +71,7 @@ public: struct npc_Apothecary_HanesAI : public npc_escortAI { - npc_Apothecary_HanesAI(Creature* creature) : npc_escortAI(creature){} + npc_Apothecary_HanesAI(Creature* creature) : npc_escortAI(creature){ } uint32 PotTimer; void Reset() OVERRIDE diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 814503498f0..d952321c749 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -364,7 +364,7 @@ enum TournamentDummy class npc_tournament_training_dummy : public CreatureScript { public: - npc_tournament_training_dummy(): CreatureScript("npc_tournament_training_dummy"){} + npc_tournament_training_dummy(): CreatureScript("npc_tournament_training_dummy"){ } struct npc_tournament_training_dummyAI : ScriptedAI { @@ -483,7 +483,7 @@ class npc_tournament_training_dummy : public CreatureScript me->SetControlled(true, UNIT_STATE_STUNNED); } - void MoveInLineOfSight(Unit* /*who*/)OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/)OVERRIDE { } }; @@ -616,9 +616,9 @@ public: events.ScheduleEvent(EVENT_SPAWN, 3000); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void JustSummoned(Creature* Summoned) OVERRIDE diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index a9998d1a708..77b85037a01 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -1073,7 +1073,7 @@ public: } } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } }; CreatureAI* GetAI(Creature* creature) const OVERRIDE diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 9d37087e505..83d49045eff 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -65,9 +65,9 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void JustDied(Unit* /*killer*/) OVERRIDE { @@ -325,9 +325,9 @@ public: { npc_icefangAI(Creature* creature) : npc_escortAI(creature) { } - void AttackStart(Unit* /*who*/) OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void EnterEvadeMode() OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterEvadeMode() OVERRIDE { } void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) OVERRIDE { diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index d43ec59f817..66415448d32 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -141,7 +141,7 @@ public: DoCast(me, SPELL_KNEEL, true); // Little Hack for kneel - Thanks Illy :P } - void MoveInLineOfSight(Unit* /*who*/)OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/)OVERRIDE { } void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 4083d6edc0e..862fe76decd 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -380,7 +380,7 @@ public: { npc_yorAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void EnterCombat(Unit* /*who*/) OVERRIDE { diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index be3a109b9f0..c077cec3c04 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -220,7 +220,7 @@ public: flamebuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -279,7 +279,7 @@ public: arcanebuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -333,7 +333,7 @@ public: frostbuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -388,7 +388,7 @@ public: shadowbuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index aceb664cb3d..718ac1667b8 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -534,7 +534,7 @@ public: ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit*) OVERRIDE {} + void MoveInLineOfSight(Unit*) OVERRIDE { } void JustDied(Unit* /*killer*/) OVERRIDE @@ -1154,10 +1154,10 @@ public: me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 2, 45738); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } - void EnterEvadeMode() OVERRIDE {} + void EnterEvadeMode() OVERRIDE { } void GetIllidanGUID(uint64 guid) { @@ -1428,8 +1428,8 @@ public: me->CombatStop(true); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void MovementInform(uint32 MovementType, uint32 /*Data*/) OVERRIDE @@ -1990,7 +1990,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* /*who*/)OVERRIDE {} + void EnterCombat(Unit* /*who*/)OVERRIDE { } void MoveInLineOfSight(Unit* who) OVERRIDE diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 92647cfb69f..1a2a55e6d00 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -784,7 +784,7 @@ public: CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void AttackStart(Unit* who) OVERRIDE { diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 06adfe524cb..b62e7b35a3c 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -283,9 +283,9 @@ public: } uint32 wait; - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void DoAction(int32 /*info*/) OVERRIDE diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 68873312d35..7d445e23053 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -76,9 +76,9 @@ public: TeronGUID = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void Despawn() @@ -149,7 +149,7 @@ public: CheckTeronTimer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void MoveInLineOfSight(Unit* who) OVERRIDE @@ -266,7 +266,7 @@ public: Done = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void MoveInLineOfSight(Unit* who) OVERRIDE diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index b2569a582ad..cf552abe042 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -164,10 +164,10 @@ public: } else TC_LOG_ERROR(LOG_FILTER_TSCR, ERROR_INST_DATA); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE @@ -277,9 +277,9 @@ public: me->SetDisplayId(11686); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void StartEvent(Unit* target) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index ff66dcb550c..1d233aa6da4 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -601,9 +601,9 @@ public: VashjGUID = instance->GetData64(DATA_LADYVASHJ); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE @@ -842,7 +842,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 308397eecc7..83ec5e053c0 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -801,7 +801,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE {} + void JustDied(Unit* /*killer*/) OVERRIDE { } }; }; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index cbab7f0caf0..48a4a1e5ecd 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -312,7 +312,7 @@ public: me->setFaction(14); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void MoveInLineOfSight(Unit* who) OVERRIDE diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index 05c8e3f7f64..d6162fd1ea4 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -155,7 +155,7 @@ public: WaterBoltVolley_Timer = 3000+rand()%3000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 7c31c0dab0c..241d0f8fec2 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -221,7 +221,7 @@ public: //react only if attacked } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index 10a0b63a7b5..887d51a43bf 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -78,7 +78,7 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void StartRageGen(Unit* /*caster*/) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp index 825c7173b18..ef3d317643b 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp @@ -132,12 +132,12 @@ public: DoCast(me, SPELL_SPORE_CLOUD, true); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp index c22dedd269e..47bd4e3bb6c 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp @@ -80,7 +80,7 @@ public: Striders.clear(); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void JustSummoned(Creature* summon) OVERRIDE { diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index cb37e3c5070..f6bceb78a14 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -300,7 +300,7 @@ class npc_shadowmoon_channeler : public CreatureScript struct npc_shadowmoon_channelerAI : public ScriptedAI { - npc_shadowmoon_channelerAI(Creature* creature) : ScriptedAI(creature){} + npc_shadowmoon_channelerAI(Creature* creature) : ScriptedAI(creature){ } uint32 ShadowBolt_Timer; uint32 MarkOfShadow_Timer; diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index ab31ef476f9..2388a67b3e5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -83,7 +83,7 @@ class boss_nazan : public CreatureScript Turn_Timer = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void IsSummonedBy(Unit* summoner) OVERRIDE { @@ -463,7 +463,7 @@ class npc_hellfire_sentry : public CreatureScript KidneyShot_Timer = urand(3000, 7000); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void JustDied(Unit* killer) OVERRIDE { diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index f99bb4ade85..f4ee716dc67 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -320,7 +320,7 @@ class boss_magtheridon : public CreatureScript Talk(SAY_DEATH); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void AttackStart(Unit* who) OVERRIDE diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 0fa642b66cf..981774a677b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -386,10 +386,10 @@ class npc_lesser_shadow_fissure : public CreatureScript { npc_lesser_shadow_fissureAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } }; CreatureAI* GetAI(Creature* creature) const OVERRIDE diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 59638a6f80f..5d789359864 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -157,7 +157,7 @@ class boss_alar : public CreatureScript summon->AI()->AttackStart(target); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void AttackStart(Unit* who) OVERRIDE { @@ -540,12 +540,12 @@ class npc_flame_patch_alar : public CreatureScript struct npc_flame_patch_alarAI : public ScriptedAI { npc_flame_patch_alarAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void UpdateAI(uint32 /*diff*/) OVERRIDE { } }; CreatureAI* GetAI(Creature* creature) const OVERRIDE diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 984844c3fa7..f109dcf22ba 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -1438,10 +1438,10 @@ class npc_kael_flamestrike : public CreatureScript me->setFaction(14); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -1551,7 +1551,7 @@ class npc_phoenix_egg_tk : public CreatureScript } //ignore any - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void AttackStart(Unit* who) OVERRIDE diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index 822f8f1d486..59dee587ef6 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -187,7 +187,7 @@ class npc_nether_wraith : public CreatureScript Detonation = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 58b1df439ee..9206636893c 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -122,7 +122,7 @@ class npc_millhouse_manastorm : public CreatureScript } } - void EnterCombat(Unit* /*who*/)OVERRIDE {} + void EnterCombat(Unit* /*who*/)OVERRIDE { } void KilledUnit(Unit* /*victim*/) OVERRIDE { @@ -308,7 +308,7 @@ class npc_warden_mellichar : public CreatureScript instance->SetData(TYPE_HARBINGERSKYRISS, NOT_STARTED); } - void AttackStart(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE { } void MoveInLineOfSight(Unit* who) OVERRIDE @@ -550,7 +550,7 @@ class npc_zerekethvoidzone : public CreatureScript DoCast(me, SPELL_VOID_ZONE_DAMAGE); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } }; CreatureAI* GetAI(Creature* creature) const OVERRIDE diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index c4daa3d14a9..eda90d3b734 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -112,7 +112,7 @@ class boss_harbinger_skyriss : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void JustDied(Unit* /*killer*/) OVERRIDE { @@ -291,9 +291,9 @@ class boss_harbinger_skyriss_illusion : public CreatureScript { boss_harbinger_skyriss_illusionAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } }; CreatureAI* GetAI(Creature* creature) const OVERRIDE diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 36a17996f94..68b7c4e8117 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -86,9 +86,9 @@ class npc_warp_splinter_treant : public CreatureScript check_Timer = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index f5a904d58c6..a005153a4fc 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -69,7 +69,7 @@ public: { npc_bladespire_ogreAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void UpdateAI(uint32 /*uiDiff*/) OVERRIDE { @@ -140,7 +140,7 @@ public: IntangiblePresence_Timer = 15000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void MoveInLineOfSight(Unit* who) OVERRIDE @@ -286,9 +286,9 @@ public: { npc_daranelleAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void MoveInLineOfSight(Unit* who) OVERRIDE @@ -470,7 +470,7 @@ public: OgreGUID = 0; } - void UpdateAI(uint32 /*uiDiff*/) OVERRIDE {} + void UpdateAI(uint32 /*uiDiff*/) OVERRIDE { } }; }; diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index dd13cdf1fc9..ed7d90cf808 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -424,7 +424,7 @@ public: } } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void EnterCombat(Unit* /*who*/) OVERRIDE { diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 1caddd24efa..c8e4241974e 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -330,9 +330,9 @@ public: { npc_creditmarker_visit_with_ancestorsAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void MoveInLineOfSight(Unit* who) OVERRIDE diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 7bb77644d0b..e69b6b017a4 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -102,7 +102,7 @@ public: add = NULL; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } /*void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { @@ -426,7 +426,7 @@ public: isEvent = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void JustSummoned(Creature* summoned) OVERRIDE { diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 716223c9a90..db25f9f6158 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -1286,7 +1286,7 @@ public: me->SetTarget(0); } - void EnterCombat(Unit* /*who*/)OVERRIDE {} + void EnterCombat(Unit* /*who*/)OVERRIDE { } void HandleAnimation() { @@ -1447,10 +1447,10 @@ public: me->SetVisible(false); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE { } void SummonNextWave(); @@ -1571,7 +1571,7 @@ public: Timers = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void JustDied(Unit* /*killer*/) OVERRIDE { @@ -1816,9 +1816,9 @@ public: { npc_enraged_spiritAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/)OVERRIDE {} + void EnterCombat(Unit* /*who*/)OVERRIDE { } void JustDied(Unit* /*killer*/) OVERRIDE { diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp index 52063bac5ca..adbec22ca2d 100644 --- a/src/server/scripts/Outland/zone_shattrath_city.cpp +++ b/src/server/scripts/Outland/zone_shattrath_city.cpp @@ -428,7 +428,7 @@ public: } } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } }; }; diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index 1909f12590c..ec7f5f976fd 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -83,7 +83,7 @@ public: me->setFaction(FACTION_HOSTILE); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void DoNice() { @@ -177,8 +177,8 @@ public: { npc_infested_root_walkerAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { @@ -223,7 +223,7 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void MoveInLineOfSight(Unit* who) OVERRIDE @@ -237,7 +237,7 @@ public: Start(false, false, who->GetGUID()); } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -264,8 +264,8 @@ public: { npc_rotting_forest_ragerAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { @@ -307,9 +307,9 @@ public: { npc_netherweb_victimAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void JustDied(Unit* killer) OVERRIDE @@ -414,7 +414,7 @@ public: me->setFaction(m_uiNormFaction); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp index bac252ffb1f..2497df76bb1 100644 --- a/src/server/scripts/Outland/zone_zangarmarsh.cpp +++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp @@ -190,7 +190,7 @@ public: me->setFaction(m_uiNormFaction); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -344,7 +344,7 @@ public: { npc_kayra_longmaneAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } void WaypointReached(uint32 waypointId) OVERRIDE { diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 3ab9a1511af..2f8d5fa2ce4 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -210,7 +210,11 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript pPosition = WorldLocation(571, 3802.38f, 3585.95f, 49.5765f, 0.0f); break; case 5340: - pPosition = WorldLocation(571, 3687.91f, 3577.28f, 473.342f, 0.0f); + if (player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE || + player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_COMPLETE) + pPosition = WorldLocation(571, 3687.91f, 3577.28f, 473.342f); + else + pPosition = WorldLocation(571, 3739.38f, 3567.09f, 341.58f); break; default: return false; diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 023dd416483..0f2a984860d 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -157,7 +157,7 @@ public: SpawnAssociation* SpawnAssoc; uint64 SpawnedGUID; - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } Creature* SummonGuard() { @@ -341,7 +341,7 @@ public: me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -458,7 +458,7 @@ public: } } - void EnterCombat(Unit* /*who*/)OVERRIDE {} + void EnterCombat(Unit* /*who*/)OVERRIDE { } void ReceiveEmote(Player* player, uint32 emote) OVERRIDE { @@ -687,7 +687,7 @@ public: void UpdateAI(uint32 diff) OVERRIDE; - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } }; bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE @@ -753,7 +753,7 @@ public: } } - void EnterCombat(Unit* /*who*/)OVERRIDE {} + void EnterCombat(Unit* /*who*/)OVERRIDE { } void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { @@ -936,7 +936,7 @@ public: me->SetHealth(me->CountPctFromMaxHealth(70)); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { @@ -1494,8 +1494,8 @@ public: { npc_steam_tonkAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } void OnPossess(bool apply) { @@ -1542,9 +1542,9 @@ public: ExplosionTimer = 3000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE @@ -1673,7 +1673,7 @@ public: } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } }; CreatureAI* GetAI(Creature* creature) const OVERRIDE @@ -2387,7 +2387,7 @@ public: me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void DoAction(int32 /*param*/) OVERRIDE { diff --git a/src/server/shared/Configuration/Config.cpp b/src/server/shared/Configuration/Config.cpp index 47d59a57100..055c33b40ee 100644 --- a/src/server/shared/Configuration/Config.cpp +++ b/src/server/shared/Configuration/Config.cpp @@ -117,3 +117,35 @@ std::string const& ConfigMgr::GetFilename() GuardType guard(_configLock); return _filename; } + +std::list<std::string> ConfigMgr::GetKeysByString(std::string const& name) +{ + GuardType guard(_configLock); + + std::list<std::string> keys; + if (_config.get() == 0) + return keys; + + ACE_TString section_name; + ACE_Configuration_Section_Key section_key; + const ACE_Configuration_Section_Key &root_key = _config->root_section(); + + int i = 0; + while (_config->enumerate_sections(root_key, i++, section_name) == 0) + { + _config->open_section(root_key, section_name.c_str(), 0, section_key); + + ACE_TString key_name; + ACE_Configuration::VALUETYPE type; + int j = 0; + while (_config->enumerate_values(section_key, j++, key_name, type) == 0) + { + std::string temp = key_name.c_str(); + + if (!temp.find(name)) + keys.push_back(temp); + } + } + + return keys; +} diff --git a/src/server/shared/Configuration/Config.h b/src/server/shared/Configuration/Config.h index d633e37f0c4..49f5c5e07fb 100644 --- a/src/server/shared/Configuration/Config.h +++ b/src/server/shared/Configuration/Config.h @@ -20,7 +20,7 @@ #define CONFIG_H #include <string> -#include <map> +#include <list> #include <ace/Singleton.h> #include <ace/Configuration_Import_Export.h> #include <ace/Thread_Mutex.h> @@ -56,6 +56,7 @@ public: float GetFloatDefault(const char* name, float def); std::string const& GetFilename(); + std::list<std::string> GetKeysByString(std::string const& name); private: bool GetValueHelper(const char* name, ACE_TString &result); diff --git a/src/server/shared/DataStores/DBCFileLoader.cpp b/src/server/shared/DataStores/DBCFileLoader.cpp index 3a61057510e..356cf15007e 100644 --- a/src/server/shared/DataStores/DBCFileLoader.cpp +++ b/src/server/shared/DataStores/DBCFileLoader.cpp @@ -23,9 +23,7 @@ #include "DBCFileLoader.h" #include "Errors.h" -DBCFileLoader::DBCFileLoader() : fieldsOffset(NULL), data(NULL), stringTable(NULL) -{ -} +DBCFileLoader::DBCFileLoader() : fieldsOffset(NULL), data(NULL), stringTable(NULL) { } bool DBCFileLoader::Load(const char* filename, const char* fmt) { diff --git a/src/server/shared/DataStores/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h index 884418f6896..5eeaffe659e 100644 --- a/src/server/shared/DataStores/DBCFileLoader.h +++ b/src/server/shared/DataStores/DBCFileLoader.h @@ -62,7 +62,7 @@ class DBCFileLoader } private: - Record(DBCFileLoader &file_, unsigned char *offset_): offset(offset_), file(file_) {} + Record(DBCFileLoader &file_, unsigned char *offset_): offset(offset_), file(file_) { } unsigned char *offset; DBCFileLoader &file; diff --git a/src/server/shared/Database/DatabaseWorker.h b/src/server/shared/Database/DatabaseWorker.h index 252517e336e..179806d29cb 100644 --- a/src/server/shared/Database/DatabaseWorker.h +++ b/src/server/shared/Database/DatabaseWorker.h @@ -33,7 +33,7 @@ class DatabaseWorker : protected ACE_Task_Base int wait() { return ACE_Task_Base::wait(); } private: - DatabaseWorker() : ACE_Task_Base() {} + DatabaseWorker() : ACE_Task_Base() { } ACE_Activation_Queue* m_queue; MySQLConnection* m_conn; }; diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.h b/src/server/shared/Database/Implementation/CharacterDatabase.h index abe1f070953..ccbacc56c92 100755 --- a/src/server/shared/Database/Implementation/CharacterDatabase.h +++ b/src/server/shared/Database/Implementation/CharacterDatabase.h @@ -25,8 +25,8 @@ class CharacterDatabaseConnection : public MySQLConnection { public: //- Constructors for sync and async connections - CharacterDatabaseConnection(MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) {} - CharacterDatabaseConnection(ACE_Activation_Queue* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) {} + CharacterDatabaseConnection(MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) { } + CharacterDatabaseConnection(ACE_Activation_Queue* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) { } //- Loads database type specific prepared statements void DoPrepareStatements(); diff --git a/src/server/shared/Database/Implementation/LoginDatabase.h b/src/server/shared/Database/Implementation/LoginDatabase.h index abb1e1c7b13..c9d34a26617 100644 --- a/src/server/shared/Database/Implementation/LoginDatabase.h +++ b/src/server/shared/Database/Implementation/LoginDatabase.h @@ -25,8 +25,8 @@ class LoginDatabaseConnection : public MySQLConnection { public: //- Constructors for sync and async connections - LoginDatabaseConnection(MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) {} - LoginDatabaseConnection(ACE_Activation_Queue* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) {} + LoginDatabaseConnection(MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) { } + LoginDatabaseConnection(ACE_Activation_Queue* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) { } //- Loads database type specific prepared statements void DoPrepareStatements(); diff --git a/src/server/shared/Database/Implementation/WorldDatabase.h b/src/server/shared/Database/Implementation/WorldDatabase.h index b17aa0dedbb..0126cdc3a80 100644 --- a/src/server/shared/Database/Implementation/WorldDatabase.h +++ b/src/server/shared/Database/Implementation/WorldDatabase.h @@ -25,8 +25,8 @@ class WorldDatabaseConnection : public MySQLConnection { public: //- Constructors for sync and async connections - WorldDatabaseConnection(MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) {} - WorldDatabaseConnection(ACE_Activation_Queue* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) {} + WorldDatabaseConnection(MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) { } + WorldDatabaseConnection(ACE_Activation_Queue* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) { } //- Loads database type specific prepared statements void DoPrepareStatements(); diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp index 4307cab98f2..25ffbc18614 100644 --- a/src/server/shared/Database/MySQLConnection.cpp +++ b/src/server/shared/Database/MySQLConnection.cpp @@ -41,9 +41,7 @@ m_queue(NULL), m_worker(NULL), m_Mysql(NULL), m_connectionInfo(connInfo), -m_connectionFlags(CONNECTION_SYNCH) -{ -} +m_connectionFlags(CONNECTION_SYNCH) { } MySQLConnection::MySQLConnection(ACE_Activation_Queue* queue, MySQLConnectionInfo& connInfo) : m_reconnecting(false), diff --git a/src/server/shared/Database/MySQLConnection.h b/src/server/shared/Database/MySQLConnection.h index 989c447fcd5..656d7917315 100644 --- a/src/server/shared/Database/MySQLConnection.h +++ b/src/server/shared/Database/MySQLConnection.h @@ -38,7 +38,7 @@ enum ConnectionFlags struct MySQLConnectionInfo { - MySQLConnectionInfo() {} + MySQLConnectionInfo() { } MySQLConnectionInfo(const std::string& infoString) { Tokenizer tokens(infoString, ';'); diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp index 24097ca41c5..84f1e1b6fd1 100644 --- a/src/server/shared/Database/PreparedStatement.cpp +++ b/src/server/shared/Database/PreparedStatement.cpp @@ -21,13 +21,9 @@ PreparedStatement::PreparedStatement(uint32 index) : m_stmt(NULL), -m_index(index) -{ -} +m_index(index) { } -PreparedStatement::~PreparedStatement() -{ -} +PreparedStatement::~PreparedStatement() { } void PreparedStatement::BindParameters() { @@ -451,16 +447,12 @@ std::string MySQLPreparedStatement::getQueryString(std::string const& sqlPattern //- Execution PreparedStatementTask::PreparedStatementTask(PreparedStatement* stmt) : m_stmt(stmt), -m_has_result(false) -{ -} +m_has_result(false) { } PreparedStatementTask::PreparedStatementTask(PreparedStatement* stmt, PreparedQueryResultFuture result) : m_stmt(stmt), m_has_result(true), -m_result(result) -{ -} +m_result(result) { } PreparedStatementTask::~PreparedStatementTask() diff --git a/src/server/shared/Database/QueryHolder.cpp b/src/server/shared/Database/QueryHolder.cpp index 0a7c19af6d0..31a464ed165 100644 --- a/src/server/shared/Database/QueryHolder.cpp +++ b/src/server/shared/Database/QueryHolder.cpp @@ -169,6 +169,9 @@ void SQLQueryHolder::SetSize(size_t size) bool SQLQueryHolderTask::Execute() { + //the result can't be ready as we are processing it right now + ASSERT(!m_result.ready()); + if (!m_holder) return false; diff --git a/src/server/shared/Database/QueryHolder.h b/src/server/shared/Database/QueryHolder.h index fd2cbcacbcc..05c9e869290 100644 --- a/src/server/shared/Database/QueryHolder.h +++ b/src/server/shared/Database/QueryHolder.h @@ -27,7 +27,7 @@ class SQLQueryHolder typedef std::pair<SQLElementData, SQLResultSetUnion> SQLResultPair; std::vector<SQLResultPair> m_queries; public: - SQLQueryHolder() {} + SQLQueryHolder() { } ~SQLQueryHolder(); bool SetQuery(size_t index, const char *sql); bool SetPQuery(size_t index, const char *format, ...) ATTR_PRINTF(3, 4); @@ -49,7 +49,7 @@ class SQLQueryHolderTask : public SQLOperation public: SQLQueryHolderTask(SQLQueryHolder *holder, QueryResultHolderFuture res) - : m_holder(holder), m_result(res){}; + : m_holder(holder), m_result(res){ }; bool Execute(); }; diff --git a/src/server/shared/Database/SQLOperation.h b/src/server/shared/Database/SQLOperation.h index 400355e7c76..d7870a7d22e 100644 --- a/src/server/shared/Database/SQLOperation.h +++ b/src/server/shared/Database/SQLOperation.h @@ -59,7 +59,7 @@ class MySQLConnection; class SQLOperation : public ACE_Method_Request { public: - SQLOperation(): m_conn(NULL) {} + SQLOperation(): m_conn(NULL) { } virtual int call() { Execute(); diff --git a/src/server/shared/Database/Transaction.h b/src/server/shared/Database/Transaction.h index 026cc1fdf96..e8e5a743a63 100644 --- a/src/server/shared/Database/Transaction.h +++ b/src/server/shared/Database/Transaction.h @@ -33,7 +33,7 @@ class Transaction friend class DatabaseWorkerPool; public: - Transaction() : _cleanedUp(false) {} + Transaction() : _cleanedUp(false) { } ~Transaction() { Cleanup(); } void Append(PreparedStatement* statement); @@ -59,8 +59,8 @@ class TransactionTask : public SQLOperation friend class DatabaseWorker; public: - TransactionTask(SQLTransaction trans) : m_trans(trans) {} ; - ~TransactionTask(){}; + TransactionTask(SQLTransaction trans) : m_trans(trans) { } ; + ~TransactionTask(){ }; protected: bool Execute(); diff --git a/src/server/shared/Dynamic/FactoryHolder.h b/src/server/shared/Dynamic/FactoryHolder.h index f0b45a8924b..cea8cb9c0bb 100644 --- a/src/server/shared/Dynamic/FactoryHolder.h +++ b/src/server/shared/Dynamic/FactoryHolder.h @@ -33,8 +33,8 @@ class FactoryHolder friend class ACE_Singleton<FactoryHolderRegistry, ACE_Null_Mutex>; typedef ACE_Singleton<FactoryHolderRegistry, ACE_Null_Mutex> FactoryHolderRepository; - FactoryHolder(Key k) : i_key(k) {} - virtual ~FactoryHolder() {} + FactoryHolder(Key k) : i_key(k) { } + virtual ~FactoryHolder() { } inline Key key() const { return i_key; } void RegisterSelf(void) { FactoryHolderRepository::instance()->InsertItem(this, i_key); } @@ -54,7 +54,7 @@ template<class T> class Permissible { public: - virtual ~Permissible() {} + virtual ~Permissible() { } virtual int Permit(const T *) const = 0; }; #endif diff --git a/src/server/shared/Dynamic/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h index a7c230554e2..c8a6a88e473 100644 --- a/src/server/shared/Dynamic/LinkedList.h +++ b/src/server/shared/Dynamic/LinkedList.h @@ -33,7 +33,7 @@ class LinkedListElement LinkedListElement* iNext; LinkedListElement* iPrev; public: - LinkedListElement(): iNext(NULL), iPrev(NULL) {} + LinkedListElement(): iNext(NULL), iPrev(NULL) { } ~LinkedListElement() { delink(); } bool hasNext() const { return(iNext && iNext->iNext != NULL); } diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h index 6be75c296d8..8604f3431e0 100644 --- a/src/server/shared/Dynamic/LinkedReference/Reference.h +++ b/src/server/shared/Dynamic/LinkedReference/Reference.h @@ -40,7 +40,7 @@ template <class TO, class FROM> class Reference : public LinkedListElement virtual void sourceObjectDestroyLink() = 0; public: Reference() { iRefTo = NULL; iRefFrom = NULL; } - virtual ~Reference() {} + virtual ~Reference() { } // Create new link void link(TO* toObj, FROM* fromObj) diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h index 2d7f12b0069..1b402eb3be1 100644 --- a/src/server/shared/Dynamic/ObjectRegistry.h +++ b/src/server/shared/Dynamic/ObjectRegistry.h @@ -92,7 +92,7 @@ class ObjectRegistry return i_registeredObjects; } - ObjectRegistry() {} + ObjectRegistry() { } ~ObjectRegistry() { for (typename RegistryMapType::iterator iter=i_registeredObjects.begin(); iter != i_registeredObjects.end(); ++iter) diff --git a/src/server/shared/Dynamic/TypeContainer.h b/src/server/shared/Dynamic/TypeContainer.h index 10d6ba324c4..a99a448e0b8 100644 --- a/src/server/shared/Dynamic/TypeContainer.h +++ b/src/server/shared/Dynamic/TypeContainer.h @@ -60,7 +60,7 @@ template<class OBJECT> struct ContainerArrayList }; // termination condition -template<> struct ContainerArrayList<TypeNull> {}; +template<> struct ContainerArrayList<TypeNull> { }; // recursion template<class H, class T> struct ContainerArrayList<TypeList<H, T> > { @@ -78,7 +78,7 @@ template<class OBJECT> struct ContainerList }; /* TypeNull is underfined */ -template<> struct ContainerList<TypeNull> {}; +template<> struct ContainerList<TypeNull> { }; template<class H, class T> struct ContainerList<TypeList<H, T> > { ContainerList<H> _elements; diff --git a/src/server/shared/Dynamic/TypeContainerVisitor.h b/src/server/shared/Dynamic/TypeContainerVisitor.h index 800a21bed5d..8ca3ee8dbc4 100644 --- a/src/server/shared/Dynamic/TypeContainerVisitor.h +++ b/src/server/shared/Dynamic/TypeContainerVisitor.h @@ -38,9 +38,7 @@ template<class VISITOR, class TYPE_CONTAINER> void VisitorHelper(VISITOR &v, TYP } // terminate condition for container list -template<class VISITOR> void VisitorHelper(VISITOR &/*v*/, ContainerList<TypeNull> &/*c*/) -{ -} +template<class VISITOR> void VisitorHelper(VISITOR &/*v*/, ContainerList<TypeNull> &/*c*/) { } template<class VISITOR, class T> void VisitorHelper(VISITOR &v, ContainerList<T> &c) { @@ -55,9 +53,7 @@ template<class VISITOR, class H, class T> void VisitorHelper(VISITOR &v, Contain } // terminate condition container map list -template<class VISITOR> void VisitorHelper(VISITOR &/*v*/, ContainerMapList<TypeNull> &/*c*/) -{ -} +template<class VISITOR> void VisitorHelper(VISITOR &/*v*/, ContainerMapList<TypeNull> &/*c*/) { } template<class VISITOR, class T> void VisitorHelper(VISITOR &v, ContainerMapList<T> &c) { @@ -77,9 +73,7 @@ template<class VISITOR, class T> void VisitorHelper(VISITOR &v, ContainerArrayLi v.Visit(c._element); } -template<class VISITOR> void VisitorHelper(VISITOR &/*v*/, ContainerArrayList<TypeNull> &/*c*/) -{ -} +template<class VISITOR> void VisitorHelper(VISITOR &/*v*/, ContainerArrayList<TypeNull> &/*c*/) { } // recursion template<class VISITOR, class H, class T> void VisitorHelper(VISITOR &v, ContainerArrayList<TypeList<H, T> > &c) @@ -98,7 +92,7 @@ template<class VISITOR, class TYPE_CONTAINER> class TypeContainerVisitor { public: - TypeContainerVisitor(VISITOR &v) : i_visitor(v) {} + TypeContainerVisitor(VISITOR &v) : i_visitor(v) { } void Visit(TYPE_CONTAINER &c) { diff --git a/src/server/shared/Logging/Appender.cpp b/src/server/shared/Logging/Appender.cpp index f47cbc3b095..06aa6159014 100644 --- a/src/server/shared/Logging/Appender.cpp +++ b/src/server/shared/Logging/Appender.cpp @@ -33,13 +33,9 @@ std::string LogMessage::getTimeStr() } Appender::Appender(uint8 _id, std::string const& _name, AppenderType _type /* = APPENDER_NONE*/, LogLevel _level /* = LOG_LEVEL_DISABLED */, AppenderFlags _flags /* = APPENDER_FLAGS_NONE */): -id(_id), name(_name), type(_type), level(_level), flags(_flags) -{ -} +id(_id), name(_name), type(_type), level(_level), flags(_flags) { } -Appender::~Appender() -{ -} +Appender::~Appender() { } uint8 Appender::getId() const { @@ -78,7 +74,7 @@ void Appender::write(LogMessage& message) message.prefix.clear(); if (flags & APPENDER_FLAGS_PREFIX_TIMESTAMP) - message.prefix.append(message.getTimeStr().c_str()); + message.prefix.append(message.getTimeStr()); if (flags & APPENDER_FLAGS_PREFIX_LOGLEVEL) { @@ -95,9 +91,9 @@ void Appender::write(LogMessage& message) if (!message.prefix.empty()) message.prefix.push_back(' '); - char text[MAX_QUERY_LEN]; - snprintf(text, MAX_QUERY_LEN, "[%s]", Appender::getLogFilterTypeString(message.type)); - message.prefix.append(text); + message.prefix.push_back('['); + message.prefix.append(message.type); + message.prefix.push_back(']'); } if (!message.prefix.empty()) @@ -126,104 +122,3 @@ const char* Appender::getLogLevelString(LogLevel level) return "DISABLED"; } } - -char const* Appender::getLogFilterTypeString(LogFilterType type) -{ - switch (type) - { - case LOG_FILTER_GENERAL: - return "GENERAL"; - case LOG_FILTER_UNITS: - return "UNITS"; - case LOG_FILTER_PETS: - return "PETS"; - case LOG_FILTER_VEHICLES: - return "VEHICLES"; - case LOG_FILTER_TSCR: - return "TSCR"; - case LOG_FILTER_DATABASE_AI: - return "DATABASE_AI"; - case LOG_FILTER_MAPSCRIPTS: - return "MAPSCRIPTS"; - case LOG_FILTER_NETWORKIO: - return "NETWORKIO"; - case LOG_FILTER_SPELLS_AURAS: - return "SPELLS_AURAS"; - case LOG_FILTER_ACHIEVEMENTSYS: - return "ACHIEVEMENTSYS"; - case LOG_FILTER_CONDITIONSYS: - return "CONDITIONSYS"; - case LOG_FILTER_POOLSYS: - return "POOLSYS"; - case LOG_FILTER_AUCTIONHOUSE: - return "AUCTIONHOUSE"; - case LOG_FILTER_BATTLEGROUND: - return "BATTLEGROUND"; - case LOG_FILTER_OUTDOORPVP: - return "OUTDOORPVP"; - case LOG_FILTER_CHATSYS: - return "CHATSYS"; - case LOG_FILTER_LFG: - return "LFG"; - case LOG_FILTER_MAPS: - return "MAPS"; - case LOG_FILTER_PLAYER: - return "PLAYER"; - case LOG_FILTER_PLAYER_LOADING: - return "PLAYER LOADING"; - case LOG_FILTER_PLAYER_ITEMS: - return "PLAYER ITEMS"; - case LOG_FILTER_PLAYER_SKILLS: - return "PLAYER SKILLS"; - case LOG_FILTER_PLAYER_CHATLOG: - return "PLAYER CHATLOG"; - case LOG_FILTER_LOOT: - return "LOOT"; - case LOG_FILTER_GUILD: - return "GUILD"; - case LOG_FILTER_TRANSPORTS: - return "TRANSPORTS"; - case LOG_FILTER_SQL: - return "SQL"; - case LOG_FILTER_GMCOMMAND: - return "GMCOMMAND"; - case LOG_FILTER_REMOTECOMMAND: - return "REMOTECOMMAND"; - case LOG_FILTER_WARDEN: - return "WARDEN"; - case LOG_FILTER_AUTHSERVER: - return "AUTHSERVER"; - case LOG_FILTER_WORLDSERVER: - return "WORLDSERVER"; - case LOG_FILTER_GAMEEVENTS: - return "GAMEEVENTS"; - case LOG_FILTER_CALENDAR: - return "CALENDAR"; - case LOG_FILTER_CHARACTER: - return "CHARACTER"; - case LOG_FILTER_ARENAS: - return "ARENAS"; - case LOG_FILTER_SQL_DRIVER: - return "SQL DRIVER"; - case LOG_FILTER_SQL_DEV: - return "SQL DEV"; - case LOG_FILTER_PLAYER_DUMP: - return "PLAYER DUMP"; - case LOG_FILTER_BATTLEFIELD: - return "BATTLEFIELD"; - case LOG_FILTER_SERVER_LOADING: - return "SERVER LOADING"; - case LOG_FILTER_OPCODES: - return "OPCODE"; - case LOG_FILTER_SOAP: - return "SOAP"; - case LOG_FILTER_RBAC: - return "RBAC"; - case LOG_FILTER_CHEAT: - return "CHEAT"; - default: - break; - } - - return "???"; -} diff --git a/src/server/shared/Logging/Appender.h b/src/server/shared/Logging/Appender.h index 14fe52f0837..f5a8d4cd435 100644 --- a/src/server/shared/Logging/Appender.h +++ b/src/server/shared/Logging/Appender.h @@ -24,57 +24,6 @@ #include <string> -enum LogFilterType -{ - LOG_FILTER_GENERAL = 0, // This one should only be used inside Log.cpp - LOG_FILTER_UNITS = 1, // Anything related to units that doesn't fit in other categories. ie. creature formations - LOG_FILTER_PETS = 2, - LOG_FILTER_VEHICLES = 3, - LOG_FILTER_TSCR = 4, // C++ AI, instance scripts, etc. - LOG_FILTER_DATABASE_AI = 5, // SmartAI, EventAI, Creature* * AI - LOG_FILTER_MAPSCRIPTS = 6, - LOG_FILTER_NETWORKIO = 7, - LOG_FILTER_SPELLS_AURAS = 8, - LOG_FILTER_ACHIEVEMENTSYS = 9, - LOG_FILTER_CONDITIONSYS = 10, - LOG_FILTER_POOLSYS = 11, - LOG_FILTER_AUCTIONHOUSE = 12, - LOG_FILTER_BATTLEGROUND = 13, - LOG_FILTER_OUTDOORPVP = 14, - LOG_FILTER_CHATSYS = 15, - LOG_FILTER_LFG = 16, - LOG_FILTER_MAPS = 17, - LOG_FILTER_PLAYER = 18, // Any player log that does not fit in other player filters - LOG_FILTER_PLAYER_LOADING = 19, // Debug output from Player::_Load functions - LOG_FILTER_PLAYER_ITEMS = 20, - LOG_FILTER_PLAYER_SKILLS = 21, - LOG_FILTER_PLAYER_CHATLOG = 22, - LOG_FILTER_LOOT = 23, - LOG_FILTER_GUILD = 24, - LOG_FILTER_TRANSPORTS = 25, - LOG_FILTER_SQL = 26, - LOG_FILTER_GMCOMMAND = 27, - LOG_FILTER_REMOTECOMMAND = 28, - LOG_FILTER_WARDEN = 29, - LOG_FILTER_AUTHSERVER = 30, - LOG_FILTER_WORLDSERVER = 31, - LOG_FILTER_GAMEEVENTS = 32, - LOG_FILTER_CALENDAR = 33, - LOG_FILTER_CHARACTER = 34, - LOG_FILTER_ARENAS = 35, - LOG_FILTER_SQL_DRIVER = 36, - LOG_FILTER_SQL_DEV = 37, - LOG_FILTER_PLAYER_DUMP = 38, - LOG_FILTER_BATTLEFIELD = 39, - LOG_FILTER_SERVER_LOADING = 40, - LOG_FILTER_OPCODES = 41, - LOG_FILTER_SOAP = 42, - LOG_FILTER_RBAC = 43, - LOG_FILTER_CHEAT = 44 -}; - -const uint8 MaxLogFilter = 45; - // Values assigned have their equivalent in enum ACE_Log_Priority enum LogLevel { @@ -109,7 +58,7 @@ enum AppenderFlags struct LogMessage { - LogMessage(LogLevel _level, LogFilterType _type, std::string _text) + LogMessage(LogLevel _level, std::string const& _type, std::string const& _text) : level(_level), type(_type), text(_text), mtime(time(NULL)) { } @@ -117,7 +66,7 @@ struct LogMessage std::string getTimeStr(); LogLevel level; - LogFilterType type; + std::string type; std::string text; std::string prefix; std::string param1; @@ -145,7 +94,6 @@ class Appender void setLogLevel(LogLevel); void write(LogMessage& message); static const char* getLogLevelString(LogLevel level); - static const char* getLogFilterTypeString(LogFilterType type); private: virtual void _write(LogMessage const& /*message*/) = 0; diff --git a/src/server/shared/Logging/AppenderDB.cpp b/src/server/shared/Logging/AppenderDB.cpp index ae5fc17de73..c461186089c 100644 --- a/src/server/shared/Logging/AppenderDB.cpp +++ b/src/server/shared/Logging/AppenderDB.cpp @@ -19,35 +19,23 @@ #include "Database/DatabaseEnv.h" AppenderDB::AppenderDB(uint8 id, std::string const& name, LogLevel level) - : Appender(id, name, APPENDER_DB, level), realmId(0), enabled(false) -{ -} + : Appender(id, name, APPENDER_DB, level), realmId(0), enabled(false) { } -AppenderDB::~AppenderDB() -{ -} +AppenderDB::~AppenderDB() { } void AppenderDB::_write(LogMessage const& message) { - if (!enabled) + // Avoid infinite loop, PExecute triggers Logging with LOG_FILTER_SQL type + if (!enabled || !message.type.find("sql")) return; - switch (message.type) - { - case LOG_FILTER_SQL: - case LOG_FILTER_SQL_DRIVER: - case LOG_FILTER_SQL_DEV: - break; // Avoid infinite loop, PExecute triggers Logging with LOG_FILTER_SQL type - default: - PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_LOG); - stmt->setUInt64(0, message.mtime); - stmt->setUInt32(1, realmId); - stmt->setUInt8(2, uint8(message.type)); - stmt->setUInt8(3, uint8(message.level)); - stmt->setString(4, message.text); - LoginDatabase.Execute(stmt); - break; - } + PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_LOG); + stmt->setUInt64(0, message.mtime); + stmt->setUInt32(1, realmId); + stmt->setString(2, message.type); + stmt->setUInt8(3, uint8(message.level)); + stmt->setString(4, message.text); + LoginDatabase.Execute(stmt); } void AppenderDB::setRealmId(uint32 _realmId) diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index e6400176155..9cd4e4a8cce 100644 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -57,13 +57,6 @@ std::string GetConfigStringDefault(std::string base, const char* name, const cha return sConfigMgr->GetStringDefault(base.c_str(), value); } -// Returns default logger if the requested logger is not found -Logger* Log::GetLoggerByType(LogFilterType filterType) -{ - LoggerMap::iterator it = loggers.find(static_cast<uint8>(filterType)); - return it == loggers.end() ? &loggers[0] : &it->second; -} - Appender* Log::GetAppenderByName(std::string const& name) { AppenderMap::iterator it = appenders.begin(); @@ -73,24 +66,23 @@ Appender* Log::GetAppenderByName(std::string const& name) return it == appenders.end() ? NULL : it->second; } -void Log::CreateAppenderFromConfig(const char* name) +void Log::CreateAppenderFromConfig(std::string const& appenderName) { - if (!name || *name == '\0') + if (appenderName.empty()) return; // Format=type, level, flags, optional1, optional2 // if type = File. optional1 = file and option2 = mode // if type = Console. optional1 = Color - std::string options = "Appender."; - options.append(name); - options = sConfigMgr->GetStringDefault(options.c_str(), ""); + std::string options = sConfigMgr->GetStringDefault(appenderName.c_str(), ""); Tokenizer tokens(options, ','); Tokenizer::const_iterator iter = tokens.begin(); uint8 size = tokens.size(); + std::string name = appenderName.substr(9); if (size < 2) { - fprintf(stderr, "Log::CreateAppenderFromConfig: Wrong configuration for appender %s. Config line: %s\n", name, options.c_str()); + fprintf(stderr, "Log::CreateAppenderFromConfig: Wrong configuration for appender %s. Config line: %s\n", name.c_str(), options.c_str()); return; } @@ -99,7 +91,7 @@ void Log::CreateAppenderFromConfig(const char* name) LogLevel level = LogLevel(atoi(*(++iter))); if (level > LOG_LEVEL_FATAL) { - fprintf(stderr, "Log::CreateAppenderFromConfig: Wrong Log Level %d for appender %s\n", level, name); + fprintf(stderr, "Log::CreateAppenderFromConfig: Wrong Log Level %d for appender %s\n", level, name.c_str()); return; } @@ -114,7 +106,7 @@ void Log::CreateAppenderFromConfig(const char* name) appenders[appender->getId()] = appender; if (size > 3) appender->InitColors(*(++iter)); - //fprintf(stdout, "Log::CreateAppenderFromConfig: Created Appender %s (%u), Type CONSOLE, Mask %u\n", appender->getName().c_str(), appender->getId(), appender->getLogLevel()); // DEBUG - RemoveMe + //fprintf(stdout, "Log::CreateAppenderFromConfig: Created Appender %s (%u), Type CONSOLE, Mask %u\n", appender->getName().c_str(), appender->getId(), appender->getLogLevel()); break; } case APPENDER_FILE: @@ -124,7 +116,7 @@ void Log::CreateAppenderFromConfig(const char* name) if (size < 4) { - fprintf(stderr, "Log::CreateAppenderFromConfig: Missing file name for appender %s\n", name); + fprintf(stderr, "Log::CreateAppenderFromConfig: Missing file name for appender %s\n", name.c_str()); return; } @@ -148,7 +140,7 @@ void Log::CreateAppenderFromConfig(const char* name) uint8 id = NextAppenderId(); appenders[id] = new AppenderFile(id, name, level, filename.c_str(), m_logsDir.c_str(), mode.c_str(), flags, maxFileSize); - //fprintf(stdout, "Log::CreateAppenderFromConfig: Created Appender %s (%u), Type FILE, Mask %u, File %s, Mode %s\n", name, id, level, filename.c_str(), mode.c_str()); // DEBUG - RemoveMe + //fprintf(stdout, "Log::CreateAppenderFromConfig: Created Appender %s (%u), Type FILE, Mask %u, File %s, Mode %s\n", name.c_str(), id, level, filename.c_str(), mode.c_str()); break; } case APPENDER_DB: @@ -158,62 +150,53 @@ void Log::CreateAppenderFromConfig(const char* name) break; } default: - fprintf(stderr, "Log::CreateAppenderFromConfig: Unknown type %d for appender %s\n", type, name); + fprintf(stderr, "Log::CreateAppenderFromConfig: Unknown type %d for appender %s\n", type, name.c_str()); break; } } -void Log::CreateLoggerFromConfig(const char* name) +void Log::CreateLoggerFromConfig(std::string const& appenderName) { - if (!name || *name == '\0') + if (appenderName.empty()) return; LogLevel level = LOG_LEVEL_DISABLED; uint8 type = uint8(-1); - std::string options = "Logger."; - options.append(name); - options = sConfigMgr->GetStringDefault(options.c_str(), ""); + std::string options = sConfigMgr->GetStringDefault(appenderName.c_str(), ""); + std::string name = appenderName.substr(7); if (options.empty()) { - fprintf(stderr, "Log::CreateLoggerFromConfig: Missing config option Logger.%s\n", name); + fprintf(stderr, "Log::CreateLoggerFromConfig: Missing config option Logger.%s\n", name.c_str()); return; } Tokenizer tokens(options, ','); Tokenizer::const_iterator iter = tokens.begin(); - if (tokens.size() != 3) - { - fprintf(stderr, "Log::CreateLoggerFromConfig: Wrong config option Logger.%s=%s\n", name, options.c_str()); - return; - } - - type = uint8(atoi(*iter)); - if (type > MaxLogFilter) + if (tokens.size() != 2) { - fprintf(stderr, "Log::CreateLoggerFromConfig: Wrong type %u for logger %s\n", type, name); + fprintf(stderr, "Log::CreateLoggerFromConfig: Wrong config option Logger.%s=%s\n", name.c_str(), options.c_str()); return; } - Logger& logger = loggers[type]; + Logger& logger = loggers[name]; if (!logger.getName().empty()) { - fprintf(stderr, "Error while configuring Logger %s. Already defined\n", name); + fprintf(stderr, "Error while configuring Logger %s. Already defined\n", name.c_str()); return; } - ++iter; level = LogLevel(atoi(*iter)); if (level > LOG_LEVEL_FATAL) { - fprintf(stderr, "Log::CreateLoggerFromConfig: Wrong Log Level %u for logger %s\n", type, name); + fprintf(stderr, "Log::CreateLoggerFromConfig: Wrong Log Level %u for logger %s\n", type, name.c_str()); return; } - logger.Create(name, LogFilterType(type), level); - //fprintf(stdout, "Log::CreateLoggerFromConfig: Created Logger %s, Type %u, mask %u\n", name, LogFilterType(type), level); // DEBUG - RemoveMe + logger.Create(name, level); + //fprintf(stdout, "Log::CreateLoggerFromConfig: Created Logger %s, Level %u\n", name.c_str(), level); ++iter; std::istringstream ss(*iter); @@ -225,63 +208,67 @@ void Log::CreateLoggerFromConfig(const char* name) if (Appender* appender = GetAppenderByName(str)) { logger.addAppender(appender->getId(), appender); - //fprintf(stdout, "Log::CreateLoggerFromConfig: Added Appender %s to Logger %s\n", appender->getName().c_str(), name); // DEBUG - RemoveMe + //fprintf(stdout, "Log::CreateLoggerFromConfig: Added Appender %s to Logger %s\n", appender->getName().c_str(), name.c_str()); } else - fprintf(stderr, "Error while configuring Appender %s in Logger %s. Appender does not exist", str.c_str(), name); + fprintf(stderr, "Error while configuring Appender %s in Logger %s. Appender does not exist", str.c_str(), name.c_str()); ss >> str; } } void Log::ReadAppendersFromConfig() { - std::istringstream ss(sConfigMgr->GetStringDefault("Appenders", "")); - std::string name; + std::list<std::string> keys = sConfigMgr->GetKeysByString("Appender."); - do + while (!keys.empty()) { - ss >> name; - CreateAppenderFromConfig(name.c_str()); - name = ""; + CreateAppenderFromConfig(keys.front()); + keys.pop_front(); } - while (ss); } void Log::ReadLoggersFromConfig() { - std::istringstream ss(sConfigMgr->GetStringDefault("Loggers", "")); - std::string name; + std::list<std::string> keys = sConfigMgr->GetKeysByString("Logger."); - do + while (!keys.empty()) { - ss >> name; - CreateLoggerFromConfig(name.c_str()); - name = ""; + CreateLoggerFromConfig(keys.front()); + keys.pop_front(); } - while (ss); - // root logger must exist. Marking as disabled as its not configured - if (loggers.find(LOG_FILTER_GENERAL) == loggers.end()) - loggers[LOG_FILTER_GENERAL].Create("root", LOG_FILTER_GENERAL, LOG_LEVEL_DISABLED); + // Bad config configuration, creating default config + if (loggers.find(LOGGER_ROOT) == loggers.end()) + { + fprintf(stderr, "Wrong Loggers configuration. Review your Logger config section.\n" + "Creating default loggers [root (Error), server (Info)] to console\n"); + + Close(); // Clean any Logger or Appender created + + AppenderConsole* appender = new AppenderConsole(NextAppenderId(), "Console", LOG_LEVEL_DEBUG, APPENDER_FLAGS_NONE); + appenders[appender->getId()] = appender; + + Logger& logger = loggers[LOGGER_ROOT]; + logger.Create(LOGGER_ROOT, LOG_LEVEL_ERROR); + logger.addAppender(appender->getId(), appender); + + logger = loggers["server"]; + logger.Create("server", LOG_LEVEL_ERROR); + logger.addAppender(appender->getId(), appender); + } } -void Log::vlog(LogFilterType filter, LogLevel level, char const* str, va_list argptr) +void Log::vlog(std::string const& filter, LogLevel level, char const* str, va_list argptr) { char text[MAX_QUERY_LEN]; vsnprintf(text, MAX_QUERY_LEN, str, argptr); write(new LogMessage(level, filter, text)); } -void Log::write(LogMessage* msg) +void Log::write(LogMessage* msg) const { - if (loggers.empty()) - { - delete msg; - return; - } - + Logger const* logger = GetLoggerByType(msg->type); msg->text.append("\n"); - Logger* logger = GetLoggerByType(msg->type); if (worker) worker->enqueue(new LogOperation(logger, msg)); @@ -336,7 +323,7 @@ bool Log::SetLogLevel(std::string const& name, const char* newLevelc, bool isLog return true; } -void Log::outTrace(LogFilterType filter, const char * str, ...) +void Log::outTrace(std::string const& filter, const char * str, ...) { va_list ap; va_start(ap, str); @@ -346,7 +333,7 @@ void Log::outTrace(LogFilterType filter, const char * str, ...) va_end(ap); } -void Log::outDebug(LogFilterType filter, const char * str, ...) +void Log::outDebug(std::string const& filter, const char * str, ...) { va_list ap; va_start(ap, str); @@ -356,7 +343,7 @@ void Log::outDebug(LogFilterType filter, const char * str, ...) va_end(ap); } -void Log::outInfo(LogFilterType filter, const char * str, ...) +void Log::outInfo(std::string const& filter, const char * str, ...) { va_list ap; va_start(ap, str); @@ -366,7 +353,7 @@ void Log::outInfo(LogFilterType filter, const char * str, ...) va_end(ap); } -void Log::outWarn(LogFilterType filter, const char * str, ...) +void Log::outWarn(std::string const& filter, const char * str, ...) { va_list ap; va_start(ap, str); @@ -376,7 +363,7 @@ void Log::outWarn(LogFilterType filter, const char * str, ...) va_end(ap); } -void Log::outError(LogFilterType filter, const char * str, ...) +void Log::outError(std::string const& filter, const char * str, ...) { va_list ap; va_start(ap, str); @@ -386,7 +373,7 @@ void Log::outError(LogFilterType filter, const char * str, ...) va_end(ap); } -void Log::outFatal(LogFilterType filter, const char * str, ...) +void Log::outFatal(std::string const& filter, const char * str, ...) { va_list ap; va_start(ap, str); diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h index e35e4f3ab7f..81daee02503 100644 --- a/src/server/shared/Logging/Log.h +++ b/src/server/shared/Logging/Log.h @@ -28,11 +28,60 @@ #include <string> #include <ace/Singleton.h> +// TODO: Replace all defines in core +#define LOG_FILTER_ACHIEVEMENTSYS "achievement" +#define LOG_FILTER_AUCTIONHOUSE "auctionHouse" +#define LOG_FILTER_ARENAS "bg.arena" +#define LOG_FILTER_BATTLEFIELD "bg.battlefield" +#define LOG_FILTER_BATTLEGROUND "bg.battleground" +#define LOG_FILTER_PLAYER_CHATLOG "chat.log" +#define LOG_FILTER_CALENDAR "calendar" +#define LOG_FILTER_CHATSYS "chat.system" +#define LOG_FILTER_CHEAT "cheat" +#define LOG_FILTER_REMOTECOMMAND "commands.ra" +#define LOG_FILTER_GMCOMMAND "commands.gm" +#define LOG_FILTER_CONDITIONSYS "condition" +#define LOG_FILTER_PETS "entities.pet" +#define LOG_FILTER_CHARACTER "entities.player.character" +#define LOG_FILTER_PLAYER_DUMP "entities.player.dump" +#define LOG_FILTER_PLAYER "entities.player" +#define LOG_FILTER_PLAYER_ITEMS "entities.player.items" +#define LOG_FILTER_PLAYER_LOADING "entities.player.loading" +#define LOG_FILTER_PLAYER_SKILLS "entities.player.skills" +#define LOG_FILTER_TRANSPORTS "entities.transport" +#define LOG_FILTER_UNITS "entities.unit" +#define LOG_FILTER_VEHICLES "entities.vehicle" +#define LOG_FILTER_GAMEEVENTS "gameevent" +#define LOG_FILTER_GUILD "guild" +#define LOG_FILTER_LFG "lfg" +#define LOG_FILTER_LOOT "loot" +#define LOG_FILTER_MAPSCRIPTS "maps.script" +#define LOG_FILTER_MAPS "maps" +#define LOG_FILTER_GENERAL "misc" +#define LOG_FILTER_NETWORKIO "network" +#define LOG_FILTER_OPCODES "network.opcode" +#define LOG_FILTER_SOAP "network.soap" +#define LOG_FILTER_OUTDOORPVP "outdoorpvp" +#define LOG_FILTER_POOLSYS "pool" +#define LOG_FILTER_RBAC "rbac" +#define LOG_FILTER_TSCR "scripts" +#define LOG_FILTER_DATABASE_AI "scripts.ai" +#define LOG_FILTER_SERVER_LOADING "server.loading" +#define LOG_FILTER_AUTHSERVER "server.authserver" +#define LOG_FILTER_WORLDSERVER "server.worldserver" +#define LOG_FILTER_SPELLS_AURAS "spells" +#define LOG_FILTER_SQL_DEV "sql.dev" +#define LOG_FILTER_SQL_DRIVER "sql.driver" +#define LOG_FILTER_SQL "sql.sql" +#define LOG_FILTER_WARDEN "warden" + +#define LOGGER_ROOT "root" + class Log { friend class ACE_Singleton<Log, ACE_Thread_Mutex>; - typedef UNORDERED_MAP<uint8, Logger> LoggerMap; + typedef UNORDERED_MAP<std::string, Logger> LoggerMap; private: Log(); @@ -41,15 +90,15 @@ class Log public: void LoadFromConfig(); void Close(); - bool ShouldLog(LogFilterType type, LogLevel level) const; + bool ShouldLog(std::string const& type, LogLevel level) const; bool SetLogLevel(std::string const& name, char const* level, bool isLogger = true); - void outTrace(LogFilterType f, char const* str, ...) ATTR_PRINTF(3, 4); - void outDebug(LogFilterType f, char const* str, ...) ATTR_PRINTF(3, 4); - void outInfo(LogFilterType f, char const* str, ...) ATTR_PRINTF(3, 4); - void outWarn(LogFilterType f, char const* str, ...) ATTR_PRINTF(3, 4); - void outError(LogFilterType f, char const* str, ...) ATTR_PRINTF(3, 4); - void outFatal(LogFilterType f, char const* str, ...) ATTR_PRINTF(3, 4); + void outTrace(std::string const& f, char const* str, ...) ATTR_PRINTF(3, 4); + void outDebug(std::string const& f, char const* str, ...) ATTR_PRINTF(3, 4); + void outInfo(std::string const& f, char const* str, ...) ATTR_PRINTF(3, 4); + void outWarn(std::string const& f, char const* str, ...) ATTR_PRINTF(3, 4); + void outError(std::string const& f, char const* str, ...) ATTR_PRINTF(3, 4); + void outFatal(std::string const& f, char const* str, ...) ATTR_PRINTF(3, 4); void outCommand(uint32 account, const char * str, ...) ATTR_PRINTF(3, 4); void outCharDump(char const* str, uint32 account_id, uint32 guid, char const* name); @@ -58,14 +107,14 @@ class Log void SetRealmId(uint32 id); private: - void vlog(LogFilterType f, LogLevel level, char const* str, va_list argptr); - void write(LogMessage* msg); + void vlog(std::string const& f, LogLevel level, char const* str, va_list argptr); + void write(LogMessage* msg) const; - Logger* GetLoggerByType(LogFilterType filter); + Logger const* GetLoggerByType(std::string const& type) const; Appender* GetAppenderByName(std::string const& name); uint8 NextAppenderId(); - void CreateAppenderFromConfig(const char* name); - void CreateLoggerFromConfig(const char* name); + void CreateAppenderFromConfig(std::string const& name); + void CreateLoggerFromConfig(std::string const& name); void ReadAppendersFromConfig(); void ReadLoggersFromConfig(); @@ -79,19 +128,35 @@ class Log LogWorker* worker; }; -inline bool Log::ShouldLog(LogFilterType type, LogLevel level) const +inline Logger const* Log::GetLoggerByType(std::string const& type) const { - LoggerMap::const_iterator it = loggers.find(uint8(type)); + LoggerMap::const_iterator it = loggers.find(type); if (it != loggers.end()) - { - LogLevel logLevel = it->second.getLogLevel(); - return logLevel != LOG_LEVEL_DISABLED && logLevel <= level; - } - - if (type != LOG_FILTER_GENERAL) - return ShouldLog(LOG_FILTER_GENERAL, level); - else + return &(it->second); + + if (type == LOGGER_ROOT) + return NULL; + + std::string parentLogger = LOGGER_ROOT; + size_t found = type.find_last_of("."); + if (found != std::string::npos) + parentLogger = type.substr(0,found); + + return GetLoggerByType(parentLogger); +} + +inline bool Log::ShouldLog(std::string const& type, LogLevel level) const +{ + // TODO: Use cache to store "Type.sub1.sub2": "Type" equivalence, should + // Speed up in cases where requesting "Type.sub1.sub2" but only configured + // Logger "Type" + + Logger const* logger = GetLoggerByType(type); + if (!logger) return false; + + LogLevel logLevel = logger->getLogLevel(); + return logLevel != LOG_LEVEL_DISABLED && logLevel <= level; } #define sLog ACE_Singleton<Log, ACE_Thread_Mutex>::instance() diff --git a/src/server/shared/Logging/LogOperation.h b/src/server/shared/Logging/LogOperation.h index 40017cb87f4..237f50de4ad 100644 --- a/src/server/shared/Logging/LogOperation.h +++ b/src/server/shared/Logging/LogOperation.h @@ -24,7 +24,7 @@ struct LogMessage; class LogOperation { public: - LogOperation(Logger* _logger, LogMessage* _msg) + LogOperation(Logger const* _logger, LogMessage* _msg) : logger(_logger), msg(_msg) { } @@ -33,8 +33,8 @@ class LogOperation int call(); protected: - Logger *logger; - LogMessage *msg; + Logger const* logger; + LogMessage* msg; }; #endif diff --git a/src/server/shared/Logging/Logger.cpp b/src/server/shared/Logging/Logger.cpp index 641a9ea1a4b..ea8ed27ed03 100644 --- a/src/server/shared/Logging/Logger.cpp +++ b/src/server/shared/Logging/Logger.cpp @@ -17,14 +17,11 @@ #include "Logger.h" -Logger::Logger(): name(""), type(LOG_FILTER_GENERAL), level(LOG_LEVEL_DISABLED) -{ -} +Logger::Logger(): name(""), level(LOG_LEVEL_DISABLED) { } -void Logger::Create(std::string const& _name, LogFilterType _type, LogLevel _level) +void Logger::Create(std::string const& _name, LogLevel _level) { name = _name; - type = _type; level = _level; } @@ -40,11 +37,6 @@ std::string const& Logger::getName() const return name; } -LogFilterType Logger::getType() const -{ - return type; -} - LogLevel Logger::getLogLevel() const { return level; @@ -70,7 +62,7 @@ void Logger::setLogLevel(LogLevel _level) level = _level; } -void Logger::write(LogMessage& message) +void Logger::write(LogMessage& message) const { if (!level || level > message.level || message.text.empty()) { @@ -78,7 +70,7 @@ void Logger::write(LogMessage& message) return; } - for (AppenderMap::iterator it = appenders.begin(); it != appenders.end(); ++it) + for (AppenderMap::const_iterator it = appenders.begin(); it != appenders.end(); ++it) if (it->second) it->second->write(message); } diff --git a/src/server/shared/Logging/Logger.h b/src/server/shared/Logging/Logger.h index 46436a8022e..e9d39830ce6 100644 --- a/src/server/shared/Logging/Logger.h +++ b/src/server/shared/Logging/Logger.h @@ -26,19 +26,17 @@ class Logger Logger(); ~Logger(); - void Create(std::string const& name, LogFilterType type, LogLevel level); + void Create(std::string const& name, LogLevel level); void addAppender(uint8 type, Appender *); void delAppender(uint8 type); std::string const& getName() const; - LogFilterType getType() const; LogLevel getLogLevel() const; void setLogLevel(LogLevel level); - void write(LogMessage& message); + void write(LogMessage& message) const; private: std::string name; - LogFilterType type; LogLevel level; AppenderMap appenders; }; diff --git a/src/server/shared/Threading/Callback.h b/src/server/shared/Threading/Callback.h index e0215f5b3d3..d4214cf0843 100644 --- a/src/server/shared/Threading/Callback.h +++ b/src/server/shared/Threading/Callback.h @@ -35,7 +35,7 @@ template <typename Result, typename ParamType, bool chain = false> class QueryCallback { public: - QueryCallback() : _param(), _stage(chain ? 0 : CALLBACK_STAGE_INVALID) {} + QueryCallback() : _param(), _stage(chain ? 0 : CALLBACK_STAGE_INVALID) { } //! The parameter of this function should be a resultset returned from either .AsyncQuery or .AsyncPQuery void SetFutureResult(ACE_Future<Result> value) @@ -115,7 +115,7 @@ template <typename Result, typename ParamType1, typename ParamType2, bool chain class QueryCallback_2 { public: - QueryCallback_2() : _stage(chain ? 0 : CALLBACK_STAGE_INVALID) {} + QueryCallback_2() : _stage(chain ? 0 : CALLBACK_STAGE_INVALID) { } //! The parameter of this function should be a resultset returned from either .AsyncQuery or .AsyncPQuery void SetFutureResult(ACE_Future<Result> value) diff --git a/src/server/shared/Threading/DelayExecutor.cpp b/src/server/shared/Threading/DelayExecutor.cpp index 685e86e2a2f..ba8a19429b2 100644 --- a/src/server/shared/Threading/DelayExecutor.cpp +++ b/src/server/shared/Threading/DelayExecutor.cpp @@ -10,9 +10,7 @@ DelayExecutor* DelayExecutor::instance() } DelayExecutor::DelayExecutor() - : pre_svc_hook_(0), post_svc_hook_(0), activated_(false) -{ -} + : pre_svc_hook_(0), post_svc_hook_(0), activated_(false) { } DelayExecutor::~DelayExecutor() { diff --git a/src/server/shared/Threading/Threading.h b/src/server/shared/Threading/Threading.h index 3f2c121d666..00be82c6555 100644 --- a/src/server/shared/Threading/Threading.h +++ b/src/server/shared/Threading/Threading.h @@ -30,7 +30,7 @@ namespace ACE_Based class Runnable { public: - virtual ~Runnable() {} + virtual ~Runnable() { } virtual void run() = 0; void incReference() { ++m_refs; } @@ -100,7 +100,7 @@ namespace ACE_Based typedef ACE_TSS<Thread> ThreadStorage; //global object - container for Thread class representation of every thread static ThreadStorage m_ThreadStorage; - //use this object to determine current OS thread priority values mapped to enum Priority{} + //use this object to determine current OS thread priority values mapped to enum Priority{ } static ThreadPriority m_TpEnum; }; diff --git a/src/server/shared/Utilities/ByteConverter.h b/src/server/shared/Utilities/ByteConverter.h index ffa467bb812..b114f8915a4 100644 --- a/src/server/shared/Utilities/ByteConverter.h +++ b/src/server/shared/Utilities/ByteConverter.h @@ -35,8 +35,8 @@ namespace ByteConverter convert<T - 2>(val + 1); } - template<> inline void convert<0>(char *) {} - template<> inline void convert<1>(char *) {} // ignore central byte + template<> inline void convert<0>(char *) { } + template<> inline void convert<1>(char *) { } // ignore central byte template<typename T> inline void apply(T *val) { diff --git a/src/server/shared/Utilities/EventProcessor.h b/src/server/shared/Utilities/EventProcessor.h index 69e14b98484..8abf0f09dfe 100644 --- a/src/server/shared/Utilities/EventProcessor.h +++ b/src/server/shared/Utilities/EventProcessor.h @@ -29,7 +29,7 @@ class BasicEvent { public: BasicEvent() { to_Abort = false; } - virtual ~BasicEvent() {} // override destructor to perform some actions on event removal + virtual ~BasicEvent() { } // override destructor to perform some actions on event removal // this method executes when the event is triggered // return false if event does not want to be deleted @@ -38,7 +38,7 @@ class BasicEvent virtual bool IsDeletable() const { return true; } // this event can be safely deleted - virtual void Abort(uint64 /*e_time*/) {} // this method executes when the event is aborted + virtual void Abort(uint64 /*e_time*/) { } // this method executes when the event is aborted bool to_Abort; // set by externals when the event is aborted, aborted events don't execute // and get Abort call when deleted diff --git a/src/server/shared/Utilities/SignalHandler.h b/src/server/shared/Utilities/SignalHandler.h index 8b49d586dcd..51bb9a4b27b 100644 --- a/src/server/shared/Utilities/SignalHandler.h +++ b/src/server/shared/Utilities/SignalHandler.h @@ -33,7 +33,7 @@ class SignalHandler : public ACE_Event_Handler HandleSignal(SigNum); return 0; } - virtual void HandleSignal(int /*SigNum*/) {}; + virtual void HandleSignal(int /*SigNum*/) { }; }; } diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index fdc21d29dda..14954f29f09 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -2671,79 +2671,13 @@ UI.ShowQuestLevelsInDialogs = 0 Appender.Console=1,3,0 Appender.Server=2,2,0,Server.log,w -Appender.GM=2,2,0,GM.log +Appender.GM=2,2,15,gm/gm_%s.log Appender.DBErrors=2,2,0,DBErrors.log -Appender.Char=2,2,0,Char.log,w -Appender.RA=2,2,0,RA.log -Appender.Warden=2,4,0,Warden.log -Appender.Chat=2,2,0,Chat.log -Appender.CharDump=2,2,0,%s.log -Appender.Arenas=2,2,0,Arena.log -Appender.SQLDev=2,2,0,SQLDev.log -Appender.SQLDriver=2,2,0,SQLDriver.log - -# Appenders -# Description: List of Appenders to read from config -# (Using spaces as separator). -# Default: "Console Server GM DBErrors Char RA Warden Chat" - -Appenders=Console Server GM DBErrors Char RA Warden Chat # Logger config values: Given a logger "name" # Logger.name # Description: Defines 'What to log' -# Format: Type,LogLevel,AppenderList -# Type -# 0 - Default. Each type that has no config will -# rely on this one. Core will create this logger -# (disabled) if it's not configured -# 1 - Units that doesn't fit in other categories -# 2 - Pets -# 3 - Vehicles -# 4 - C++ AI, instance scripts, etc. -# 5 - DB AI, such as SAI, EAI, CreatureAI -# 6 - DB map scripts -# 7 - Network input/output, -# such as packet handlers and netcode logs -# 8 - Spellsystem and aurasystem -# 9 - Achievement system -# 10 - Condition system -# 11 - Pool system -# 12 - Auction house -# 13 - Arena's and battlegrounds -# 14 - Outdoor PVP -# 15 - Chat system -# 16 - LFG system -# 17 - Maps, instances (not scripts), -# grids, cells, visibility, etc. -# 18 - Player that doesn't fit in other categories. -# 19 - Player loading from DB -# (Player::_LoadXXX functions) -# 20 - Items -# 21 - Player skills (do not confuse with spells) -# 22 - Player chat logs -# 23 - loot -# 24 - guilds -# 25 - transports -# 26 - SQL. DB errors -# 27 - GM Commands -# 28 - Remote Access Commands -# 29 - Warden -# 30 - Authserver -# 31 - Worldserver -# 32 - Game Events -# 33 - Calendar -# 34 - Character (Exclusive to log login, logout, create, rename) -# 35 - Arenas -# 36 - SQL Driver -# 37 - SQL Dev -# 38 - Player Dump -# 39 - Battlefield -# 40 - Server Loading -# 41 - Opcodes (just id and name sent / received) -# 42 - SOAP -# 43 - RBAC (Role Based Access Control) -# 44 - Cheat (used to log cheat attempts) +# Format: LogLevel,AppenderList # # LogLevel # 0 - (Disabled) @@ -2758,28 +2692,52 @@ Appenders=Console Server GM DBErrors Char RA Warden Chat # (Using spaces as separator). # -Logger.Root=0,5,Console Server -Logger.Chat=22,2,Chat -Logger.DBErrors=26,5,Console Server DBErrors -Logger.GM=27,3,Console Server GM -Logger.RA=28,3,RA -Logger.Warden=29,4,Warden -Logger.WorldServer=31,3,Console Server -Logger.Character=34,3,Char -Logger.Arenas=35,3,Arenas -Logger.SQLDriver=36,5,SQLDriver -Logger.SQLDev=37,3,SQLDev -Logger.CharDump=38,3,CharDump -Logger.Load=40,3,Console Server -Logger.Opcodes=41,6,Console Server - -# -# Loggers -# Description: List of Loggers to read from config -# (Using spaces as separator). -# Default: "Root Chat DBErrors GM RA Warden Character Load" - -Loggers=Root Chat DBErrors GM RA Warden Character Load WorldServer Opcodes +Logger.root=5,Console Server +Logger.server=3,Console Server +Logger.commands.gm=3,Console GM +Logger.sql.sql=5,Console DBErrors + +#Logger.achievement=3,Console Server +#Logger.auctionHouse=3,Console Server +#Logger.bg.arena=3,Console Server +#Logger.bg.battlefield=3,Console Server +#Logger.bg.battleground=3,Console Server +#Logger.chat.log=3,Console Server +#Logger.calendar=3,Console Server +#Logger.chat.system=3,Console Server +#Logger.cheat=3,Console Server +#Logger.commands.ra=3,Console Server +#Logger.condition=3,Console Server +#Logger.entities.pet=3,Console Server +#Logger.entities.player.character=3,Console Server +#Logger.entities.player.dump=3,Console Server +#Logger.entities.player=3,Console Server +#Logger.entities.player.items=3,Console Server +#Logger.entities.player.loading=3,Console Server +#Logger.entities.player.skills=3,Console Server +#Logger.entities.transport=3,Console Server +#Logger.entities.unit=3,Console Server +#Logger.entities.vehicle=3,Console Server +#Logger.gameevent=3,Console Server +#Logger.guild=3,Console Server +#Logger.lfg=3,Console Server +#Logger.loot=3,Console Server +#Logger.maps.script=3,Console Server +#Logger.maps=3,Console Server +#Logger.misc=3,Console Server +#Logger.network=3,Console Server +#Logger.network.opcode=3,Console Server +#Logger.network.soap=3,Console Server +#Logger.outdoorpvp=3,Console Server +#Logger.pool=3,Console Server +#Logger.rbac=3,Console Server +#Logger.scripts=3,Console Server +#Logger.scripts.ai=3,Console Server +#Logger.server.authserver=3,Console Server +#Logger.spells=3,Console Server +#Logger.sql.dev=3,Console Server +#Logger.sql.driver=3,Console Server +#Logger.warden=3,Console Server # # Log.Async.Enable diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index f9ecb147dd2..d824ac2a4f0 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #define _CRT_SECURE_NO_DEPRECATE #include <stdio.h> @@ -117,6 +135,12 @@ TCHAR const* LocalesT[] = void CreateDir(std::string const& path) { + if (chdir(Path.c_str()) == 0) + { + chdir("../"); + return; + } + #ifdef _WIN32 _mkdir(path.c_str()); #else @@ -1091,6 +1115,10 @@ void ExtractDBCFiles(int l, bool basicLocale) filename = foundFile.cFileName; filename = outputPath + filename.substr(filename.rfind('\\')); + + if (FileExists(filename.c_str())) + continue; + if (ExtractFile(dbcFile, filename.c_str())) ++count; diff --git a/src/tools/map_extractor/adt.cpp b/src/tools/map_extractor/adt.cpp index be96c2eb43f..b02387c62fb 100644 --- a/src/tools/map_extractor/adt.cpp +++ b/src/tools/map_extractor/adt.cpp @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #define _CRT_SECURE_NO_DEPRECATE #include "adt.h" diff --git a/src/tools/map_extractor/adt.h b/src/tools/map_extractor/adt.h index 20b5ac93540..e14661357dd 100644 --- a/src/tools/map_extractor/adt.h +++ b/src/tools/map_extractor/adt.h @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef ADT_H #define ADT_H diff --git a/src/tools/map_extractor/dbcfile.cpp b/src/tools/map_extractor/dbcfile.cpp index 021dc6f6e33..4bc87a8ab25 100644 --- a/src/tools/map_extractor/dbcfile.cpp +++ b/src/tools/map_extractor/dbcfile.cpp @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #define _CRT_SECURE_NO_DEPRECATE #include "dbcfile.h" diff --git a/src/tools/map_extractor/dbcfile.h b/src/tools/map_extractor/dbcfile.h index fa8734d9d63..5fa5062aef8 100644 --- a/src/tools/map_extractor/dbcfile.h +++ b/src/tools/map_extractor/dbcfile.h @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef DBCFILE_H #define DBCFILE_H #include <cassert> diff --git a/src/tools/map_extractor/loadlib.cpp b/src/tools/map_extractor/loadlib.cpp index d549a0c96f4..a8350bf2025 100644 --- a/src/tools/map_extractor/loadlib.cpp +++ b/src/tools/map_extractor/loadlib.cpp @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #define _CRT_SECURE_NO_DEPRECATE #include "loadlib.h" diff --git a/src/tools/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h index dd8a205a7b2..d083c752a55 100644 --- a/src/tools/map_extractor/loadlib/loadlib.h +++ b/src/tools/map_extractor/loadlib/loadlib.h @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef LOAD_LIB_H #define LOAD_LIB_H diff --git a/src/tools/map_extractor/wdt.cpp b/src/tools/map_extractor/wdt.cpp index f9f1d8a163c..b7b2ec51618 100644 --- a/src/tools/map_extractor/wdt.cpp +++ b/src/tools/map_extractor/wdt.cpp @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #define _CRT_SECURE_NO_DEPRECATE #include "wdt.h" diff --git a/src/tools/map_extractor/wdt.h b/src/tools/map_extractor/wdt.h index be6df3f173d..8c0ac35ca08 100644 --- a/src/tools/map_extractor/wdt.h +++ b/src/tools/map_extractor/wdt.h @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef WDT_H #define WDT_H #include "loadlib.h" diff --git a/src/tools/mesh_extractor/ADT.cpp b/src/tools/mesh_extractor/ADT.cpp index 79ece1213d4..a32276f9856 100644 --- a/src/tools/mesh_extractor/ADT.cpp +++ b/src/tools/mesh_extractor/ADT.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "ADT.h" #include "DoodadHandler.h" #include "LiquidHandler.h" diff --git a/src/tools/mesh_extractor/ADT.h b/src/tools/mesh_extractor/ADT.h index 6f9973f7cde..e5d27708bfc 100644 --- a/src/tools/mesh_extractor/ADT.h +++ b/src/tools/mesh_extractor/ADT.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef ADT_H #define ADT_H #include "ChunkedData.h" diff --git a/src/tools/mesh_extractor/Cache.h b/src/tools/mesh_extractor/Cache.h index 9b3e046fe1e..017b4c53f72 100644 --- a/src/tools/mesh_extractor/Cache.h +++ b/src/tools/mesh_extractor/Cache.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef CACHE_H #define CACHE_H #include <string> diff --git a/src/tools/mesh_extractor/Chunk.cpp b/src/tools/mesh_extractor/Chunk.cpp index 4605ae0f0dd..42eb9e14881 100644 --- a/src/tools/mesh_extractor/Chunk.cpp +++ b/src/tools/mesh_extractor/Chunk.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "Chunk.h" #include "Utils.h" diff --git a/src/tools/mesh_extractor/Chunk.h b/src/tools/mesh_extractor/Chunk.h index f3681a9f576..0641eb1dc3c 100644 --- a/src/tools/mesh_extractor/Chunk.h +++ b/src/tools/mesh_extractor/Chunk.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef CHUNK_H #define CHUNK_H #include "Define.h" diff --git a/src/tools/mesh_extractor/ChunkedData.cpp b/src/tools/mesh_extractor/ChunkedData.cpp index f273ef946dd..1330e4b47f9 100644 --- a/src/tools/mesh_extractor/ChunkedData.cpp +++ b/src/tools/mesh_extractor/ChunkedData.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "ChunkedData.h" #include "MPQManager.h" #include "Utils.h" diff --git a/src/tools/mesh_extractor/ChunkedData.h b/src/tools/mesh_extractor/ChunkedData.h index 1e1cb17749e..5befdf30dd1 100644 --- a/src/tools/mesh_extractor/ChunkedData.h +++ b/src/tools/mesh_extractor/ChunkedData.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef CHNK_H #define CHNK_H diff --git a/src/tools/mesh_extractor/Constants.h b/src/tools/mesh_extractor/Constants.h index f2d9e8af8f5..5a89be9fe9c 100644 --- a/src/tools/mesh_extractor/Constants.h +++ b/src/tools/mesh_extractor/Constants.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef CONSTANTS_H #define CONSTANTS_H diff --git a/src/tools/mesh_extractor/ContinentBuilder.cpp b/src/tools/mesh_extractor/ContinentBuilder.cpp index c90a6e527f7..841d7a608e4 100644 --- a/src/tools/mesh_extractor/ContinentBuilder.cpp +++ b/src/tools/mesh_extractor/ContinentBuilder.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "ContinentBuilder.h" #include "TileBuilder.h" #include "WDT.h" diff --git a/src/tools/mesh_extractor/ContinentBuilder.h b/src/tools/mesh_extractor/ContinentBuilder.h index 64d7be49aed..5349b8e1ba5 100644 --- a/src/tools/mesh_extractor/ContinentBuilder.h +++ b/src/tools/mesh_extractor/ContinentBuilder.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef CONT_BUILDER_H #define CONT_BUILDER_H #include <string> diff --git a/src/tools/mesh_extractor/DBC.cpp b/src/tools/mesh_extractor/DBC.cpp index 281a11d10dc..9249e320563 100644 --- a/src/tools/mesh_extractor/DBC.cpp +++ b/src/tools/mesh_extractor/DBC.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include <cstdio> #include "DBC.h" #include "Define.h" diff --git a/src/tools/mesh_extractor/DBC.h b/src/tools/mesh_extractor/DBC.h index 5ed57754e73..0d3b85d8c78 100644 --- a/src/tools/mesh_extractor/DBC.h +++ b/src/tools/mesh_extractor/DBC.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef DBC_H #define DBC_H #include <vector> diff --git a/src/tools/mesh_extractor/DoodadHandler.cpp b/src/tools/mesh_extractor/DoodadHandler.cpp index 72c051500e1..2e0743134d4 100644 --- a/src/tools/mesh_extractor/DoodadHandler.cpp +++ b/src/tools/mesh_extractor/DoodadHandler.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "DoodadHandler.h" #include "Chunk.h" #include "Cache.h" diff --git a/src/tools/mesh_extractor/DoodadHandler.h b/src/tools/mesh_extractor/DoodadHandler.h index 51377f32d01..c3a8d645016 100644 --- a/src/tools/mesh_extractor/DoodadHandler.h +++ b/src/tools/mesh_extractor/DoodadHandler.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef DOOADHNDL_H #define DOOADHNDL_H #include "ObjectDataHandler.h" diff --git a/src/tools/mesh_extractor/Geometry.cpp b/src/tools/mesh_extractor/Geometry.cpp index df828dcd573..0c7b7a492c5 100644 --- a/src/tools/mesh_extractor/Geometry.cpp +++ b/src/tools/mesh_extractor/Geometry.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "Geometry.h" #include "Constants.h" #include "ADT.h" diff --git a/src/tools/mesh_extractor/Geometry.h b/src/tools/mesh_extractor/Geometry.h index e445234dd12..f2ea43e381e 100644 --- a/src/tools/mesh_extractor/Geometry.h +++ b/src/tools/mesh_extractor/Geometry.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef GEOMETRY_H #define GEOMETRY_H #include <vector> diff --git a/src/tools/mesh_extractor/LiquidHandler.cpp b/src/tools/mesh_extractor/LiquidHandler.cpp index 33a661a9adf..eef36d8ea92 100644 --- a/src/tools/mesh_extractor/LiquidHandler.cpp +++ b/src/tools/mesh_extractor/LiquidHandler.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "LiquidHandler.h" #include "Utils.h" diff --git a/src/tools/mesh_extractor/LiquidHandler.h b/src/tools/mesh_extractor/LiquidHandler.h index 41e128ba20b..c053b621088 100644 --- a/src/tools/mesh_extractor/LiquidHandler.h +++ b/src/tools/mesh_extractor/LiquidHandler.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef LIQUID_H #define LIQUID_H #include "ADT.h" diff --git a/src/tools/mesh_extractor/MPQ.cpp b/src/tools/mesh_extractor/MPQ.cpp index 896d7bc32ac..5a2957cac0b 100644 --- a/src/tools/mesh_extractor/MPQ.cpp +++ b/src/tools/mesh_extractor/MPQ.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "MPQ.h" #include "MPQManager.h" #include <deque> diff --git a/src/tools/mesh_extractor/MPQ.h b/src/tools/mesh_extractor/MPQ.h index 30e11741550..17dbe74dcaa 100644 --- a/src/tools/mesh_extractor/MPQ.h +++ b/src/tools/mesh_extractor/MPQ.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef MPQ_H #define MPQ_H diff --git a/src/tools/mesh_extractor/MPQManager.cpp b/src/tools/mesh_extractor/MPQManager.cpp index 4d3ab808a2e..8954da6c154 100644 --- a/src/tools/mesh_extractor/MPQManager.cpp +++ b/src/tools/mesh_extractor/MPQManager.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "MPQManager.h" #include "MPQ.h" #include "DBC.h" diff --git a/src/tools/mesh_extractor/MPQManager.h b/src/tools/mesh_extractor/MPQManager.h index 7f9d675c4d4..6172237df49 100644 --- a/src/tools/mesh_extractor/MPQManager.h +++ b/src/tools/mesh_extractor/MPQManager.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef MPQ_MANAGER_H #define MPQ_MANAGER_H diff --git a/src/tools/mesh_extractor/MapChunk.cpp b/src/tools/mesh_extractor/MapChunk.cpp index 789166d5c9b..4cd5afad3f1 100644 --- a/src/tools/mesh_extractor/MapChunk.cpp +++ b/src/tools/mesh_extractor/MapChunk.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "MapChunk.h" #include "ADT.h" #include "LiquidHandler.h" diff --git a/src/tools/mesh_extractor/MapChunk.h b/src/tools/mesh_extractor/MapChunk.h index e7d835ae0e3..95bce9ffcd6 100644 --- a/src/tools/mesh_extractor/MapChunk.h +++ b/src/tools/mesh_extractor/MapChunk.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef MAPCHUNK_H #define MAPCHUNK_H #include "Chunk.h" diff --git a/src/tools/mesh_extractor/MeshExtractor.cpp b/src/tools/mesh_extractor/MeshExtractor.cpp index 0d9160a610b..e60e11b1db8 100644 --- a/src/tools/mesh_extractor/MeshExtractor.cpp +++ b/src/tools/mesh_extractor/MeshExtractor.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "MPQManager.h" #include "WDT.h" #include "ContinentBuilder.h" diff --git a/src/tools/mesh_extractor/Model.cpp b/src/tools/mesh_extractor/Model.cpp index 5fb521d5a36..2a1a80f41eb 100644 --- a/src/tools/mesh_extractor/Model.cpp +++ b/src/tools/mesh_extractor/Model.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "Model.h" #include "MPQManager.h" #include "Utils.h" diff --git a/src/tools/mesh_extractor/Model.h b/src/tools/mesh_extractor/Model.h index ed8627dad6f..a1f224729dd 100644 --- a/src/tools/mesh_extractor/Model.h +++ b/src/tools/mesh_extractor/Model.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef MODEL_H #define MODEL_H #include <vector> diff --git a/src/tools/mesh_extractor/ObjectDataHandler.cpp b/src/tools/mesh_extractor/ObjectDataHandler.cpp index f98d198eecd..0e06a9f7e56 100644 --- a/src/tools/mesh_extractor/ObjectDataHandler.cpp +++ b/src/tools/mesh_extractor/ObjectDataHandler.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "ObjectDataHandler.h" #include "Chunk.h" #include "ADT.h" diff --git a/src/tools/mesh_extractor/ObjectDataHandler.h b/src/tools/mesh_extractor/ObjectDataHandler.h index 9b347ef418a..3b18427db47 100644 --- a/src/tools/mesh_extractor/ObjectDataHandler.h +++ b/src/tools/mesh_extractor/ObjectDataHandler.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef ODATA_HNDL_H #define ODATA_HNDL_H #include "ADT.h" diff --git a/src/tools/mesh_extractor/TileBuilder.cpp b/src/tools/mesh_extractor/TileBuilder.cpp index 51df91d2652..7b70ccca44c 100644 --- a/src/tools/mesh_extractor/TileBuilder.cpp +++ b/src/tools/mesh_extractor/TileBuilder.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "ContinentBuilder.h" #include "TileBuilder.h" #include "Geometry.h" diff --git a/src/tools/mesh_extractor/TileBuilder.h b/src/tools/mesh_extractor/TileBuilder.h index 165b3594ed6..fb8950c552b 100644 --- a/src/tools/mesh_extractor/TileBuilder.h +++ b/src/tools/mesh_extractor/TileBuilder.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef TILE_BUILD_H #define TILE_BUILD_H #include <string> diff --git a/src/tools/mesh_extractor/Utils.cpp b/src/tools/mesh_extractor/Utils.cpp index 24cfb5cd1db..f82eb6ed1c8 100644 --- a/src/tools/mesh_extractor/Utils.cpp +++ b/src/tools/mesh_extractor/Utils.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "Utils.h" #include "WorldModelHandler.h" #include "Constants.h" diff --git a/src/tools/mesh_extractor/Utils.h b/src/tools/mesh_extractor/Utils.h index d6bb421a633..612282f3e8f 100644 --- a/src/tools/mesh_extractor/Utils.h +++ b/src/tools/mesh_extractor/Utils.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef UTILS_H #define UTILS_H #include <cstdio> diff --git a/src/tools/mesh_extractor/WDT.cpp b/src/tools/mesh_extractor/WDT.cpp index 2a5a18c9848..07aec95365e 100644 --- a/src/tools/mesh_extractor/WDT.cpp +++ b/src/tools/mesh_extractor/WDT.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "WDT.h" #include "Chunk.h" #include "ChunkedData.h" diff --git a/src/tools/mesh_extractor/WDT.h b/src/tools/mesh_extractor/WDT.h index ce8a97fff00..d1e8e30918d 100644 --- a/src/tools/mesh_extractor/WDT.h +++ b/src/tools/mesh_extractor/WDT.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef WDT_H #define WDT_H #include <string> diff --git a/src/tools/mesh_extractor/WorldModelGroup.cpp b/src/tools/mesh_extractor/WorldModelGroup.cpp index f76df73aaa6..6ea72d6edbe 100644 --- a/src/tools/mesh_extractor/WorldModelGroup.cpp +++ b/src/tools/mesh_extractor/WorldModelGroup.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "WorldModelGroup.h" #include "ChunkedData.h" #include "Chunk.h" diff --git a/src/tools/mesh_extractor/WorldModelGroup.h b/src/tools/mesh_extractor/WorldModelGroup.h index e4fe34cbc75..b3c2c2bd940 100644 --- a/src/tools/mesh_extractor/WorldModelGroup.h +++ b/src/tools/mesh_extractor/WorldModelGroup.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef WMOGROUP_H #define WMOGROUP_H #include "ChunkedData.h" diff --git a/src/tools/mesh_extractor/WorldModelHandler.cpp b/src/tools/mesh_extractor/WorldModelHandler.cpp index 3565a1d6af0..7c0acbc38e4 100644 --- a/src/tools/mesh_extractor/WorldModelHandler.cpp +++ b/src/tools/mesh_extractor/WorldModelHandler.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "WorldModelHandler.h" #include "WorldModelRoot.h" #include "Chunk.h" diff --git a/src/tools/mesh_extractor/WorldModelHandler.h b/src/tools/mesh_extractor/WorldModelHandler.h index 87a5ad62938..dd030e4521f 100644 --- a/src/tools/mesh_extractor/WorldModelHandler.h +++ b/src/tools/mesh_extractor/WorldModelHandler.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef WMODEL_HNDL_H #define WMODEL_HNDL_H #include "Define.h" diff --git a/src/tools/mesh_extractor/WorldModelRoot.cpp b/src/tools/mesh_extractor/WorldModelRoot.cpp index a00506f3b16..4b6e4e189a4 100644 --- a/src/tools/mesh_extractor/WorldModelRoot.cpp +++ b/src/tools/mesh_extractor/WorldModelRoot.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "WorldModelRoot.h" #include "ChunkedData.h" #include "Utils.h" diff --git a/src/tools/mesh_extractor/WorldModelRoot.h b/src/tools/mesh_extractor/WorldModelRoot.h index ad2e15b36d5..c2303ceafe4 100644 --- a/src/tools/mesh_extractor/WorldModelRoot.h +++ b/src/tools/mesh_extractor/WorldModelRoot.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef WMOROOT_H #define WMOROOT_H #include <string> diff --git a/src/tools/mmaps_generator/PathGenerator.cpp b/src/tools/mmaps_generator/PathGenerator.cpp index 882ec7ffb66..8ccd04f4924 100644 --- a/src/tools/mmaps_generator/PathGenerator.cpp +++ b/src/tools/mmaps_generator/PathGenerator.cpp @@ -1,19 +1,19 @@ /* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "PathCommon.h" diff --git a/src/tools/vmap4_assembler/VMapAssembler.cpp b/src/tools/vmap4_assembler/VMapAssembler.cpp index 4ee6f5fce3c..56368e4a78d 100644 --- a/src/tools/vmap4_assembler/VMapAssembler.cpp +++ b/src/tools/vmap4_assembler/VMapAssembler.cpp @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include <string> #include <iostream> diff --git a/src/tools/vmap4_extractor/adtfile.cpp b/src/tools/vmap4_extractor/adtfile.cpp index 18d400d29e8..e592e83246d 100644 --- a/src/tools/vmap4_extractor/adtfile.cpp +++ b/src/tools/vmap4_extractor/adtfile.cpp @@ -1,19 +1,19 @@ /* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "vmapexport.h" diff --git a/src/tools/vmap4_extractor/adtfile.h b/src/tools/vmap4_extractor/adtfile.h index 4f4b5157791..294029a8f44 100644 --- a/src/tools/vmap4_extractor/adtfile.h +++ b/src/tools/vmap4_extractor/adtfile.h @@ -1,19 +1,19 @@ /* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef ADT_H diff --git a/src/tools/vmap4_extractor/dbcfile.cpp b/src/tools/vmap4_extractor/dbcfile.cpp index efc8aeabe8c..429a41bc2c0 100644 --- a/src/tools/vmap4_extractor/dbcfile.cpp +++ b/src/tools/vmap4_extractor/dbcfile.cpp @@ -1,19 +1,19 @@ /* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #define _CRT_SECURE_NO_DEPRECATE diff --git a/src/tools/vmap4_extractor/dbcfile.h b/src/tools/vmap4_extractor/dbcfile.h index 0d0524473a4..0a63789fd28 100644 --- a/src/tools/vmap4_extractor/dbcfile.h +++ b/src/tools/vmap4_extractor/dbcfile.h @@ -1,19 +1,19 @@ /* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DBCFILE_H diff --git a/src/tools/vmap4_extractor/gameobject_extract.cpp b/src/tools/vmap4_extractor/gameobject_extract.cpp index af6d621248c..7cf28178887 100644 --- a/src/tools/vmap4_extractor/gameobject_extract.cpp +++ b/src/tools/vmap4_extractor/gameobject_extract.cpp @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "model.h" #include "dbcfile.h" #include "adtfile.h" diff --git a/src/tools/vmap4_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp index baa340b75bd..70862c540e7 100644 --- a/src/tools/vmap4_extractor/model.cpp +++ b/src/tools/vmap4_extractor/model.cpp @@ -1,19 +1,19 @@ /* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "vmapexport.h" diff --git a/src/tools/vmap4_extractor/model.h b/src/tools/vmap4_extractor/model.h index f73efa9fe80..89f69cd6011 100644 --- a/src/tools/vmap4_extractor/model.h +++ b/src/tools/vmap4_extractor/model.h @@ -1,19 +1,19 @@ /* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef MODEL_H diff --git a/src/tools/vmap4_extractor/modelheaders.h b/src/tools/vmap4_extractor/modelheaders.h index 7fd908d7442..108659e64b5 100644 --- a/src/tools/vmap4_extractor/modelheaders.h +++ b/src/tools/vmap4_extractor/modelheaders.h @@ -1,19 +1,19 @@ /* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef MODELHEADERS_H diff --git a/src/tools/vmap4_extractor/vec3d.h b/src/tools/vmap4_extractor/vec3d.h index 06a5b730f16..59150229ac7 100644 --- a/src/tools/vmap4_extractor/vec3d.h +++ b/src/tools/vmap4_extractor/vec3d.h @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef VEC3D_H #define VEC3D_H diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index cd9f552eaee..ea8e6021425 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -1,19 +1,19 @@ /* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #define _CRT_SECURE_NO_DEPRECATE diff --git a/src/tools/vmap4_extractor/vmapexport.h b/src/tools/vmap4_extractor/vmapexport.h index 0381011efb7..e9436eb7d0d 100644 --- a/src/tools/vmap4_extractor/vmapexport.h +++ b/src/tools/vmap4_extractor/vmapexport.h @@ -1,19 +1,19 @@ /* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef VMAPEXPORT_H diff --git a/src/tools/vmap4_extractor/wdtfile.cpp b/src/tools/vmap4_extractor/wdtfile.cpp index 13458bceb7c..ddf077d2904 100644 --- a/src/tools/vmap4_extractor/wdtfile.cpp +++ b/src/tools/vmap4_extractor/wdtfile.cpp @@ -1,19 +1,19 @@ /* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "vmapexport.h" diff --git a/src/tools/vmap4_extractor/wdtfile.h b/src/tools/vmap4_extractor/wdtfile.h index 31303d62928..da8b1511a6d 100644 --- a/src/tools/vmap4_extractor/wdtfile.h +++ b/src/tools/vmap4_extractor/wdtfile.h @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef WDTFILE_H #define WDTFILE_H diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp index d7fbd04679e..791d7001109 100644 --- a/src/tools/vmap4_extractor/wmo.cpp +++ b/src/tools/vmap4_extractor/wmo.cpp @@ -1,19 +1,19 @@ /* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "vmapexport.h" diff --git a/src/tools/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h index 204e4ead0ce..c7296045f5c 100644 --- a/src/tools/vmap4_extractor/wmo.h +++ b/src/tools/vmap4_extractor/wmo.h @@ -1,19 +1,19 @@ /* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef WMO_H |