diff --git a/Makefile.am b/Makefile.am index 2b292050f..2ac42231e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/NEWS b/NEWS index 747838331..9e8a10836 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ = MaNGOS -- History of visible changes = -Copyright (c) 2005-2009 MaNGOS project +Copyright (C) 2005-2010 MaNGOS project See the COPYING file for copying conditions. diff --git a/README b/README index dc49c8224..fc79a442e 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ = MaNGOS -- README = -Copyright (C) 2005-2009 MaNGOS project +Copyright (C) 2005-2010 MaNGOS project MaNGOS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -39,7 +39,7 @@ license details. For further information on the MaNGOS project, please visit our project web site at -Documenation on various development related topics can be found in the doc/ +Documentation on various development related topics can be found in the doc/ subdirectory, including Doxygen-generated API documentation. The required SQL files for creating the database backend are included in the diff --git a/configure.ac b/configure.ac index e380dfb24..588375817 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS project +# Copyright (C) 2005-2010 MaNGOS project # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/contrib/extractor/CMakeLists.txt b/contrib/extractor/CMakeLists.txt index 9052903b1..1d12c710a 100644 --- a/contrib/extractor/CMakeLists.txt +++ b/contrib/extractor/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS project +# Copyright (C) 2005-2010 MaNGOS project # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/contrib/extractor/libmpq/CMakeLists.txt b/contrib/extractor/libmpq/CMakeLists.txt index c00120c6e..4ddf40f15 100644 --- a/contrib/extractor/libmpq/CMakeLists.txt +++ b/contrib/extractor/libmpq/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS project +# Copyright (C) 2005-2010 MaNGOS project # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/contrib/extractor/loadlib/CMakeLists.txt b/contrib/extractor/loadlib/CMakeLists.txt index 5680c61d4..a5f30a321 100644 --- a/contrib/extractor/loadlib/CMakeLists.txt +++ b/contrib/extractor/loadlib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS project +# Copyright (C) 2005-2010 MaNGOS project # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/contrib/git_id/git_id.cpp b/contrib/git_id/git_id.cpp index 332202c7c..f99f5f5c3 100644 --- a/contrib/git_id/git_id.cpp +++ b/contrib/git_id/git_id.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -621,7 +621,7 @@ bool generate_sql_makefile() if(!fout) { pclose(cmd_pipe); return false; } fprintf(fout, - "# Copyright (C) 2005-2009 MaNGOS \n" + "# Copyright (C) 2005-2010 MaNGOS \n" "#\n" "# This program is free software; you can redistribute it and/or modify\n" "# it under the terms of the GNU General Public License as published by\n" diff --git a/contrib/mysql_to_pgsql/src/defines.h b/contrib/mysql_to_pgsql/src/defines.h index 3ffaf9923..16f5d2fb7 100644 --- a/contrib/mysql_to_pgsql/src/defines.h +++ b/contrib/mysql_to_pgsql/src/defines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/contrib/mysql_to_pgsql/src/main.cpp b/contrib/mysql_to_pgsql/src/main.cpp index 8ca6772de..95ceceec9 100644 --- a/contrib/mysql_to_pgsql/src/main.cpp +++ b/contrib/mysql_to_pgsql/src/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/dep/Makefile.am b/dep/Makefile.am index f2a9d7c95..527ce4d71 100644 --- a/dep/Makefile.am +++ b/dep/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2008 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/dep/include/Makefile.am b/dep/include/Makefile.am index 575c990fb..6fd6da0ff 100644 --- a/dep/include/Makefile.am +++ b/dep/include/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2008 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/dep/lib/Makefile.am b/dep/lib/Makefile.am index 5558f55a1..b89d8cd79 100644 --- a/dep/lib/Makefile.am +++ b/dep/lib/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2008 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/dep/src/Makefile.am b/dep/src/Makefile.am index 75964fe3d..a83e2a079 100644 --- a/dep/src/Makefile.am +++ b/dep/src/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2008 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/dep/src/sockets/Makefile.am b/dep/src/sockets/Makefile.am index f8abd3177..d4f1ad21c 100644 --- a/dep/src/sockets/Makefile.am +++ b/dep/src/sockets/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2008 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/doc/Makefile.am b/doc/Makefile.am index ef6954dcd..a8bce4149 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/sql/Makefile.am b/sql/Makefile.am index 6577db6ef..3c7fcd056 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/sql/mangos.sql b/sql/mangos.sql index 9076fb05d..f16c8e667 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -24,7 +24,7 @@ CREATE TABLE `db_version` ( `version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL, `cache_id` int(10) default '0', - `required_9074_01_mangos_command` bit(1) default NULL + `required_9121_01_mangos_npc_spellclick_spells` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -662,7 +662,7 @@ INSERT INTO `command` VALUES ('modify rage',1,'Syntax: .modify rage #newrage\r\n\r\nModify the rage of the selected player. If no player is selected, modify your rage.'), ('modify rep',2,'Syntax: .modify rep #repId (#repvalue | $rankname [#delta])\r\nSets the selected players reputation with faction #repId to #repvalue or to $reprank.\r\nIf the reputation rank name is provided, the resulting reputation will be the lowest reputation for that rank plus the delta amount, if specified.\r\nYou can use \'.pinfo rep\' to list all known reputation ids, or use \'.lookup faction $name\' to locate a specific faction id.'), ('modify runicpower',1,'Syntax: .modify runicpower #newrunicpower\r\n\r\nModify the runic power of the selected player. If no player is selected, modify your runic power.'), -('modify scale',1,''), +('modify scale',1,'Syntax: .modify scale #scale\r\n\r\nChange model scale for targeted player (util relogin) or creature (until respawn).'), ('modify speed',1,'Syntax: .modify speed #rate\r\n.speed #rate\r\n\r\nModify the running speed of the selected player to \"normal base run speed\"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 10.'), ('modify spell',1,''), ('modify standstate',2,'Syntax: .modify standstate #emoteid\r\n\r\nChange the emote of your character while standing to #emoteid.'), diff --git a/sql/tools/Makefile.am b/sql/tools/Makefile.am index 49a79346e..8e27632f0 100644 --- a/sql/tools/Makefile.am +++ b/sql/tools/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/sql/tools/README b/sql/tools/README index 1b9cdd79b..bba917b5a 100644 --- a/sql/tools/README +++ b/sql/tools/README @@ -1,6 +1,6 @@ = MaNGOS -- README = -Copyright (c) 2005-2009 MaNGOS +Copyright (c) 2005-2010 MaNGOS See the COPYING file for copying conditions. diff --git a/sql/updates/9095_01_mangos_command.sql b/sql/updates/9095_01_mangos_command.sql new file mode 100644 index 000000000..cd5913433 --- /dev/null +++ b/sql/updates/9095_01_mangos_command.sql @@ -0,0 +1,6 @@ +ALTER TABLE db_version CHANGE COLUMN required_9074_01_mangos_command required_9095_01_mangos_command bit; + +DELETE FROM command where name IN ('modify scale'); + +INSERT INTO `command` VALUES +('modify scale',1,'Syntax: .modify scale #scale\r\n\r\nChange model scale for targeted player (util relogin) or creature (until respawn).'); diff --git a/sql/updates/9121_01_mangos_npc_spellclick_spells.sql b/sql/updates/9121_01_mangos_npc_spellclick_spells.sql new file mode 100644 index 000000000..ffccf9144 --- /dev/null +++ b/sql/updates/9121_01_mangos_npc_spellclick_spells.sql @@ -0,0 +1,4 @@ +ALTER TABLE db_version CHANGE COLUMN required_9095_01_mangos_command required_9121_01_mangos_npc_spellclick_spells bit; + +UPDATE npc_spellclick_spells SET cast_flags=1 WHERE spell_id IN (50926,51026,51592,51961); +DELETE FROM npc_spellclick_spells WHERE spell_id IN (50927,50737,51593,51037); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index c6782d2ea..412df5a00 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 @@ -224,6 +224,8 @@ pkgdata_DATA = \ 9068_02_mangos_spell_chain.sql \ 9070_01_mangos_spell_proc_event.sql \ 9074_01_mangos_command.sql \ + 9095_01_mangos_command.sql \ + 9121_01_mangos_npc_spellclick_spells.sql \ README ## Additional files to include when running 'make dist' @@ -428,4 +430,6 @@ EXTRA_DIST = \ 9068_02_mangos_spell_chain.sql \ 9070_01_mangos_spell_proc_event.sql \ 9074_01_mangos_command.sql \ + 9095_01_mangos_command.sql \ + 9121_01_mangos_npc_spellclick_spells.sql \ README diff --git a/sql/updates/README b/sql/updates/README index fd1a2d1c1..91f2a124b 100644 --- a/sql/updates/README +++ b/sql/updates/README @@ -1,6 +1,6 @@ = MaNGOS -- README = -Copyright (c) 2005-2009 MaNGOS +Copyright (c) 2005-2010 MaNGOS See the COPYING file for copying conditions. diff --git a/src/Makefile.am b/src/Makefile.am index da5fc636f..f3692ffa6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am index 2cc0efde4..d7dc65486 100644 --- a/src/bindings/Makefile.am +++ b/src/bindings/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/src/bindings/universal/Makefile.am b/src/bindings/universal/Makefile.am index 2655e3aa0..bf43261e9 100644 --- a/src/bindings/universal/Makefile.am +++ b/src/bindings/universal/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/src/bindings/universal/ScriptMgr.cpp b/src/bindings/universal/ScriptMgr.cpp index 52e3a2e5e..abfc78d32 100644 --- a/src/bindings/universal/ScriptMgr.cpp +++ b/src/bindings/universal/ScriptMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/bindings/universal/ScriptMgr.h b/src/bindings/universal/ScriptMgr.h index daf4b02a2..9b32d7c27 100644 --- a/src/bindings/universal/ScriptMgr.h +++ b/src/bindings/universal/ScriptMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/bindings/universal/Scripts/sc_default.cpp b/src/bindings/universal/Scripts/sc_default.cpp index bcb0e3302..87e0fcb2f 100644 --- a/src/bindings/universal/Scripts/sc_default.cpp +++ b/src/bindings/universal/Scripts/sc_default.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/bindings/universal/Scripts/sc_defines.cpp b/src/bindings/universal/Scripts/sc_defines.cpp index 62e848913..d91a9e4f7 100644 --- a/src/bindings/universal/Scripts/sc_defines.cpp +++ b/src/bindings/universal/Scripts/sc_defines.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/bindings/universal/Scripts/sc_defines.h b/src/bindings/universal/Scripts/sc_defines.h index d9c9fde22..8048e0917 100644 --- a/src/bindings/universal/Scripts/sc_defines.h +++ b/src/bindings/universal/Scripts/sc_defines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/bindings/universal/config.h b/src/bindings/universal/config.h index a88e03cb8..d3b4c331b 100644 --- a/src/bindings/universal/config.h +++ b/src/bindings/universal/config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/bindings/universal/system.cpp b/src/bindings/universal/system.cpp index 6589f0fae..a559aa302 100644 --- a/src/bindings/universal/system.cpp +++ b/src/bindings/universal/system.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Dynamic/FactoryHolder.h b/src/framework/Dynamic/FactoryHolder.h index d564da4a7..0cf27029f 100644 --- a/src/framework/Dynamic/FactoryHolder.h +++ b/src/framework/Dynamic/FactoryHolder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/framework/Dynamic/ObjectRegistry.h index 068d5cd13..eafff1d8e 100644 --- a/src/framework/Dynamic/ObjectRegistry.h +++ b/src/framework/Dynamic/ObjectRegistry.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/GameSystem/Grid.h b/src/framework/GameSystem/Grid.h index ce1d5463e..c03361f55 100644 --- a/src/framework/GameSystem/Grid.h +++ b/src/framework/GameSystem/Grid.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/GameSystem/GridLoader.h b/src/framework/GameSystem/GridLoader.h index cde606646..486e0b145 100644 --- a/src/framework/GameSystem/GridLoader.h +++ b/src/framework/GameSystem/GridLoader.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/GameSystem/GridRefManager.h b/src/framework/GameSystem/GridRefManager.h index 021f0fe8c..77f611a08 100644 --- a/src/framework/GameSystem/GridRefManager.h +++ b/src/framework/GameSystem/GridRefManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/GameSystem/GridReference.h b/src/framework/GameSystem/GridReference.h index 57440b5a2..1e67f4359 100644 --- a/src/framework/GameSystem/GridReference.h +++ b/src/framework/GameSystem/GridReference.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h index 7393c3ddf..97eda7962 100644 --- a/src/framework/GameSystem/NGrid.h +++ b/src/framework/GameSystem/NGrid.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/GameSystem/TypeContainer.h b/src/framework/GameSystem/TypeContainer.h index 2b46ff67b..313f84af0 100644 --- a/src/framework/GameSystem/TypeContainer.h +++ b/src/framework/GameSystem/TypeContainer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/GameSystem/TypeContainerFunctions.h b/src/framework/GameSystem/TypeContainerFunctions.h index ebfcb1b86..29d386435 100644 --- a/src/framework/GameSystem/TypeContainerFunctions.h +++ b/src/framework/GameSystem/TypeContainerFunctions.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/GameSystem/TypeContainerFunctionsPtr.h b/src/framework/GameSystem/TypeContainerFunctionsPtr.h index 82028782b..de77b2e3c 100644 --- a/src/framework/GameSystem/TypeContainerFunctionsPtr.h +++ b/src/framework/GameSystem/TypeContainerFunctionsPtr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/GameSystem/TypeContainerVisitor.h b/src/framework/GameSystem/TypeContainerVisitor.h index 7ffd14a92..516ecedf2 100644 --- a/src/framework/GameSystem/TypeContainerVisitor.h +++ b/src/framework/GameSystem/TypeContainerVisitor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Makefile.am b/src/framework/Makefile.am index 756f5493e..63ad0e29a 100644 --- a/src/framework/Makefile.am +++ b/src/framework/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/src/framework/Network/SocketDefines.h b/src/framework/Network/SocketDefines.h index 9658cd60f..20b191d51 100644 --- a/src/framework/Network/SocketDefines.h +++ b/src/framework/Network/SocketDefines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Platform/CompilerDefs.h b/src/framework/Platform/CompilerDefs.h index e835491b4..d2059524d 100644 --- a/src/framework/Platform/CompilerDefs.h +++ b/src/framework/Platform/CompilerDefs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h index 769765bdb..ff00bec4a 100644 --- a/src/framework/Platform/Define.h +++ b/src/framework/Platform/Define.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Policies/CreationPolicy.h b/src/framework/Policies/CreationPolicy.h index 528f6cbbf..d4dc410ca 100644 --- a/src/framework/Policies/CreationPolicy.h +++ b/src/framework/Policies/CreationPolicy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Policies/MemoryManagement.cpp b/src/framework/Policies/MemoryManagement.cpp index 372ef0a7a..2b37af3a8 100644 --- a/src/framework/Policies/MemoryManagement.cpp +++ b/src/framework/Policies/MemoryManagement.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2009 MaNGOS +* Copyright (C) 2009-2010 MaNGOS * * 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 diff --git a/src/framework/Policies/ObjectLifeTime.cpp b/src/framework/Policies/ObjectLifeTime.cpp index 8f56ddb26..61afe646a 100644 --- a/src/framework/Policies/ObjectLifeTime.cpp +++ b/src/framework/Policies/ObjectLifeTime.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Policies/ObjectLifeTime.h b/src/framework/Policies/ObjectLifeTime.h index 82bf4ea8e..00d7add85 100644 --- a/src/framework/Policies/ObjectLifeTime.h +++ b/src/framework/Policies/ObjectLifeTime.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Policies/Singleton.h b/src/framework/Policies/Singleton.h index 9502fb120..02cb92be4 100644 --- a/src/framework/Policies/Singleton.h +++ b/src/framework/Policies/Singleton.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Policies/SingletonImp.h b/src/framework/Policies/SingletonImp.h index f1f5eaa17..85a7c4830 100644 --- a/src/framework/Policies/SingletonImp.h +++ b/src/framework/Policies/SingletonImp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Policies/ThreadingModel.h b/src/framework/Policies/ThreadingModel.h index cb2f79259..0345def50 100644 --- a/src/framework/Policies/ThreadingModel.h +++ b/src/framework/Policies/ThreadingModel.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Utilities/ByteConverter.h b/src/framework/Utilities/ByteConverter.h index c4bf7029a..13f3fac0b 100644 --- a/src/framework/Utilities/ByteConverter.h +++ b/src/framework/Utilities/ByteConverter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Utilities/Callback.h b/src/framework/Utilities/Callback.h index c2ed36421..49ef37f02 100644 --- a/src/framework/Utilities/Callback.h +++ b/src/framework/Utilities/Callback.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Utilities/EventProcessor.cpp b/src/framework/Utilities/EventProcessor.cpp index 74e1a73fa..060e6f678 100644 --- a/src/framework/Utilities/EventProcessor.cpp +++ b/src/framework/Utilities/EventProcessor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Utilities/EventProcessor.h b/src/framework/Utilities/EventProcessor.h index e395dd3f6..dca521b01 100644 --- a/src/framework/Utilities/EventProcessor.h +++ b/src/framework/Utilities/EventProcessor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Utilities/LinkedList.h b/src/framework/Utilities/LinkedList.h index 092ce9ffe..0ab71ad9f 100644 --- a/src/framework/Utilities/LinkedList.h +++ b/src/framework/Utilities/LinkedList.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Utilities/LinkedReference/RefManager.h b/src/framework/Utilities/LinkedReference/RefManager.h index 319c3ebf2..795718e29 100644 --- a/src/framework/Utilities/LinkedReference/RefManager.h +++ b/src/framework/Utilities/LinkedReference/RefManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Utilities/LinkedReference/Reference.h b/src/framework/Utilities/LinkedReference/Reference.h index 42e4b0484..8ba2b7435 100644 --- a/src/framework/Utilities/LinkedReference/Reference.h +++ b/src/framework/Utilities/LinkedReference/Reference.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Utilities/TypeList.h b/src/framework/Utilities/TypeList.h index 090f5aeba..804dfd949 100644 --- a/src/framework/Utilities/TypeList.h +++ b/src/framework/Utilities/TypeList.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/framework/Utilities/UnorderedMap.h b/src/framework/Utilities/UnorderedMap.h index 3a9a401a4..467b807d7 100644 --- a/src/framework/Utilities/UnorderedMap.h +++ b/src/framework/Utilities/UnorderedMap.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/AccountMgr.cpp b/src/game/AccountMgr.cpp index 163477409..9b73839f8 100644 --- a/src/game/AccountMgr.cpp +++ b/src/game/AccountMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/AccountMgr.h b/src/game/AccountMgr.h index be6cb169b..0097da8c2 100644 --- a/src/game/AccountMgr.h +++ b/src/game/AccountMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index 5a0d3ede5..90d82d086 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -93,6 +93,8 @@ bool AchievementCriteriaRequirement::IsValid(AchievementCriteriaEntry const* cri case ACHIEVEMENT_CRITERIA_TYPE_WIN_DUEL: case ACHIEVEMENT_CRITERIA_TYPE_LOOT_TYPE: case ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL2: + case ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET: + case ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2: break; default: sLog.outErrorDb( "Table `achievement_criteria_requirement` have data for not supported criteria type (Entry: %u Type: %u), ignore.", criteria->ID, criteria->requiredType); @@ -1033,10 +1035,21 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui } case ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET: case ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2: + { if (!miscvalue1 || miscvalue1 != achievementCriteria->be_spell_target.spellID) continue; + + // those requirements couldn't be found in the dbc + AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria); + if(!data) + continue; + + if(!data->Meets(GetPlayer(),unit)) + continue; + SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE); break; + } case ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL: case ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL2: { @@ -1912,6 +1925,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaRequirements() // this will allocate empty data set storage AchievementCriteriaRequirementSet& dataSet = m_criteriaRequirementMap[criteria_id]; + dataSet.SetCriteriaId(criteria_id); // counting disable criteria requirements if (data.requirementType == ACHIEVEMENT_CRITERIA_REQUIRE_DISABLED) diff --git a/src/game/AchievementMgr.h b/src/game/AchievementMgr.h index be071a279..bd3043b50 100644 --- a/src/game/AchievementMgr.h +++ b/src/game/AchievementMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -182,10 +182,10 @@ struct AchievementCriteriaRequirement struct AchievementCriteriaRequirementSet { AchievementCriteriaRequirementSet() : criteria_id(0) {} - explicit AchievementCriteriaRequirementSet(uint32 id) : criteria_id(id) {} typedef std::vector Storage; void Add(AchievementCriteriaRequirement const& data) { storage.push_back(data); } bool Meets(Player const* source, Unit const* target, uint32 miscvalue = 0) const; + void SetCriteriaId(uint32 id) {criteria_id = id;} private: uint32 criteria_id; Storage storage; diff --git a/src/game/AggressorAI.cpp b/src/game/AggressorAI.cpp index fdde05f7d..42a268dce 100644 --- a/src/game/AggressorAI.cpp +++ b/src/game/AggressorAI.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/AggressorAI.h b/src/game/AggressorAI.h index 8a0c3b43b..7b8feed10 100644 --- a/src/game/AggressorAI.h +++ b/src/game/AggressorAI.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/AnimalRandomMovementGenerator.h b/src/game/AnimalRandomMovementGenerator.h index 6619cf87e..8727ea027 100644 --- a/src/game/AnimalRandomMovementGenerator.h +++ b/src/game/AnimalRandomMovementGenerator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ArenaTeam.cpp b/src/game/ArenaTeam.cpp index f33bb9da3..dcc2b8a5e 100644 --- a/src/game/ArenaTeam.cpp +++ b/src/game/ArenaTeam.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ArenaTeam.h b/src/game/ArenaTeam.h index 822444b75..1787db4de 100644 --- a/src/game/ArenaTeam.h +++ b/src/game/ArenaTeam.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ArenaTeamHandler.cpp b/src/game/ArenaTeamHandler.cpp index 831ace1c1..93543cc6f 100644 --- a/src/game/ArenaTeamHandler.cpp +++ b/src/game/ArenaTeamHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/AuctionHouseHandler.cpp b/src/game/AuctionHouseHandler.cpp index 067d65a29..9f29a99a7 100644 --- a/src/game/AuctionHouseHandler.cpp +++ b/src/game/AuctionHouseHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp index 7243dd426..115dece8e 100644 --- a/src/game/AuctionHouseMgr.cpp +++ b/src/game/AuctionHouseMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/AuctionHouseMgr.h b/src/game/AuctionHouseMgr.h index fbcba207f..0d1b04035 100644 --- a/src/game/AuctionHouseMgr.h +++ b/src/game/AuctionHouseMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Bag.cpp b/src/game/Bag.cpp index 7bbfd5d1f..a67e66ea0 100644 --- a/src/game/Bag.cpp +++ b/src/game/Bag.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Bag.h b/src/game/Bag.h index fcb86452e..bbbfd7ca3 100644 --- a/src/game/Bag.h +++ b/src/game/Bag.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index c909a6e70..3c8159bfc 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h index d35e11400..99c6054d2 100644 --- a/src/game/BattleGround.h +++ b/src/game/BattleGround.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundAA.cpp b/src/game/BattleGroundAA.cpp index b67eb73d6..8b06b1b88 100644 --- a/src/game/BattleGroundAA.cpp +++ b/src/game/BattleGroundAA.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundAA.h b/src/game/BattleGroundAA.h index 56a18dfc2..66fea2148 100644 --- a/src/game/BattleGroundAA.h +++ b/src/game/BattleGroundAA.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundAB.cpp b/src/game/BattleGroundAB.cpp index 4407bcf80..7f19148ef 100644 --- a/src/game/BattleGroundAB.cpp +++ b/src/game/BattleGroundAB.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundAB.h b/src/game/BattleGroundAB.h index fdaa74c2b..d41526c68 100644 --- a/src/game/BattleGroundAB.h +++ b/src/game/BattleGroundAB.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundABG.cpp b/src/game/BattleGroundABG.cpp index f749864cf..4cb80edc8 100644 --- a/src/game/BattleGroundABG.cpp +++ b/src/game/BattleGroundABG.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundABG.h b/src/game/BattleGroundABG.h index 7d3e65ed3..c8321dfe8 100644 --- a/src/game/BattleGroundABG.h +++ b/src/game/BattleGroundABG.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundAV.cpp b/src/game/BattleGroundAV.cpp index a2a7e9bc1..c2141e831 100644 --- a/src/game/BattleGroundAV.cpp +++ b/src/game/BattleGroundAV.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundAV.h b/src/game/BattleGroundAV.h index c62060cd8..7d55bec1a 100644 --- a/src/game/BattleGroundAV.h +++ b/src/game/BattleGroundAV.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundBE.cpp b/src/game/BattleGroundBE.cpp index fddc8bc45..09e172393 100644 --- a/src/game/BattleGroundBE.cpp +++ b/src/game/BattleGroundBE.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundBE.h b/src/game/BattleGroundBE.h index bbc130503..d58870062 100644 --- a/src/game/BattleGroundBE.h +++ b/src/game/BattleGroundBE.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundDS.cpp b/src/game/BattleGroundDS.cpp index 78360b9b1..e6a298d90 100644 --- a/src/game/BattleGroundDS.cpp +++ b/src/game/BattleGroundDS.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundDS.h b/src/game/BattleGroundDS.h index 44a6cfbd3..003422663 100644 --- a/src/game/BattleGroundDS.h +++ b/src/game/BattleGroundDS.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundEY.cpp b/src/game/BattleGroundEY.cpp index fa0b41679..3651d3f53 100644 --- a/src/game/BattleGroundEY.cpp +++ b/src/game/BattleGroundEY.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundEY.h b/src/game/BattleGroundEY.h index d0bd7e75a..27a3a8254 100644 --- a/src/game/BattleGroundEY.h +++ b/src/game/BattleGroundEY.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp index 82fe63db0..74bcb714f 100644 --- a/src/game/BattleGroundHandler.cpp +++ b/src/game/BattleGroundHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundIC.cpp b/src/game/BattleGroundIC.cpp index 53918bf41..6548ca741 100644 --- a/src/game/BattleGroundIC.cpp +++ b/src/game/BattleGroundIC.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundIC.h b/src/game/BattleGroundIC.h index 9ca0f6d13..8a5238865 100644 --- a/src/game/BattleGroundIC.h +++ b/src/game/BattleGroundIC.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp index 2b31e90a4..4c2c02bf5 100644 --- a/src/game/BattleGroundMgr.cpp +++ b/src/game/BattleGroundMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundMgr.h b/src/game/BattleGroundMgr.h index 7b646c6f8..585eb820a 100644 --- a/src/game/BattleGroundMgr.h +++ b/src/game/BattleGroundMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundNA.cpp b/src/game/BattleGroundNA.cpp index ba7e18f97..24870eee1 100644 --- a/src/game/BattleGroundNA.cpp +++ b/src/game/BattleGroundNA.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundNA.h b/src/game/BattleGroundNA.h index f22a21de0..2bc9102e3 100644 --- a/src/game/BattleGroundNA.h +++ b/src/game/BattleGroundNA.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundRL.cpp b/src/game/BattleGroundRL.cpp index 009e0e945..fd92876b4 100644 --- a/src/game/BattleGroundRL.cpp +++ b/src/game/BattleGroundRL.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundRL.h b/src/game/BattleGroundRL.h index 197fa3e19..10dce567d 100644 --- a/src/game/BattleGroundRL.h +++ b/src/game/BattleGroundRL.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundRV.cpp b/src/game/BattleGroundRV.cpp index 8c252c35c..e54e4dba4 100644 --- a/src/game/BattleGroundRV.cpp +++ b/src/game/BattleGroundRV.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundRV.h b/src/game/BattleGroundRV.h index e3e94baf1..d53dd23b8 100644 --- a/src/game/BattleGroundRV.h +++ b/src/game/BattleGroundRV.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundSA.cpp b/src/game/BattleGroundSA.cpp index 22e1ade01..f0012cc79 100644 --- a/src/game/BattleGroundSA.cpp +++ b/src/game/BattleGroundSA.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundSA.h b/src/game/BattleGroundSA.h index 3ba23d026..31a3ffac0 100644 --- a/src/game/BattleGroundSA.h +++ b/src/game/BattleGroundSA.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundWS.cpp b/src/game/BattleGroundWS.cpp index 71c5aa30c..8a1fd704d 100644 --- a/src/game/BattleGroundWS.cpp +++ b/src/game/BattleGroundWS.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/BattleGroundWS.h b/src/game/BattleGroundWS.h index 93df2bc0a..b563c3987 100644 --- a/src/game/BattleGroundWS.h +++ b/src/game/BattleGroundWS.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Calendar.cpp b/src/game/Calendar.cpp index 0c1efb20f..c87b574bb 100644 --- a/src/game/Calendar.cpp +++ b/src/game/Calendar.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Calendar.h b/src/game/Calendar.h index 7a86afa7d..7e479fcf4 100644 --- a/src/game/Calendar.h +++ b/src/game/Calendar.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/CalendarHandler.cpp b/src/game/CalendarHandler.cpp index 84c4c5aab..c35c07b27 100644 --- a/src/game/CalendarHandler.cpp +++ b/src/game/CalendarHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Cell.h b/src/game/Cell.h index 8d310ba19..7f5eba5e0 100644 --- a/src/game/Cell.h +++ b/src/game/Cell.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/CellImpl.h b/src/game/CellImpl.h index f1d8732b3..de3061e64 100644 --- a/src/game/CellImpl.h +++ b/src/game/CellImpl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp index 7da136276..5178be19d 100644 --- a/src/game/Channel.cpp +++ b/src/game/Channel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Channel.h b/src/game/Channel.h index 6e2fab2a5..7b4cdbb77 100644 --- a/src/game/Channel.h +++ b/src/game/Channel.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ChannelHandler.cpp b/src/game/ChannelHandler.cpp index a2d28f2e1..6385cfb43 100644 --- a/src/game/ChannelHandler.cpp +++ b/src/game/ChannelHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ChannelMgr.cpp b/src/game/ChannelMgr.cpp index 5d8279696..e63d7b4dd 100644 --- a/src/game/ChannelMgr.cpp +++ b/src/game/ChannelMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ChannelMgr.h b/src/game/ChannelMgr.h index 9b2dcc5c6..c0def7d94 100644 --- a/src/game/ChannelMgr.h +++ b/src/game/ChannelMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp index 329cb0ea5..634652dd3 100644 --- a/src/game/CharacterHandler.cpp +++ b/src/game/CharacterHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index 4d2d315a4..ca8644d43 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Chat.h b/src/game/Chat.h index 84231ac11..7f2a7b159 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp index 31ddecdaf..d7bf68a46 100644 --- a/src/game/ChatHandler.cpp +++ b/src/game/ChatHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/CombatHandler.cpp b/src/game/CombatHandler.cpp index 60eb32a3d..d4a560d5f 100644 --- a/src/game/CombatHandler.cpp +++ b/src/game/CombatHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ConfusedMovementGenerator.cpp b/src/game/ConfusedMovementGenerator.cpp index 7db8c9cba..128b2374f 100644 --- a/src/game/ConfusedMovementGenerator.cpp +++ b/src/game/ConfusedMovementGenerator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ConfusedMovementGenerator.h b/src/game/ConfusedMovementGenerator.h index 95fe1b703..1686cc58f 100644 --- a/src/game/ConfusedMovementGenerator.h +++ b/src/game/ConfusedMovementGenerator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Corpse.cpp b/src/game/Corpse.cpp index 572cb7bfc..be3d9ae9f 100644 --- a/src/game/Corpse.cpp +++ b/src/game/Corpse.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Corpse.h b/src/game/Corpse.h index b0fc146ed..c0fee3033 100644 --- a/src/game/Corpse.h +++ b/src/game/Corpse.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 06949e94a..bcab2f2a6 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -105,6 +105,12 @@ bool AssistDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/) return true; } +bool ForcedDespawnDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/) +{ + m_owner.ForcedDespawn(); + return true; +} + Creature::Creature() : Unit(), i_AI(NULL), lootForPickPocketed(false), lootForBody(false), m_groupLootTimer(0), lootingGroupLeaderGUID(0), @@ -896,7 +902,7 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask) << (m_isDeadByDefault ? 1 : 0) << "," //is_dead << GetDefaultMovementType() << ")"; //default movement generator type - WorldDatabase.PExecuteLog( ss.str( ).c_str( ) ); + WorldDatabase.PExecuteLog("%s", ss.str().c_str()); WorldDatabase.CommitTransaction(); } @@ -1294,9 +1300,19 @@ void Creature::Respawn() } } -void Creature::ForcedDespawn() +void Creature::ForcedDespawn(uint32 timeMSToDespawn) { - setDeathState(JUST_DIED); + if (timeMSToDespawn) + { + ForcedDespawnDelayEvent *pEvent = new ForcedDespawnDelayEvent(*this); + + m_Events.AddEvent(pEvent, m_Events.CalculateTime(timeMSToDespawn)); + return; + } + + if (isAlive()) + setDeathState(JUST_DIED); + RemoveCorpse(); SetHealth(0); // just for nice GM-mode view } @@ -1826,22 +1842,23 @@ void Creature::GetRespawnCoord( float &x, float &y, float &z, float* ori, float* x = data->posX; y = data->posY; z = data->posZ; - if(ori) + if (ori) *ori = data->orientation; - if(dist) + if (dist) *dist = data->spawndist; return; } } - x = GetPositionX(); - y = GetPositionY(); - z = GetPositionZ(); - if(ori) - *ori = GetOrientation(); - if(dist) - *dist = 0; + float orient; + + GetSummonPoint(x, y, z, orient); + + if (ori) + *ori = orient; + if (dist) + *dist = GetRespawnRadius(); } void Creature::AllLootRemovedFromCorpse() diff --git a/src/game/Creature.h b/src/game/Creature.h index e9031c251..9711cd6fe 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -538,7 +538,7 @@ class MANGOS_DLL_SPEC Creature : public Unit void RemoveCorpse(); bool isDeadByDefault() const { return m_isDeadByDefault; }; - void ForcedDespawn(); + void ForcedDespawn(uint32 timeMSToDespawn = 0); time_t const& GetRespawnTime() const { return m_respawnTime; } time_t GetRespawnTimeEx() const; @@ -576,6 +576,9 @@ class MANGOS_DLL_SPEC Creature : public Unit void SetCombatStartPosition(float x, float y, float z) { CombatStartX = x; CombatStartY = y; CombatStartZ = z; } void GetCombatStartPosition(float &x, float &y, float &z) { x = CombatStartX; y = CombatStartY; z = CombatStartZ; } + void SetSummonPoint(float fX, float fY, float fZ, float fOrient) { m_summonXpoint = fX; m_summonYpoint = fY; m_summonZpoint = fZ; m_summonOrientation = fOrient; } + void GetSummonPoint(float &fX, float &fY, float &fZ, float &fOrient) const { fX = m_summonXpoint; fY = m_summonYpoint; fZ = m_summonZpoint; fOrient = m_summonOrientation; } + uint32 GetGlobalCooldown() const { return m_GlobalCooldown; } void SetDeadByDefault (bool death_state) { m_isDeadByDefault = death_state; } @@ -629,6 +632,12 @@ class MANGOS_DLL_SPEC Creature : public Unit float CombatStartX; float CombatStartY; float CombatStartZ; + + float m_summonXpoint; + float m_summonYpoint; + float m_summonZpoint; + float m_summonOrientation; + private: GridReference m_gridRef; CreatureInfo const* m_creatureInfo; // in difficulty mode > 0 can different from ObjMgr::GetCreatureTemplate(GetEntry()) @@ -651,4 +660,14 @@ class AssistDelayEvent : public BasicEvent Unit& m_owner; }; +class ForcedDespawnDelayEvent : public BasicEvent +{ + public: + ForcedDespawnDelayEvent(Creature& owner) : BasicEvent(), m_owner(owner) { } + bool Execute(uint64 e_time, uint32 p_time); + + private: + Creature& m_owner; +}; + #endif diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp index 8f48ad15d..17f5d8572 100644 --- a/src/game/CreatureAI.cpp +++ b/src/game/CreatureAI.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h index f049b5964..6447f2c45 100644 --- a/src/game/CreatureAI.h +++ b/src/game/CreatureAI.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/CreatureAIImpl.h b/src/game/CreatureAIImpl.h index 9f21c32fd..e2aa6cf39 100644 --- a/src/game/CreatureAIImpl.h +++ b/src/game/CreatureAIImpl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/CreatureAIRegistry.cpp b/src/game/CreatureAIRegistry.cpp index 2ae64e37d..c027d5cb8 100644 --- a/src/game/CreatureAIRegistry.cpp +++ b/src/game/CreatureAIRegistry.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/CreatureAIRegistry.h b/src/game/CreatureAIRegistry.h index bdc6c5ae0..d90ed449b 100644 --- a/src/game/CreatureAIRegistry.h +++ b/src/game/CreatureAIRegistry.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/CreatureAISelector.cpp b/src/game/CreatureAISelector.cpp index d68ee8ac2..424900606 100644 --- a/src/game/CreatureAISelector.cpp +++ b/src/game/CreatureAISelector.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/CreatureAISelector.h b/src/game/CreatureAISelector.h index d568a40e2..207130319 100644 --- a/src/game/CreatureAISelector.h +++ b/src/game/CreatureAISelector.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp index 62b748323..9ee26fc47 100644 --- a/src/game/CreatureEventAI.cpp +++ b/src/game/CreatureEventAI.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 MaNGOS + * Copyright (C) 2009-2010 MaNGOS * * 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 diff --git a/src/game/CreatureEventAI.h b/src/game/CreatureEventAI.h index 6ab1ec4e1..fbdc48cb6 100644 --- a/src/game/CreatureEventAI.h +++ b/src/game/CreatureEventAI.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/CreatureEventAIMgr.cpp b/src/game/CreatureEventAIMgr.cpp index d94ee1a12..c968b6a8d 100644 --- a/src/game/CreatureEventAIMgr.cpp +++ b/src/game/CreatureEventAIMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/CreatureEventAIMgr.h b/src/game/CreatureEventAIMgr.h index c8aed6687..cc69664b2 100644 --- a/src/game/CreatureEventAIMgr.h +++ b/src/game/CreatureEventAIMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/DBCEnums.h b/src/game/DBCEnums.h index e458fb021..973881d46 100644 --- a/src/game/DBCEnums.h +++ b/src/game/DBCEnums.h @@ -1,5 +1,5 @@ /* -* Copyright (C) 2005-2009 MaNGOS +* Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/DBCStores.cpp b/src/game/DBCStores.cpp index d5bf0cbc3..dd59368f0 100644 --- a/src/game/DBCStores.cpp +++ b/src/game/DBCStores.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/DBCStores.h b/src/game/DBCStores.h index 24aa45ace..cb965b0f5 100644 --- a/src/game/DBCStores.h +++ b/src/game/DBCStores.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h index e5e95c684..8ca275afe 100644 --- a/src/game/DBCStructure.h +++ b/src/game/DBCStructure.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/DBCfmt.h b/src/game/DBCfmt.h index 433d6f1f6..d2814a947 100644 --- a/src/game/DBCfmt.h +++ b/src/game/DBCfmt.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/DestinationHolder.cpp b/src/game/DestinationHolder.cpp index 2a2321128..94bd587fb 100644 --- a/src/game/DestinationHolder.cpp +++ b/src/game/DestinationHolder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/DestinationHolder.h b/src/game/DestinationHolder.h index 7c8b6ba2b..2c8e8a1b1 100644 --- a/src/game/DestinationHolder.h +++ b/src/game/DestinationHolder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/DestinationHolderImp.h b/src/game/DestinationHolderImp.h index 3db095f1e..fc622623f 100644 --- a/src/game/DestinationHolderImp.h +++ b/src/game/DestinationHolderImp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/DuelHandler.cpp b/src/game/DuelHandler.cpp index 6f253af2e..a73be6f80 100644 --- a/src/game/DuelHandler.cpp +++ b/src/game/DuelHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp index f6bbaf742..cfe61f308 100644 --- a/src/game/DynamicObject.cpp +++ b/src/game/DynamicObject.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/DynamicObject.h b/src/game/DynamicObject.h index 089175f3c..9adf6b7bc 100644 --- a/src/game/DynamicObject.h +++ b/src/game/DynamicObject.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/FleeingMovementGenerator.cpp b/src/game/FleeingMovementGenerator.cpp index 4f26e226a..67a6cb732 100644 --- a/src/game/FleeingMovementGenerator.cpp +++ b/src/game/FleeingMovementGenerator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/FleeingMovementGenerator.h b/src/game/FleeingMovementGenerator.h index a91b3cc1c..b0cc24fd0 100644 --- a/src/game/FleeingMovementGenerator.h +++ b/src/game/FleeingMovementGenerator.h @@ -1,5 +1,5 @@ /* -* Copyright (C) 2005-2009 MaNGOS +* Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/FollowerRefManager.h b/src/game/FollowerRefManager.h index e2e9f48a7..1f9a19502 100644 --- a/src/game/FollowerRefManager.h +++ b/src/game/FollowerRefManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/FollowerReference.cpp b/src/game/FollowerReference.cpp index 25df0c065..361128d07 100644 --- a/src/game/FollowerReference.cpp +++ b/src/game/FollowerReference.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/FollowerReference.h b/src/game/FollowerReference.h index 8286c47e1..0cce9de92 100644 --- a/src/game/FollowerReference.h +++ b/src/game/FollowerReference.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Formulas.h b/src/game/Formulas.h index 9250d86be..991324742 100644 --- a/src/game/Formulas.h +++ b/src/game/Formulas.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GMTicketHandler.cpp b/src/game/GMTicketHandler.cpp index e4cd9cff8..29d0ab3a7 100644 --- a/src/game/GMTicketHandler.cpp +++ b/src/game/GMTicketHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GMTicketMgr.cpp b/src/game/GMTicketMgr.cpp index 5f1044887..b9e40f24f 100644 --- a/src/game/GMTicketMgr.cpp +++ b/src/game/GMTicketMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GMTicketMgr.h b/src/game/GMTicketMgr.h index 0a472a464..b6c0d15e8 100644 --- a/src/game/GMTicketMgr.h +++ b/src/game/GMTicketMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp index 2249b9465..e9f670a3d 100644 --- a/src/game/GameEventMgr.cpp +++ b/src/game/GameEventMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GameEventMgr.h b/src/game/GameEventMgr.h index cc61c4c98..92428bd58 100644 --- a/src/game/GameEventMgr.h +++ b/src/game/GameEventMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index fa5ada1aa..b227e208b 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -558,7 +558,7 @@ void GameObject::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask) WorldDatabase.BeginTransaction(); WorldDatabase.PExecuteLog("DELETE FROM gameobject WHERE guid = '%u'", m_DBTableGuid); - WorldDatabase.PExecuteLog( ss.str( ).c_str( ) ); + WorldDatabase.PExecuteLog("%s", ss.str().c_str()); WorldDatabase.CommitTransaction(); } diff --git a/src/game/GameObject.h b/src/game/GameObject.h index 3d2b2a426..dc4901410 100644 --- a/src/game/GameObject.h +++ b/src/game/GameObject.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GlobalEvents.cpp b/src/game/GlobalEvents.cpp index 97be1fda8..14e2a88e1 100644 --- a/src/game/GlobalEvents.cpp +++ b/src/game/GlobalEvents.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GlobalEvents.h b/src/game/GlobalEvents.h index 2314244da..563375852 100644 --- a/src/game/GlobalEvents.h +++ b/src/game/GlobalEvents.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp index 26f71906b..fd1a4357b 100644 --- a/src/game/GossipDef.cpp +++ b/src/game/GossipDef.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GossipDef.h b/src/game/GossipDef.h index 36c443565..68744dba0 100644 --- a/src/game/GossipDef.h +++ b/src/game/GossipDef.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GridDefines.h b/src/game/GridDefines.h index ebfbf20dd..0f8207ba6 100644 --- a/src/game/GridDefines.h +++ b/src/game/GridDefines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GridNotifiers.cpp b/src/game/GridNotifiers.cpp index 858abdd18..d6f1e210d 100644 --- a/src/game/GridNotifiers.cpp +++ b/src/game/GridNotifiers.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h index 069221511..b1e974d08 100644 --- a/src/game/GridNotifiers.h +++ b/src/game/GridNotifiers.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GridNotifiersImpl.h b/src/game/GridNotifiersImpl.h index 151b4e0c3..1a1ef04e1 100644 --- a/src/game/GridNotifiersImpl.h +++ b/src/game/GridNotifiersImpl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GridStates.cpp b/src/game/GridStates.cpp index 289be47a1..625030d6e 100644 --- a/src/game/GridStates.cpp +++ b/src/game/GridStates.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GridStates.h b/src/game/GridStates.h index 873dc15ad..c41853c5b 100644 --- a/src/game/GridStates.h +++ b/src/game/GridStates.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Group.cpp b/src/game/Group.cpp index 6978c4de5..e1fae2213 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Group.h b/src/game/Group.h index b66ddbbcc..da51b2b2c 100644 --- a/src/game/Group.h +++ b/src/game/Group.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp index a2fd7d3af..e32dded10 100644 --- a/src/game/GroupHandler.cpp +++ b/src/game/GroupHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GroupRefManager.h b/src/game/GroupRefManager.h index 35c45e16c..c7b172cca 100644 --- a/src/game/GroupRefManager.h +++ b/src/game/GroupRefManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GroupReference.cpp b/src/game/GroupReference.cpp index ce29a3dff..cd41ba371 100644 --- a/src/game/GroupReference.cpp +++ b/src/game/GroupReference.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GroupReference.h b/src/game/GroupReference.h index 04f296312..562672a4b 100644 --- a/src/game/GroupReference.h +++ b/src/game/GroupReference.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GuardAI.cpp b/src/game/GuardAI.cpp index 3d5b529a7..703d66c94 100644 --- a/src/game/GuardAI.cpp +++ b/src/game/GuardAI.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GuardAI.h b/src/game/GuardAI.h index 20690201d..0643103c3 100644 --- a/src/game/GuardAI.h +++ b/src/game/GuardAI.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp index 027d52276..9bcbf465a 100644 --- a/src/game/Guild.cpp +++ b/src/game/Guild.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Guild.h b/src/game/Guild.h index a8dcdc02c..ede69c456 100644 --- a/src/game/Guild.h +++ b/src/game/Guild.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/GuildHandler.cpp b/src/game/GuildHandler.cpp index 604199d54..11cda5438 100644 --- a/src/game/GuildHandler.cpp +++ b/src/game/GuildHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/HomeMovementGenerator.cpp b/src/game/HomeMovementGenerator.cpp index e046b51b4..25ed4c5c3 100644 --- a/src/game/HomeMovementGenerator.cpp +++ b/src/game/HomeMovementGenerator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/HomeMovementGenerator.h b/src/game/HomeMovementGenerator.h index 52bd60166..9c2dc7310 100644 --- a/src/game/HomeMovementGenerator.h +++ b/src/game/HomeMovementGenerator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/HostileRefManager.cpp b/src/game/HostileRefManager.cpp index b173f7706..1ba8f4b2b 100644 --- a/src/game/HostileRefManager.cpp +++ b/src/game/HostileRefManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/HostileRefManager.h b/src/game/HostileRefManager.h index a2555858d..e16621d01 100644 --- a/src/game/HostileRefManager.h +++ b/src/game/HostileRefManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/IdleMovementGenerator.cpp b/src/game/IdleMovementGenerator.cpp index 902059528..210ed8c25 100644 --- a/src/game/IdleMovementGenerator.cpp +++ b/src/game/IdleMovementGenerator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/IdleMovementGenerator.h b/src/game/IdleMovementGenerator.h index 82d131a3b..ad3cbc815 100644 --- a/src/game/IdleMovementGenerator.h +++ b/src/game/IdleMovementGenerator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/InstanceData.cpp b/src/game/InstanceData.cpp index 7aba1afc6..9b55a3c4a 100644 --- a/src/game/InstanceData.cpp +++ b/src/game/InstanceData.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/InstanceData.h b/src/game/InstanceData.h index 8e79bba0f..c647fa8cc 100644 --- a/src/game/InstanceData.h +++ b/src/game/InstanceData.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/InstanceSaveMgr.cpp b/src/game/InstanceSaveMgr.cpp index 54f71b2ce..81aca0107 100644 --- a/src/game/InstanceSaveMgr.cpp +++ b/src/game/InstanceSaveMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005,2006,2007 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/InstanceSaveMgr.h b/src/game/InstanceSaveMgr.h index 1b5799092..1c55f4edc 100644 --- a/src/game/InstanceSaveMgr.h +++ b/src/game/InstanceSaveMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005,2006,2007 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Item.cpp b/src/game/Item.cpp index 2f5621414..8afad4a07 100644 --- a/src/game/Item.cpp +++ b/src/game/Item.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Item.h b/src/game/Item.h index 5e4a77927..52fc9693d 100644 --- a/src/game/Item.h +++ b/src/game/Item.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ItemEnchantmentMgr.cpp b/src/game/ItemEnchantmentMgr.cpp index 66b98c0bf..85d6c6a1f 100644 --- a/src/game/ItemEnchantmentMgr.cpp +++ b/src/game/ItemEnchantmentMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ItemEnchantmentMgr.h b/src/game/ItemEnchantmentMgr.h index 543f773ab..b37c29049 100644 --- a/src/game/ItemEnchantmentMgr.h +++ b/src/game/ItemEnchantmentMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp index d4e1d9ac0..7887859f5 100644 --- a/src/game/ItemHandler.cpp +++ b/src/game/ItemHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ItemPrototype.h b/src/game/ItemPrototype.h index 4175d1fe7..c63053273 100644 --- a/src/game/ItemPrototype.h +++ b/src/game/ItemPrototype.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/LFGHandler.cpp b/src/game/LFGHandler.cpp index 3e595f4ec..ef100b71a 100644 --- a/src/game/LFGHandler.cpp +++ b/src/game/LFGHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Language.h b/src/game/Language.h index 6b16d6aaf..fb90a71fb 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp index 687327e01..6d52d0880 100644 --- a/src/game/Level0.cpp +++ b/src/game/Level0.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index 2c3faefb7..f2c41c1dd 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -1320,30 +1320,33 @@ bool ChatHandler::HandleModifyScaleCommand(const char* args) return false; float Scale = (float)atof((char*)args); - if (Scale > 3.0f || Scale <= 0.0f) + if (Scale > 10.0f || Scale <= 0.0f) { SendSysMessage(LANG_BAD_VALUE); SetSentErrorMessage(true); return false; } - Player *chr = getSelectedPlayer(); - if (chr == NULL) + Unit *target = getSelectedUnit(); + if (target == NULL) { - SendSysMessage(LANG_NO_CHAR_SELECTED); + SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); SetSentErrorMessage(true); return false; } - // check online security - if (HasLowerSecurity(chr, 0)) - return false; + if (target->GetTypeId()==TYPEID_PLAYER) + { + // check online security + if (HasLowerSecurity((Player*)target, 0)) + return false; - PSendSysMessage(LANG_YOU_CHANGE_SIZE, Scale, GetNameLink(chr).c_str()); - if (needReportToTarget(chr)) - ChatHandler(chr).PSendSysMessage(LANG_YOURS_SIZE_CHANGED, GetNameLink().c_str(), Scale); + PSendSysMessage(LANG_YOU_CHANGE_SIZE, Scale, GetNameLink((Player*)target).c_str()); + if (needReportToTarget((Player*)target)) + ChatHandler((Player*)target).PSendSysMessage(LANG_YOURS_SIZE_CHANGED, GetNameLink().c_str(), Scale); + } - chr->SetFloatValue(OBJECT_FIELD_SCALE_X, Scale); + target->SetFloatValue(OBJECT_FIELD_SCALE_X, Scale); return true; } diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index 2f38131ec..a091dac3c 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index aa72b0256..2f20e405d 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/LootHandler.cpp b/src/game/LootHandler.cpp index 4a772ba80..29cbc35d5 100644 --- a/src/game/LootHandler.cpp +++ b/src/game/LootHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp index 8600c749b..c91342e8f 100644 --- a/src/game/LootMgr.cpp +++ b/src/game/LootMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/LootMgr.h b/src/game/LootMgr.h index cd5a2683a..e43449fdc 100644 --- a/src/game/LootMgr.h +++ b/src/game/LootMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp index 024633635..0509240f6 100644 --- a/src/game/Mail.cpp +++ b/src/game/Mail.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Mail.h b/src/game/Mail.h index c704d406a..392272303 100644 --- a/src/game/Mail.h +++ b/src/game/Mail.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Makefile.am b/src/game/Makefile.am index d13bc32af..42e6e39aa 100644 --- a/src/game/Makefile.am +++ b/src/game/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/src/game/Map.cpp b/src/game/Map.cpp index f70bca36b..b8fdd2916 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -44,6 +44,12 @@ GridState* si_GridStates[MAX_GRID_STATE]; +static char const* MAP_MAGIC = "MAPS"; +static char const* MAP_VERSION_MAGIC = "w1.0"; +static char const* MAP_AREA_MAGIC = "AREA"; +static char const* MAP_HEIGHT_MAGIC = "MHGT"; +static char const* MAP_LIQUID_MAGIC = "MLIQ"; + struct ScriptAction { uint64 sourceGUID; @@ -78,8 +84,8 @@ bool Map::ExistMap(uint32 mapid,int gx,int gy) map_fileheader header; fread(&header, sizeof(header), 1, pf); - if (header.mapMagic != uint32(MAP_MAGIC) || - header.versionMagic != uint32(MAP_VERSION_MAGIC)) + if (header.mapMagic != *((uint32 const*)(MAP_MAGIC)) || + header.versionMagic != *((uint32 const*)(MAP_VERSION_MAGIC))) { sLog.outError("Map file '%s' is non-compatible version (outdated?). Please, create new using ad.exe program.",tmp); delete [] tmp; @@ -1192,8 +1198,8 @@ bool GridMap::loadData(char *filename) if (!in) return true; fread(&header, sizeof(header),1,in); - if (header.mapMagic == uint32(MAP_MAGIC) && - header.versionMagic == uint32(MAP_VERSION_MAGIC)) + if (header.mapMagic == *((uint32 const*)(MAP_MAGIC)) && + header.versionMagic == *((uint32 const*)(MAP_VERSION_MAGIC))) { // loadup area data if (header.areaMapOffset && !loadAreaData(in, header.areaMapOffset, header.areaMapSize)) @@ -1203,7 +1209,7 @@ bool GridMap::loadData(char *filename) return false; } // loadup height data - if (header.heightMapOffset && !loadHeihgtData(in, header.heightMapOffset, header.heightMapSize)) + if (header.heightMapOffset && !loadHeightData(in, header.heightMapOffset, header.heightMapSize)) { sLog.outError("Error loading map height data\n"); fclose(in); @@ -1244,7 +1250,7 @@ bool GridMap::loadAreaData(FILE *in, uint32 offset, uint32 size) map_areaHeader header; fseek(in, offset, SEEK_SET); fread(&header, sizeof(header), 1, in); - if (header.fourcc != uint32(MAP_AREA_MAGIC)) + if (header.fourcc != *((uint32 const*)(MAP_AREA_MAGIC))) return false; m_gridArea = header.gridArea; @@ -1256,12 +1262,12 @@ bool GridMap::loadAreaData(FILE *in, uint32 offset, uint32 size) return true; } -bool GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 size) +bool GridMap::loadHeightData(FILE *in, uint32 offset, uint32 size) { map_heightHeader header; fseek(in, offset, SEEK_SET); fread(&header, sizeof(header), 1, in); - if (header.fourcc != uint32(MAP_HEIGHT_MAGIC)) + if (header.fourcc != *((uint32 const*)(MAP_HEIGHT_MAGIC))) return false; m_gridHeight = header.gridHeight; @@ -1304,7 +1310,7 @@ bool GridMap::loadLiquidData(FILE *in, uint32 offset, uint32 size) map_liquidHeader header; fseek(in, offset, SEEK_SET); fread(&header, sizeof(header), 1, in); - if (header.fourcc != uint32(MAP_LIQUID_MAGIC)) + if (header.fourcc != *((uint32 const*)(MAP_LIQUID_MAGIC))) return false; m_liquidType = header.liquidType; @@ -1759,6 +1765,11 @@ uint16 Map::GetAreaFlag(float x, float y, float z) const if (x > 3823.0f && x < 4141.5f && y > 6247.0f && y < 64890.0f && z < 42.5f) areaflag = 1723; break; + // Moonrest Gardens + case 1787: + if (x > 3315.3f && x < 3361.6f && y > 2469.4f && y < 2565.8f && z > 197.0f) + areaflag = 1786; // Surge Needle (cords not entirely correct, will need round circle if this is really needed(see spell 47097 eff 77)) + break; // Dalaran case 2492: // Forlorn Woods (Crystalsong Forest) case 2371: // Valley of Echoes (Icecrown Glacier) diff --git a/src/game/Map.h b/src/game/Map.h index d63cb51ab..2d6b0a60a 100644 --- a/src/game/Map.h +++ b/src/game/Map.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -71,12 +71,6 @@ typedef MaNGOS::SingleThreaded::Lock NullGuard; //****************************************** // Map file format defines //****************************************** -#define MAP_MAGIC 'SPAM' -#define MAP_VERSION_MAGIC '0.1w' -#define MAP_AREA_MAGIC 'AERA' -#define MAP_HEIGHT_MAGIC 'TGHM' -#define MAP_LIQUID_MAGIC 'QILM' - struct map_fileheader { uint32 mapMagic; @@ -182,7 +176,7 @@ class GridMap float *m_liquid_map; bool loadAreaData(FILE *in, uint32 offset, uint32 size); - bool loadHeihgtData(FILE *in, uint32 offset, uint32 size); + bool loadHeightData(FILE *in, uint32 offset, uint32 size); bool loadLiquidData(FILE *in, uint32 offset, uint32 size); // Get height functions and pointers diff --git a/src/game/MapInstanced.cpp b/src/game/MapInstanced.cpp index 1b76f731c..28435b1c0 100644 --- a/src/game/MapInstanced.cpp +++ b/src/game/MapInstanced.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/MapInstanced.h b/src/game/MapInstanced.h index b64bd91b5..ddd240e3e 100644 --- a/src/game/MapInstanced.h +++ b/src/game/MapInstanced.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp index 94055bfb5..6c2b8271e 100644 --- a/src/game/MapManager.cpp +++ b/src/game/MapManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/MapManager.h b/src/game/MapManager.h index 3586845d5..2f1873072 100644 --- a/src/game/MapManager.h +++ b/src/game/MapManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/MapRefManager.h b/src/game/MapRefManager.h index 02f8b2ea4..efd4827a3 100644 --- a/src/game/MapRefManager.h +++ b/src/game/MapRefManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/MapReference.h b/src/game/MapReference.h index 3879da51c..03a4fc89d 100644 --- a/src/game/MapReference.h +++ b/src/game/MapReference.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index 32e486de2..c0b42fcd3 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -845,7 +845,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data) else if(missingKey) GetPlayer()->SendTransferAborted(at->target_mapId, TRANSFER_ABORT_DIFFICULTY, isRegularTargetMap ? DUNGEON_DIFFICULTY_NORMAL : DUNGEON_DIFFICULTY_HEROIC); else if(missingQuest) - SendAreaTriggerMessage(at->requiredFailedText.c_str()); + SendAreaTriggerMessage("%s", at->requiredFailedText.c_str()); else if(missingLevel) SendAreaTriggerMessage(GetMangosString(LANG_LEVEL_MINREQUIRED), missingLevel); return; diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp index cf83bb1d9..97701de8c 100644 --- a/src/game/MotionMaster.cpp +++ b/src/game/MotionMaster.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/MotionMaster.h b/src/game/MotionMaster.h index 1950bdd86..4bdb85d4d 100644 --- a/src/game/MotionMaster.h +++ b/src/game/MotionMaster.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/MovementGenerator.cpp b/src/game/MovementGenerator.cpp index 4e1543598..1e663922f 100644 --- a/src/game/MovementGenerator.cpp +++ b/src/game/MovementGenerator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/MovementGenerator.h b/src/game/MovementGenerator.h index a7d455e8f..3cc3a9d59 100644 --- a/src/game/MovementGenerator.h +++ b/src/game/MovementGenerator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/MovementGeneratorImpl.h b/src/game/MovementGeneratorImpl.h index fb0d449fb..58a3c23b0 100644 --- a/src/game/MovementGeneratorImpl.h +++ b/src/game/MovementGeneratorImpl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp index 0786fffdd..0804e9916 100644 --- a/src/game/MovementHandler.cpp +++ b/src/game/MovementHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -137,13 +137,19 @@ void WorldSession::HandleMoveWorldportAckOpcode() } } - if (mInstance && mEntry->IsDungeon()) + if (mInstance) { Difficulty diff = GetPlayer()->GetDifficulty(mEntry->IsRaid()); - if (uint32 timeReset = sInstanceSaveMgr.GetResetTimeFor(GetPlayer()->GetMapId(),diff)) + if(MapDifficulty const* mapDiff = GetMapDifficultyData(mEntry->MapID,diff)) { - uint32 timeleft = timeReset - time(NULL); - GetPlayer()->SendInstanceResetWarning(GetPlayer()->GetMapId(), diff, timeleft); + if (mapDiff->resetTime) + { + if (uint32 timeReset = sInstanceSaveMgr.GetResetTimeFor(mEntry->MapID,diff)) + { + uint32 timeleft = timeReset - time(NULL); + GetPlayer()->SendInstanceResetWarning(mEntry->MapID, diff, timeleft); + } + } } } diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp index a489f8bb5..bf3425dd5 100644 --- a/src/game/NPCHandler.cpp +++ b/src/game/NPCHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/NPCHandler.h b/src/game/NPCHandler.h index a9896fb55..b842cb81e 100644 --- a/src/game/NPCHandler.h +++ b/src/game/NPCHandler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/NullCreatureAI.cpp b/src/game/NullCreatureAI.cpp index c3e048d48..2f583b4b9 100644 --- a/src/game/NullCreatureAI.cpp +++ b/src/game/NullCreatureAI.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/NullCreatureAI.h b/src/game/NullCreatureAI.h index c56c968c1..915a119ec 100644 --- a/src/game/NullCreatureAI.h +++ b/src/game/NullCreatureAI.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 9f425e83d..f367f482a 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -1687,6 +1687,7 @@ Creature* WorldObject::SummonCreature(uint32 id, float x, float y, float z, floa GetClosePoint(x, y, z, pCreature->GetObjectSize()); pCreature->Relocate(x, y, z, ang); + pCreature->SetSummonPoint(x, y, z, ang); if(!pCreature->IsPositionValid()) { diff --git a/src/game/Object.h b/src/game/Object.h index 3372ec23e..fbb35b967 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp index 1bb11b4a1..af35512e4 100644 --- a/src/game/ObjectAccessor.cpp +++ b/src/game/ObjectAccessor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ObjectAccessor.h b/src/game/ObjectAccessor.h index dc573c85a..d704045b3 100644 --- a/src/game/ObjectAccessor.h +++ b/src/game/ObjectAccessor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ObjectDefines.h b/src/game/ObjectDefines.h index c092f1099..5b173823b 100644 --- a/src/game/ObjectDefines.h +++ b/src/game/ObjectDefines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ObjectGridLoader.cpp b/src/game/ObjectGridLoader.cpp index 506cac16e..afd6697d4 100644 --- a/src/game/ObjectGridLoader.cpp +++ b/src/game/ObjectGridLoader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ObjectGridLoader.h b/src/game/ObjectGridLoader.h index 6022ba23a..7796905ef 100644 --- a/src/game/ObjectGridLoader.h +++ b/src/game/ObjectGridLoader.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index a42067b28..497ec4db2 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -4526,7 +4526,7 @@ void ObjectMgr::LoadPageTexts() ss << *itr << " "; ss << "create(s) a circular reference, which can cause the server to freeze. Changing Next_Page of page " << pageItr->Page_ID <<" to 0"; - sLog.outErrorDb(ss.str().c_str()); + sLog.outErrorDb("%s", ss.str().c_str()); const_cast(pageItr)->Next_Page = 0; break; } @@ -7321,6 +7321,16 @@ bool PlayerCondition::Meets(Player const * player) const if ((!value1 || (player->getRaceMask() & value1)) && (!value2 || (player->getClassMask() & value2))) return true; return false; + case CONDITION_LEVEL: + { + switch(value2) + { + case 0: return player->getLevel() == value1; + case 1: return player->getLevel() >= value1; + case 2: return player->getLevel() <= value1; + } + return false; + } default: return false; } @@ -7495,6 +7505,22 @@ bool PlayerCondition::IsValid(ConditionType condition, uint32 value1, uint32 val } break; } + case CONDITION_LEVEL: + { + if (!value1 || value1 > sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL)) + { + sLog.outErrorDb("Level condition has invalid level %u, skipped", value1); + return false; + } + + if (value2 > 2) + { + sLog.outErrorDb("Level condition has invalid argument %u (must be 0..2), skipped", value2); + return false; + } + + break; + } case CONDITION_NONE: break; } diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index e3b140ab1..dbfafdcbb 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -322,9 +322,10 @@ enum ConditionType CONDITION_ACTIVE_EVENT = 12, // event_id 0 CONDITION_AREA_FLAG = 13, // area_flag area_flag_not CONDITION_RACE_CLASS = 14, // race_mask class_mask + CONDITION_LEVEL = 15, // player_level 0, 1 or 2 (0: equal to, 1: equal or higher than, 2: equal or less than) }; -#define MAX_CONDITION 15 // maximum value in ConditionType enum +#define MAX_CONDITION 16 // maximum value in ConditionType enum struct PlayerCondition { diff --git a/src/game/ObjectPosSelector.cpp b/src/game/ObjectPosSelector.cpp index 899dfec3f..fdeb6c3a8 100644 --- a/src/game/ObjectPosSelector.cpp +++ b/src/game/ObjectPosSelector.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ObjectPosSelector.h b/src/game/ObjectPosSelector.h index 840506111..b01a95033 100644 --- a/src/game/ObjectPosSelector.h +++ b/src/game/ObjectPosSelector.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp index 802e71128..e93788008 100644 --- a/src/game/Opcodes.cpp +++ b/src/game/Opcodes.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h index 807fd6e28..d649fe690 100644 --- a/src/game/Opcodes.h +++ b/src/game/Opcodes.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Path.h b/src/game/Path.h index 086293c38..d95b08724 100644 --- a/src/game/Path.h +++ b/src/game/Path.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 5139ce329..f4da5c695 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Pet.h b/src/game/Pet.h index 4c6d3f70e..49a0ec29a 100644 --- a/src/game/Pet.h +++ b/src/game/Pet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/PetAI.cpp b/src/game/PetAI.cpp index 3b305dfc7..e42a32b2c 100644 --- a/src/game/PetAI.cpp +++ b/src/game/PetAI.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/PetAI.h b/src/game/PetAI.h index 90f0748df..b09e8d449 100644 --- a/src/game/PetAI.h +++ b/src/game/PetAI.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp index a732d69d2..f6a919649 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/PetitionsHandler.cpp b/src/game/PetitionsHandler.cpp index 41fe2b12c..1c044a3c2 100644 --- a/src/game/PetitionsHandler.cpp +++ b/src/game/PetitionsHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Player.cpp b/src/game/Player.cpp index e79fde53e..51f2d6905 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -16594,7 +16594,7 @@ void Player::SavePositionInDB(uint32 mapid, float x,float y,float z,float o,uint << "',position_z='"<GetOwnerGUID()!=GetGUID()) + return; + + // not save secondary permanent pet as current + if (pet && m_temporaryUnsummonedPetNumber != pet->GetCharmInfo()->GetPetNumber() && mode == PET_SAVE_AS_CURRENT) + mode = PET_SAVE_NOT_IN_SLOT; + + if(returnreagent && pet && mode != PET_SAVE_AS_CURRENT) { //returning of reagents only for players, so best done here uint32 spellId = pet ? pet->GetUInt32Value(UNIT_CREATED_BY_SPELL) : m_oldpetspell; @@ -16883,12 +16890,8 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent) } } } - m_temporaryUnsummonedPetNumber = 0; } - if(!pet || pet->GetOwnerGUID()!=GetGUID()) - return; - // only if current pet in slot switch(pet->getPetType()) { @@ -16906,20 +16909,6 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent) pet->CombatStop(); - if(returnreagent) - { - switch(pet->GetEntry()) - { - //warlock pets except imp are removed(?) when logging out - case 1860: - case 1863: - case 417: - case 17252: - mode = PET_SAVE_NOT_IN_SLOT; - break; - } - } - pet->SavePetToDB(mode); pet->AddObjectToRemoveList(); @@ -20421,7 +20410,7 @@ void Player::_LoadSkills(QueryResult *result) if(count >= PLAYER_MAX_SKILLS) // client limit { - sLog.outError("Character %u has more than %u skills.", PLAYER_MAX_SKILLS); + sLog.outError("Character %u has more than %u skills.", GetGUIDLow(), PLAYER_MAX_SKILLS); break; } } while (result->NextRow()); diff --git a/src/game/Player.h b/src/game/Player.h index 4b1173595..3ff0ac535 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/PlayerDump.cpp b/src/game/PlayerDump.cpp index 4a6fe3188..122f7b790 100644 --- a/src/game/PlayerDump.cpp +++ b/src/game/PlayerDump.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/PlayerDump.h b/src/game/PlayerDump.h index b22a616ce..bc747c825 100644 --- a/src/game/PlayerDump.h +++ b/src/game/PlayerDump.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/PointMovementGenerator.cpp b/src/game/PointMovementGenerator.cpp index d6ace4f7f..54b396dd0 100644 --- a/src/game/PointMovementGenerator.cpp +++ b/src/game/PointMovementGenerator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/PointMovementGenerator.h b/src/game/PointMovementGenerator.h index 4c82ba24f..e2ef7d25a 100644 --- a/src/game/PointMovementGenerator.h +++ b/src/game/PointMovementGenerator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/PoolManager.cpp b/src/game/PoolManager.cpp index 28093b14a..86b9e0e23 100644 --- a/src/game/PoolManager.cpp +++ b/src/game/PoolManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -605,7 +605,7 @@ void PoolManager::LoadFromDB() ss << *itr << " "; ss << "create(s) a circular reference, which can cause the server to freeze.\nRemoving the last link between mother pool " << poolItr->first << " and child pool " << poolItr->second; - sLog.outErrorDb(ss.str().c_str()); + sLog.outErrorDb("%s", ss.str().c_str()); mPoolPoolGroups[poolItr->second].RemoveOneRelation(poolItr->first); mPoolSearchMap.erase(poolItr); --count; diff --git a/src/game/PoolManager.h b/src/game/PoolManager.h index 6eb7369d9..94b51fdfb 100644 --- a/src/game/PoolManager.h +++ b/src/game/PoolManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp index a7dbb6b7d..c054385e4 100644 --- a/src/game/QueryHandler.cpp +++ b/src/game/QueryHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/QuestDef.cpp b/src/game/QuestDef.cpp index 17ddba486..05fcc955a 100644 --- a/src/game/QuestDef.cpp +++ b/src/game/QuestDef.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/QuestDef.h b/src/game/QuestDef.h index 53649cf1a..f9d6961cd 100644 --- a/src/game/QuestDef.h +++ b/src/game/QuestDef.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp index 4d5334ebf..3148047a7 100644 --- a/src/game/QuestHandler.cpp +++ b/src/game/QuestHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/RandomMovementGenerator.cpp b/src/game/RandomMovementGenerator.cpp index bb7b1ab93..b4c70de21 100644 --- a/src/game/RandomMovementGenerator.cpp +++ b/src/game/RandomMovementGenerator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -23,8 +23,6 @@ #include "Map.h" #include "Util.h" -#define RUNNING_CHANCE_RANDOMMV 20 //will be "1 / RUNNING_CHANCE_RANDOMMV" - template<> void RandomMovementGenerator::_setRandomLocation(Creature &creature) @@ -55,47 +53,57 @@ RandomMovementGenerator::_setRandomLocation(Creature &creature) dist = distanceX*distanceX + distanceY*distanceY; - if (is_air_ok) // 3D system above ground and above water (flying mode) + if (is_air_ok) // 3D system above ground and above water (flying mode) { - const float distanceZ = rand_norm() * sqrtf(dist)/2; // Limit height change + const float distanceZ = rand_norm() * sqrtf(dist)/2;// Limit height change nz = Z + distanceZ; - float tz = map->GetHeight(nx, ny, nz-2.0f, false); // Map check only, vmap needed here but need to alter vmaps checks for height. + float tz = map->GetHeight(nx, ny, nz-2.0f, false); // Map check only, vmap needed here but need to alter vmaps checks for height. float wz = map->GetWaterLevel(nx, ny); + + // Problem here, we must fly above the ground and water, not under. Let's try on next tick if (tz >= nz || wz >= nz) - return; // Problem here, we must fly above the ground and water, not under. Let's try on next tick + return; } - //else if (is_water_ok) // 3D system under water and above ground (swimming mode) - else // 2D only + //else if (is_water_ok) // 3D system under water and above ground (swimming mode) + else // 2D only { - dist = dist>=100.0f ? 10.0f : sqrtf(dist); // 10.0 is the max that vmap high can check (MAX_CAN_FALL_DISTANCE) + dist = dist >= 100.0f ? 10.0f : sqrtf(dist); // 10.0 is the max that vmap high can check (MAX_CAN_FALL_DISTANCE) + // The fastest way to get an accurate result 90% of the time. // Better result can be obtained like 99% accuracy with a ray light, but the cost is too high and the code is too long. - nz = map->GetHeight(nx,ny,Z+dist-2.0f,false); // Map check - if (fabs(nz-Z)>dist) + nz = map->GetHeight(nx, ny, Z+dist-2.0f, false); + + if (fabs(nz-Z) > dist) // Map check { - nz = map->GetHeight(nx,ny,Z-2.0f,true); // Vmap Horizontal or above - if (fabs(nz-Z)>dist) + nz = map->GetHeight(nx, ny, Z-2.0f, true); // Vmap Horizontal or above + + if (fabs(nz-Z) > dist) { - nz = map->GetHeight(nx,ny,Z+dist-2.0f,true); // Vmap Higher - if (fabs(nz-Z)>dist) - return; // let's forget this bad coords where a z cannot be find and retry at next tick + // Vmap Higher + nz = map->GetHeight(nx, ny, Z+dist-2.0f, true); + + // let's forget this bad coords where a z cannot be find and retry at next tick + if (fabs(nz-Z) > dist) + return; } } } Traveller traveller(creature); - creature.SetOrientation(creature.GetAngle(nx,ny)); + + creature.SetOrientation(creature.GetAngle(nx, ny)); i_destinationHolder.SetDestination(traveller, nx, ny, nz); creature.addUnitState(UNIT_STAT_ROAMING); + if (is_air_ok) { i_nextMoveTime.Reset(i_destinationHolder.GetTotalTravelTime()); creature.AddMonsterMoveFlag(MONSTER_MOVE_FLY); } - //else if (is_water_ok) // Swimming mode to be done with more than this check + //else if (is_water_ok) // Swimming mode to be done with more than this check else { - i_nextMoveTime.Reset(urand(500+i_destinationHolder.GetTotalTravelTime(),5000+i_destinationHolder.GetTotalTravelTime())); + i_nextMoveTime.Reset(urand(500+i_destinationHolder.GetTotalTravelTime(), 10000+i_destinationHolder.GetTotalTravelTime())); creature.AddMonsterMoveFlag(MONSTER_MOVE_WALK); } } @@ -104,16 +112,13 @@ template<> void RandomMovementGenerator::Initialize(Creature &creature) { - if(!creature.isAlive()) + if (!creature.isAlive()) return; if (creature.canFly()) creature.AddMonsterMoveFlag(MONSTER_MOVE_FLY); - - else if(irand(0,RUNNING_CHANCE_RANDOMMV) > 0) - creature.AddMonsterMoveFlag(MONSTER_MOVE_WALK); else - creature.RemoveMonsterMoveFlag(MONSTER_MOVE_WALK); // run with 1/RUNNING_CHANCE_RANDOMMV chance + creature.AddMonsterMoveFlag(MONSTER_MOVE_WALK); _setRandomLocation(creature); } @@ -129,37 +134,35 @@ template<> bool RandomMovementGenerator::Update(Creature &creature, const uint32 &diff) { - if(creature.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED | UNIT_STAT_DIED)) + if (creature.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED | UNIT_STAT_DIED)) { - i_nextMoveTime.Update(i_nextMoveTime.GetExpiry()); // Expire the timer + i_nextMoveTime.Update(i_nextMoveTime.GetExpiry()); // Expire the timer creature.clearUnitState(UNIT_STAT_ROAMING); return true; } i_nextMoveTime.Update(diff); - if(i_destinationHolder.HasArrived() && !creature.IsStopped() && !creature.canFly()) + if (i_destinationHolder.HasArrived() && !creature.IsStopped() && !creature.canFly()) creature.clearUnitState(UNIT_STAT_ROAMING); - if(!i_destinationHolder.HasArrived() && creature.IsStopped()) + if (!i_destinationHolder.HasArrived() && creature.IsStopped()) creature.addUnitState(UNIT_STAT_ROAMING); CreatureTraveller traveller(creature); - if( i_destinationHolder.UpdateTraveller(traveller, diff, false, true) ) + if (i_destinationHolder.UpdateTraveller(traveller, diff, false, true)) { - if(i_nextMoveTime.Passed()) + if (i_nextMoveTime.Passed()) { if (creature.canFly()) creature.AddMonsterMoveFlag(MONSTER_MOVE_FLY); - else if(irand(0,RUNNING_CHANCE_RANDOMMV) > 0) + else creature.AddMonsterMoveFlag(MONSTER_MOVE_WALK); - else // run with 1/RUNNING_CHANCE_RANDOMMV chance - creature.RemoveMonsterMoveFlag(MONSTER_MOVE_WALK); _setRandomLocation(creature); } - else if(creature.isPet() && creature.GetOwner() && !creature.IsWithinDist(creature.GetOwner(),PET_FOLLOW_DIST+2.5f)) + else if (creature.isPet() && creature.GetOwner() && !creature.IsWithinDist(creature.GetOwner(), PET_FOLLOW_DIST+2.5f)) { creature.AddMonsterMoveFlag(MONSTER_MOVE_WALK); _setRandomLocation(creature); diff --git a/src/game/RandomMovementGenerator.h b/src/game/RandomMovementGenerator.h index 15df97d01..26ae1f123 100644 --- a/src/game/RandomMovementGenerator.h +++ b/src/game/RandomMovementGenerator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ReactorAI.cpp b/src/game/ReactorAI.cpp index 49cbc7e0c..97d92d687 100644 --- a/src/game/ReactorAI.cpp +++ b/src/game/ReactorAI.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ReactorAI.h b/src/game/ReactorAI.h index 679e28360..e24609f42 100644 --- a/src/game/ReactorAI.h +++ b/src/game/ReactorAI.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ReputationMgr.cpp b/src/game/ReputationMgr.cpp index fe72d5544..5cdcdd62d 100644 --- a/src/game/ReputationMgr.cpp +++ b/src/game/ReputationMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ReputationMgr.h b/src/game/ReputationMgr.h index b81634119..f3c9705d5 100644 --- a/src/game/ReputationMgr.h +++ b/src/game/ReputationMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ScriptCalls.cpp b/src/game/ScriptCalls.cpp index 7998cf493..96f14ae97 100644 --- a/src/game/ScriptCalls.cpp +++ b/src/game/ScriptCalls.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ScriptCalls.h b/src/game/ScriptCalls.h index 4c8f46b69..f3f5d43c7 100644 --- a/src/game/ScriptCalls.h +++ b/src/game/ScriptCalls.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index 71e1d8f53..04bb4ebf1 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -1067,7 +1067,7 @@ enum Targets TARGET_CHAIN_HEAL = 45, TARGET_SCRIPT_COORDINATES = 46, TARGET_DYNAMIC_OBJECT_FRONT = 47, - TARGET_SUMMON = 48, + TARGET_DYNAMIC_OBJECT_BEHIND = 48, TARGET_DYNAMIC_OBJECT_LEFT_SIDE = 49, TARGET_DYNAMIC_OBJECT_RIGHT_SIDE = 50, TARGET_AREAEFFECT_CUSTOM_2 = 52, diff --git a/src/game/SkillDiscovery.cpp b/src/game/SkillDiscovery.cpp index e3e1672fb..3084fb68d 100644 --- a/src/game/SkillDiscovery.cpp +++ b/src/game/SkillDiscovery.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/SkillDiscovery.h b/src/game/SkillDiscovery.h index 2d4f1bded..9c6733299 100644 --- a/src/game/SkillDiscovery.h +++ b/src/game/SkillDiscovery.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/SkillExtraItems.cpp b/src/game/SkillExtraItems.cpp index a9363e000..fb6f0b2ea 100644 --- a/src/game/SkillExtraItems.cpp +++ b/src/game/SkillExtraItems.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/SkillExtraItems.h b/src/game/SkillExtraItems.h index f348f033c..0f2dd4a37 100644 --- a/src/game/SkillExtraItems.h +++ b/src/game/SkillExtraItems.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/SkillHandler.cpp b/src/game/SkillHandler.cpp index 9c97d9844..8bcef3970 100644 --- a/src/game/SkillHandler.cpp +++ b/src/game/SkillHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp index d05546035..3c0ddc3bd 100644 --- a/src/game/SocialMgr.cpp +++ b/src/game/SocialMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/SocialMgr.h b/src/game/SocialMgr.h index d76d44625..222b39962 100644 --- a/src/game/SocialMgr.h +++ b/src/game/SocialMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 8cac57a5c..ddd16547d 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -511,6 +511,27 @@ void Spell::FillTargetMap() break; } break; + case TARGET_SELF: + switch(m_spellInfo->EffectImplicitTargetB[i]) + { + case 0: + case TARGET_EFFECT_SELECT: + SetTargetMap(i, m_spellInfo->EffectImplicitTargetA[i], tmpUnitMap); + break; + case TARGET_AREAEFFECT_INSTANT: // use B case that not dependent from from A in fact + if((m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) == 0) + m_targets.setDestination(m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ()); + SetTargetMap(i, m_spellInfo->EffectImplicitTargetB[i], tmpUnitMap); + break; + case TARGET_BEHIND_VICTIM: // use B case that not dependent from from A in fact + SetTargetMap(i, m_spellInfo->EffectImplicitTargetB[i], tmpUnitMap); + break; + default: + SetTargetMap(i, m_spellInfo->EffectImplicitTargetA[i], tmpUnitMap); + SetTargetMap(i, m_spellInfo->EffectImplicitTargetB[i], tmpUnitMap); + break; + } + break; case TARGET_EFFECT_SELECT: switch(m_spellInfo->EffectImplicitTargetB[i]) { @@ -542,27 +563,6 @@ void Spell::FillTargetMap() break; } break; - case TARGET_SELF: - switch(m_spellInfo->EffectImplicitTargetB[i]) - { - case 0: - case TARGET_EFFECT_SELECT: - SetTargetMap(i, m_spellInfo->EffectImplicitTargetA[i], tmpUnitMap); - break; - case TARGET_AREAEFFECT_INSTANT: // use B case that not dependent from from A in fact - if((m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) == 0) - m_targets.setDestination(m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ()); - SetTargetMap(i, m_spellInfo->EffectImplicitTargetB[i], tmpUnitMap); - break; - case TARGET_BEHIND_VICTIM: // use B case that not dependent from from A in fact - SetTargetMap(i, m_spellInfo->EffectImplicitTargetB[i], tmpUnitMap); - break; - default: - SetTargetMap(i, m_spellInfo->EffectImplicitTargetA[i], tmpUnitMap); - SetTargetMap(i, m_spellInfo->EffectImplicitTargetB[i], tmpUnitMap); - break; - } - break; case TARGET_CASTER_COORDINATES: switch(m_spellInfo->EffectImplicitTargetB[i]) { @@ -609,6 +609,19 @@ void Spell::FillTargetMap() break; } break; + case TARGET_SELF2: + switch(m_spellInfo->EffectImplicitTargetB[i]) + { + case 0: + case TARGET_EFFECT_SELECT: + SetTargetMap(i, m_spellInfo->EffectImplicitTargetA[i], tmpUnitMap); + break; + // most A/B target pairs is slef->negative and not expect adding caster to target list + default: + SetTargetMap(i, m_spellInfo->EffectImplicitTargetB[i], tmpUnitMap); + break; + } + break; default: switch(m_spellInfo->EffectImplicitTargetB[i]) { @@ -1313,16 +1326,22 @@ void Spell::SetTargetMap(uint32 effIndex, uint32 targetMode, UnitList& targetUni { switch(m_spellInfo->Id) { + case 31347: // Doom TODO: exclude top threat target from target selection case 33711: // Murmur's Touch case 38794: // Murmur's Touch (h) unMaxTargets = 1; break; + case 28542: // Life Drain + unMaxTargets = 2; + break; case 28796: // Poison Bolt Volley case 29213: // Curse of the Plaguebringer case 31298: // Sleep unMaxTargets = 3; break; - case 30843: // Enfeeble + case 30843: // Enfeeble TODO: exclude top threat target from target selection + case 42005: // Bloodboil TODO: need to be 5 targets(players) furthest away from caster + case 55665: // Life Drain (h) unMaxTargets = 5; break; case 54098: // Poison Bolt Volley (h) @@ -1393,7 +1412,6 @@ void Spell::SetTargetMap(uint32 effIndex, uint32 targetMode, UnitList& targetUni case TARGET_SELF2: case TARGET_AREAEFFECT_CUSTOM: case TARGET_AREAEFFECT_CUSTOM_2: - case TARGET_SUMMON: targetUnitMap.push_back(m_caster); break; case TARGET_RANDOM_ENEMY_CHAIN_IN_AREA: @@ -1724,6 +1742,20 @@ void Spell::SetTargetMap(uint32 effIndex, uint32 targetMode, UnitList& targetUni if (Unit* target = m_caster->GetMap()->GetPet(((Player*)m_caster)->GetSelection())) targetUnitMap.push_back(target); } + // Circle of Healing + else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_PRIEST && m_spellInfo->SpellVisual[0] == 8253) + { + Unit* target = m_targets.getUnitTarget(); + if(!target) + target = m_caster; + + uint32 count = 5; + // Glyph of Circle of Healing + if(Aura const* glyph = m_caster->GetDummyAura(55675)) + count += glyph->GetModifier()->m_amount; + + FillRaidOrPartyHealthPriorityTargets(targetUnitMap, m_caster, target, radius, count, true, false, true); + } // Wild Growth else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellIconID == 2864) { @@ -2098,16 +2130,19 @@ void Spell::SetTargetMap(uint32 effIndex, uint32 targetMode, UnitList& targetUni break; case TARGET_DYNAMIC_OBJECT_FRONT: + case TARGET_DYNAMIC_OBJECT_BEHIND: case TARGET_DYNAMIC_OBJECT_LEFT_SIDE: case TARGET_DYNAMIC_OBJECT_RIGHT_SIDE: + { if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)) { float angle = m_caster->GetOrientation(); switch(targetMode) { - case TARGET_DYNAMIC_OBJECT_FRONT: break; - case TARGET_DYNAMIC_OBJECT_LEFT_SIDE: angle -= 3*M_PI/4; break; - case TARGET_DYNAMIC_OBJECT_RIGHT_SIDE: angle += 3*M_PI/4; break; + case TARGET_DYNAMIC_OBJECT_FRONT: break; + case TARGET_DYNAMIC_OBJECT_BEHIND: angle += M_PI; break; + case TARGET_DYNAMIC_OBJECT_LEFT_SIDE: angle += M_PI/2; break; + case TARGET_DYNAMIC_OBJECT_RIGHT_SIDE: angle -= M_PI/2; break; } float x,y; @@ -2117,7 +2152,7 @@ void Spell::SetTargetMap(uint32 effIndex, uint32 targetMode, UnitList& targetUni targetUnitMap.push_back(m_caster); break; - + } case TARGET_POINT_AT_NORTH: case TARGET_POINT_AT_SOUTH: case TARGET_POINT_AT_EAST: @@ -4110,29 +4145,65 @@ SpellCastResult Spell::CheckCast(bool strict) if(non_caster_target) { // simple cases - if (IsExplicitPositiveTarget(m_spellInfo->EffectImplicitTargetA[0])) + bool explicit_target_mode = false; + bool target_hostile = false; + bool target_hostile_checked = false; + bool target_friendly = false; + bool target_friendly_checked = false; + for(int k = 0; k < 3; ++k) { - if(m_caster->IsHostileTo(target)) - return SPELL_FAILED_BAD_TARGETS; - } - else if (IsExplicitNegativeTarget(m_spellInfo->EffectImplicitTargetA[0])) - { - if(m_caster->IsFriendlyTo(target)) - return SPELL_FAILED_BAD_TARGETS; + if (IsExplicitPositiveTarget(m_spellInfo->EffectImplicitTargetA[k])) + { + if (!target_hostile_checked) + { + target_hostile_checked = true; + target_hostile = m_caster->IsHostileTo(target); + } + + if(target_hostile) + return SPELL_FAILED_BAD_TARGETS; + + explicit_target_mode = true; + } + else if (IsExplicitNegativeTarget(m_spellInfo->EffectImplicitTargetA[k])) + { + if (!target_friendly_checked) + { + target_friendly_checked = true; + target_friendly = m_caster->IsFriendlyTo(target); + } + + if(target_friendly) + return SPELL_FAILED_BAD_TARGETS; + + explicit_target_mode = true; + } } // TODO: this check can be applied and for player to prevent cheating when IsPositiveSpell will return always correct result. // check target for pet/charmed casts (not self targeted), self targeted cast used for area effects and etc - else if (m_caster->GetTypeId() == TYPEID_UNIT && m_caster->GetCharmerOrOwnerGUID()) + if (!explicit_target_mode && m_caster->GetTypeId() == TYPEID_UNIT && m_caster->GetCharmerOrOwnerGUID()) { // check correctness positive/negative cast target (pet cast real check and cheating check) if(IsPositiveSpell(m_spellInfo->Id)) { - if(m_caster->IsHostileTo(target)) + if (!target_hostile_checked) + { + target_hostile_checked = true; + target_hostile = m_caster->IsHostileTo(target); + } + + if(target_hostile) return SPELL_FAILED_BAD_TARGETS; } else { - if(m_caster->IsFriendlyTo(target)) + if (!target_friendly_checked) + { + target_friendly_checked = true; + target_friendly = m_caster->IsFriendlyTo(target); + } + + if(target_friendly) return SPELL_FAILED_BAD_TARGETS; } } diff --git a/src/game/Spell.h b/src/game/Spell.h index 018f06e47..8fe6d16ea 100644 --- a/src/game/Spell.h +++ b/src/game/Spell.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -221,7 +221,7 @@ class Spell void EffectDistract(uint32 i); void EffectPull(uint32 i); void EffectSchoolDMG(uint32 i); - void EffectEnvirinmentalDMG(uint32 i); + void EffectEnvironmentalDMG(uint32 i); void EffectInstaKill(uint32 i); void EffectDummy(uint32 i); void EffectTeleportUnits(uint32 i); diff --git a/src/game/SpellAuraDefines.h b/src/game/SpellAuraDefines.h index a784d2f00..1bce86b6d 100644 --- a/src/game/SpellAuraDefines.h +++ b/src/game/SpellAuraDefines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 0a60275e0..8c77e8a10 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -373,7 +373,7 @@ static AuraType const frozenAuraTypes[] = { SPELL_AURA_MOD_ROOT, SPELL_AURA_MOD_ Aura::Aura(SpellEntry const* spellproto, uint32 eff, int32 *currentBasePoints, Unit *target, Unit *caster, Item* castItem) : m_spellmod(NULL), m_caster_guid(0), m_target(target), m_castItemGuid(castItem?castItem->GetGUID():0), -m_timeCla(1000), m_periodicTimer(0), m_removeMode(AURA_REMOVE_BY_DEFAULT), m_AuraDRGroup(DIMINISHING_NONE), +m_timeCla(1000), m_periodicTimer(0), m_periodicTick(0), m_removeMode(AURA_REMOVE_BY_DEFAULT), m_AuraDRGroup(DIMINISHING_NONE), m_effIndex(eff), m_auraSlot(MAX_AURAS), m_auraFlags(AFLAG_NONE), m_auraLevel(1), m_procCharges(0), m_stackAmount(1), m_positive(false), m_permanent(false), m_isPeriodic(false), m_isAreaAura(false), m_isPersistent(false), m_isRemovedOnShapeLost(true), m_in_use(0), m_deleted(false) @@ -662,6 +662,7 @@ void Aura::Update(uint32 diff) { // update before applying (aura can be removed in TriggerSpell or PeriodicTick calls) m_periodicTimer += m_modifier.periodictime; + ++m_periodicTick; // for some infinity auras in some cases can overflow and reset PeriodicTick(); } } @@ -2403,6 +2404,13 @@ void Aura::HandleAuraDummy(bool apply, bool Real) m_target->CastSpell(m_target, 28240, true, NULL, this); return; } + case 32286: // Focus Target Visual + { + if (m_removeMode == AURA_REMOVE_BY_DEFAULT) + m_target->CastSpell(m_target, 32301, true, NULL, this); + + return; + } case 36730: // Flame Strike { m_target->CastSpell(m_target, 36731, true, NULL, this); @@ -4549,7 +4557,7 @@ void Aura::HandlePeriodicEnergize(bool apply, bool Real) case 54833: // Glyph of Innervate (value%/2 of casters base mana) { if (Unit* caster = GetCaster()) - m_modifier.m_amount = int32(caster->GetCreateMana() * GetBasePoints() / (200 * m_maxduration / m_periodicTimer)); + m_modifier.m_amount = int32(caster->GetCreateMana() * GetBasePoints() / (200 * GetAuraMaxTicks())); break; } @@ -4561,7 +4569,7 @@ void Aura::HandlePeriodicEnergize(bool apply, bool Real) if (caster->HasAura(54832)) caster->CastSpell(caster,54833,true,NULL,this); - m_modifier.m_amount = int32(caster->GetCreateMana() * GetBasePoints() / (100 * m_maxduration / m_periodicTimer)); + m_modifier.m_amount = int32(caster->GetCreateMana() * GetBasePoints() / (100 * GetAuraMaxTicks())); } break; } @@ -6622,10 +6630,10 @@ void Aura::PeriodicTick() if (GetSpellProto()->SpellFamilyName==SPELLFAMILY_WARLOCK && (GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000000400)) && GetSpellProto()->SpellIconID==544) { // 1..4 ticks, 1/2 from normal tick damage - if (m_duration >= ((m_maxduration-m_modifier.periodictime) * 2 / 3)) + if (GetAuraTicks() <= 4) pdamage = pdamage/2; // 9..12 ticks, 3/2 from normal tick damage - else if(m_duration < ((m_maxduration-m_modifier.periodictime) / 3)) + else if(GetAuraTicks() >= 9) pdamage += (pdamage + 1) / 2; // +1 prevent 0.5 damage possible lost at 1..4 ticks // 5..8 ticks have normal tick damage } @@ -6766,8 +6774,8 @@ void Aura::PeriodicTick() // Wild Growth (1/7 - 6 + 2*ramainTicks) % if (m_spellProto->SpellFamilyName == SPELLFAMILY_DRUID && m_spellProto->SpellIconID == 2864) { - int32 ticks = m_maxduration/m_modifier.periodictime; - int32 remainingTicks = int32(float(m_duration) / m_modifier.periodictime + 0.5); + int32 ticks = GetAuraMaxTicks(); + int32 remainingTicks = ticks - GetAuraTicks(); pdamage = int32(pdamage) + int32(amount)*ticks*(-6+2*remainingTicks)/100; } } @@ -7232,8 +7240,11 @@ void Aura::PeriodicDummyTick() // case 45960: break; // // Darkness // case 45996: break; -// // Summon Blood Elves Periodic -// case 46041: break; + case 46041: // Summon Blood Elves Periodic + m_target->CastSpell(m_target, 46037, true, NULL, this); + m_target->CastSpell(m_target, roll_chance_i(50) ? 46038 : 46039, true, NULL, this); + m_target->CastSpell(m_target, 46040, true, NULL, this); + return; // // Transform Visual Missile Periodic // case 46205: break; // // Find Opening Beam End @@ -7260,7 +7271,20 @@ void Aura::PeriodicDummyTick() // case 47489: break; // case 47941: break; // Crystal Spike // case 48200: break; // Healer Aura -// case 48630: break; // Summon Gauntlet Mobs Periodic + case 48630: // Summon Gauntlet Mobs Periodic + case 59275: // Below may need some adjustment, pattern for amount of summon and where is not verified 100% (except for odd/even tick) + { + bool chance = roll_chance_i(50); + + m_target->CastSpell(m_target, chance ? 48631 : 48632, true, NULL, this); + + if (GetAuraTicks() % 2) // which doctor at odd tick + m_target->CastSpell(m_target, chance ? 48636 : 48635, true, NULL, this); + else // or harponeer, at even tick + m_target->CastSpell(m_target, chance ? 48634 : 48633, true, NULL, this); + + return; + } // case 49313: break; // Proximity Mine Area Aura // // Mole Machine Portal Schedule // case 49466: break; @@ -7287,6 +7311,21 @@ void Aura::PeriodicDummyTick() case 50824: // Summon earthen dwarf m_target->CastSpell(m_target, roll_chance_i(50) ? 50825 : 50826, true, NULL, this); return; + case 52441: // Cool Down + m_target->CastSpell(m_target, 52443, true); + return; + case 53520: // Carrion Beetles + m_target->CastSpell(m_target, 53521, true, NULL, this); + m_target->CastSpell(m_target, 53521, true, NULL, this); + return; + case 55592: // Clean + switch(urand(0,2)) + { + case 0: m_target->CastSpell(m_target, 55731, true); break; + case 1: m_target->CastSpell(m_target, 55738, true); break; + case 2: m_target->CastSpell(m_target, 55739, true); break; + } + return; // Exist more after, need add later default: break; diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h index bae2f36d9..75324d13f 100644 --- a/src/game/SpellAuras.h +++ b/src/game/SpellAuras.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -234,7 +234,9 @@ class MANGOS_DLL_SPEC Aura void SetAuraMaxDuration(int32 duration) { m_maxduration = duration; } int32 GetAuraDuration() const { return m_duration; } void SetAuraDuration(int32 duration) { m_duration = duration; } - time_t GetAuraApplyTime() { return m_applyTime; } + time_t GetAuraApplyTime() const { return m_applyTime; } + uint32 GetAuraTicks() const { return m_periodicTick; } + uint32 GetAuraMaxTicks() const { return m_maxduration > 0 && m_modifier.periodictime > 0 ? m_maxduration / m_modifier.periodictime : 0; } SpellModifier *getAuraSpellMod() {return m_spellmod; } @@ -249,6 +251,9 @@ class MANGOS_DLL_SPEC Aura m_maxduration = maxduration; m_duration = duration; m_procCharges = charges; + + if(uint32 maxticks = GetAuraMaxTicks()) + m_periodicTick = maxticks - m_duration / m_modifier.periodictime; } uint8 GetAuraSlot() const { return m_auraSlot; } @@ -368,6 +373,7 @@ class MANGOS_DLL_SPEC Aura int32 m_duration; // Current time int32 m_timeCla; // Timer for power per sec calcultion int32 m_periodicTimer; // Timer for periodic auras + uint32 m_periodicTick; // Tick count pass (including current if use in tick code) from aura apply, used for some tick count dependent aura effects AuraRemoveMode m_removeMode:8; // Store info for know remove aura reason DiminishingGroup m_AuraDRGroup:8; // Diminishing diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 4a28ebf47..58964ad8c 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -64,7 +64,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]= &Spell::EffectUnused, // 4 SPELL_EFFECT_PORTAL_TELEPORT unused &Spell::EffectTeleportUnits, // 5 SPELL_EFFECT_TELEPORT_UNITS &Spell::EffectApplyAura, // 6 SPELL_EFFECT_APPLY_AURA - &Spell::EffectEnvirinmentalDMG, // 7 SPELL_EFFECT_ENVIRONMENTAL_DAMAGE + &Spell::EffectEnvironmentalDMG, // 7 SPELL_EFFECT_ENVIRONMENTAL_DAMAGE &Spell::EffectPowerDrain, // 8 SPELL_EFFECT_POWER_DRAIN &Spell::EffectHealthLeech, // 9 SPELL_EFFECT_HEALTH_LEECH &Spell::EffectHeal, // 10 SPELL_EFFECT_HEAL @@ -285,7 +285,7 @@ void Spell::EffectInstaKill(uint32 /*i*/) m_caster->DealDamage(unitTarget, unitTarget->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } -void Spell::EffectEnvirinmentalDMG(uint32 i) +void Spell::EffectEnvironmentalDMG(uint32 i) { uint32 absorb = 0; uint32 resist = 0; @@ -1175,6 +1175,35 @@ void Spell::EffectDummy(uint32 i) return; } + case 50926: // Gluttonous Lurkers: Create Zul'Drak Rat Cover + case 51026: // Create Drakkari Medallion Cover + case 51592: // Pickup Primordial Hatchling + case 51961: // Captured Chicken Cover + { + if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || m_caster->GetTypeId() != TYPEID_PLAYER) + return; + + uint32 spellId = 0; + + switch(m_spellInfo->Id) + { + case 50926: spellId = 50927; break; + case 51026: spellId = 50737; break; + case 51592: spellId = 51593; break; + case 51961: spellId = 51037; break; + } + + if (const SpellEntry *pSpell = sSpellStore.LookupEntry(spellId)) + { + unitTarget->CastSpell(m_caster, spellId, true); + + Creature* creatureTarget = (Creature*)unitTarget; + + if (const SpellCastTimesEntry *pCastTime = sSpellCastTimesStore.LookupEntry(pSpell->CastingTimeIndex)) + creatureTarget->ForcedDespawn(pCastTime->CastTime + 1); + } + return; + } case 51582: //Rocket Boots Engaged (Rocket Boots Xtreme and Rocket Boots Xtreme Lite) { if (m_caster->GetTypeId() != TYPEID_PLAYER) @@ -1186,17 +1215,6 @@ void Spell::EffectDummy(uint32 i) m_caster->CastSpell(m_caster, 30452, true, NULL); return; } - case 51592: // Pickup Primordial Hatchling - { - if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT) - return; - - Creature* creatureTarget = (Creature*)unitTarget; - - creatureTarget->ForcedDespawn(); - return; - - } case 52308: // Take Sputum Sample { switch(i) @@ -1546,7 +1564,7 @@ void Spell::EffectDummy(uint32 i) break; case SPELLFAMILY_DRUID: // Starfall - if (m_spellInfo->SpellFamilyFlags2 & UI64LIT(0x00000100)) + if (m_spellInfo->SpellFamilyFlags2 & 0x00000100) { //Shapeshifting into an animal form or mounting cancels the effect. if(m_caster->GetCreatureType() == CREATURE_TYPE_BEAST || m_caster->IsMounted()) @@ -5145,6 +5163,19 @@ void Spell::EffectScriptEffect(uint32 effIndex) break; } + // Surge Needle Teleporter + case 47097: + { + if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) + return; + + if (unitTarget->GetAreaId() == 4156) + unitTarget->CastSpell(unitTarget, 47324, true); + else if (unitTarget->GetAreaId() == 4157) + unitTarget->CastSpell(unitTarget, 47325, true); + + break; + } // Emblazon Runeblade case 51770: { diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp index ce6b3f715..553bc093a 100644 --- a/src/game/SpellHandler.cpp +++ b/src/game/SpellHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index ea6f7b9b7..b1d4cb649 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -437,7 +437,6 @@ bool IsExplicitPositiveTarget(uint32 targetA) case TARGET_CHAIN_HEAL: case TARGET_SINGLE_FRIEND_2: case TARGET_AREAEFFECT_PARTY_AND_CLASS: - case TARGET_SELF2: return true; default: break; @@ -585,12 +584,14 @@ bool IsPositiveEffect(uint32 spellId, uint32 effIndex) return false; case SPELL_AURA_PERIODIC_DAMAGE: // used in positive spells also. // part of negative spell if casted at self (prevent cancel) - if(spellproto->EffectImplicitTargetA[effIndex] == TARGET_SELF) + if (spellproto->EffectImplicitTargetA[effIndex] == TARGET_SELF || + spellproto->EffectImplicitTargetA[effIndex] == TARGET_SELF2) return false; break; case SPELL_AURA_MOD_DECREASE_SPEED: // used in positive spells also // part of positive spell if casted at self - if(spellproto->EffectImplicitTargetA[effIndex] != TARGET_SELF) + if (spellproto->EffectImplicitTargetA[effIndex] == TARGET_SELF || + spellproto->EffectImplicitTargetA[effIndex] == TARGET_SELF2) return false; // but not this if this first effect (don't found batter check) if(spellproto->Attributes & 0x4000000 && effIndex==0) @@ -1361,6 +1362,11 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons (spellInfo_2->Id == 23170 && spellInfo_1->Id == 23171) ) return false; + // Cool Down (See PeriodicAuraTick()) + if ((spellInfo_1->Id == 52441 && spellInfo_2->Id == 52443) || + (spellInfo_2->Id == 52441 && spellInfo_1->Id == 52443)) + return false; + // See Chapel Invisibility and See Noth Invisibility if( (spellInfo_1->Id == 52950 && spellInfo_2->Id == 52707) || (spellInfo_2->Id == 52950 && spellInfo_1->Id == 52707) ) diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index 8d8e3d8a4..b3b152d29 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -243,7 +243,6 @@ inline bool IsCasterSourceTarget(uint32 target) case TARGET_TOTEM_WATER: case TARGET_TOTEM_AIR: case TARGET_TOTEM_FIRE: - case TARGET_SUMMON: case TARGET_AREAEFFECT_CUSTOM_2: case TARGET_ALL_RAID_AROUND_CASTER: case TARGET_SELF2: diff --git a/src/game/StatSystem.cpp b/src/game/StatSystem.cpp index 8275d0c2f..dac6bed07 100644 --- a/src/game/StatSystem.cpp +++ b/src/game/StatSystem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/TargetedMovementGenerator.cpp index 57bff7243..10f259707 100644 --- a/src/game/TargetedMovementGenerator.cpp +++ b/src/game/TargetedMovementGenerator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/TargetedMovementGenerator.h b/src/game/TargetedMovementGenerator.h index 09499c251..ee3e5a743 100644 --- a/src/game/TargetedMovementGenerator.h +++ b/src/game/TargetedMovementGenerator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/TaxiHandler.cpp b/src/game/TaxiHandler.cpp index f452ea61e..034d23c5c 100644 --- a/src/game/TaxiHandler.cpp +++ b/src/game/TaxiHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/TemporarySummon.cpp b/src/game/TemporarySummon.cpp index a93bdd925..6b581a688 100644 --- a/src/game/TemporarySummon.cpp +++ b/src/game/TemporarySummon.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/TemporarySummon.h b/src/game/TemporarySummon.h index 28a9192f0..847d5a540 100644 --- a/src/game/TemporarySummon.h +++ b/src/game/TemporarySummon.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ThreatManager.cpp b/src/game/ThreatManager.cpp index 8f8329692..9bd97696a 100644 --- a/src/game/ThreatManager.cpp +++ b/src/game/ThreatManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/ThreatManager.h b/src/game/ThreatManager.h index 1b870095c..801e12bf3 100644 --- a/src/game/ThreatManager.h +++ b/src/game/ThreatManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Totem.cpp b/src/game/Totem.cpp index 698e811c2..0e8b8f8c3 100644 --- a/src/game/Totem.cpp +++ b/src/game/Totem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Totem.h b/src/game/Totem.h index 98f071b90..de0f83619 100644 --- a/src/game/Totem.h +++ b/src/game/Totem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/TotemAI.cpp b/src/game/TotemAI.cpp index 867aca762..f2a5934ae 100644 --- a/src/game/TotemAI.cpp +++ b/src/game/TotemAI.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/TotemAI.h b/src/game/TotemAI.h index bd2c2ad3d..8ec4d59a8 100644 --- a/src/game/TotemAI.h +++ b/src/game/TotemAI.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/TradeHandler.cpp b/src/game/TradeHandler.cpp index 6662545e4..96dbf00ef 100644 --- a/src/game/TradeHandler.cpp +++ b/src/game/TradeHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Transports.cpp b/src/game/Transports.cpp index e876e341b..1b07baae7 100644 --- a/src/game/Transports.cpp +++ b/src/game/Transports.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Transports.h b/src/game/Transports.h index 1ae05a753..5562e674a 100644 --- a/src/game/Transports.h +++ b/src/game/Transports.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Traveller.h b/src/game/Traveller.h index deb453dfa..eba2a86e4 100644 --- a/src/game/Traveller.h +++ b/src/game/Traveller.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index f60f1f3e9..1146cc6b2 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -3621,11 +3621,10 @@ bool Unit::AddAura(Aura *Aur) // Carry over removed Aura's remaining damage if Aura still has ticks remaining else if (aur2->GetSpellProto()->AttributesEx4 & SPELL_ATTR_EX4_STACK_DOT_MODIFIER && aurName == SPELL_AURA_PERIODIC_DAMAGE && aur2->GetAuraDuration() > 0) { - int32 remainingTicks = 1 + (aur2->GetAuraDuration() / aur2->GetModifier()->periodictime); + int32 remainingTicks = aur2->GetAuraMaxTicks() - aur2->GetAuraTicks(); int32 remainingDamage = aur2->GetModifier()->m_amount * remainingTicks; - int32 maxTicks = Aur->GetAuraMaxDuration() / Aur->GetModifier()->periodictime; - Aur->GetModifier()->m_amount += int32(remainingDamage / maxTicks); + Aur->GetModifier()->m_amount += int32(remainingDamage / Aur->GetAuraMaxTicks()); } // can be only single (this check done at _each_ aura add RemoveAura(i2,AURA_REMOVE_BY_STACK); @@ -9899,7 +9898,7 @@ void Unit::Mount(uint32 mount, uint32 spellId) // Normal case (Unsummon only permanent pet) else if (Pet* pet = GetPet()) { - if (pet->IsPermanentPetFor((Player*)this)) + if (pet->IsPermanentPetFor((Player*)this) && !((Player*)this)->InArena()) ((Player*)this)->UnsummonPetTemporaryIfAny(); else pet->ApplyModeFlags(PET_MODE_DISABLE_ACTIONS,true); diff --git a/src/game/Unit.h b/src/game/Unit.h index 304070422..e10869456 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/UnitEvents.h b/src/game/UnitEvents.h index a72b15369..199b9c038 100644 --- a/src/game/UnitEvents.h +++ b/src/game/UnitEvents.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/UpdateData.cpp b/src/game/UpdateData.cpp index e63de736f..881f6c784 100644 --- a/src/game/UpdateData.cpp +++ b/src/game/UpdateData.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/UpdateData.h b/src/game/UpdateData.h index c96f50063..e4e583b60 100644 --- a/src/game/UpdateData.h +++ b/src/game/UpdateData.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/UpdateFields.h b/src/game/UpdateFields.h index 677a8c4da..c0e326c90 100644 --- a/src/game/UpdateFields.h +++ b/src/game/UpdateFields.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/UpdateMask.h b/src/game/UpdateMask.h index 17b7fa1cf..d6b6ce5c5 100644 --- a/src/game/UpdateMask.h +++ b/src/game/UpdateMask.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Vehicle.cpp b/src/game/Vehicle.cpp index d856d3657..fe820db94 100644 --- a/src/game/Vehicle.cpp +++ b/src/game/Vehicle.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Vehicle.h b/src/game/Vehicle.h index 6d9c7cd79..656039403 100644 --- a/src/game/Vehicle.h +++ b/src/game/Vehicle.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/VoiceChatHandler.cpp b/src/game/VoiceChatHandler.cpp index b799f0a18..5806ce3c5 100644 --- a/src/game/VoiceChatHandler.cpp +++ b/src/game/VoiceChatHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/WaypointManager.cpp b/src/game/WaypointManager.cpp index b3b627aeb..eaf766f5a 100644 --- a/src/game/WaypointManager.cpp +++ b/src/game/WaypointManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/WaypointManager.h b/src/game/WaypointManager.h index 28ea5f6a0..ae8375a6b 100644 --- a/src/game/WaypointManager.h +++ b/src/game/WaypointManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp index 02add44f4..645c9a664 100644 --- a/src/game/WaypointMovementGenerator.cpp +++ b/src/game/WaypointMovementGenerator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/WaypointMovementGenerator.h b/src/game/WaypointMovementGenerator.h index c4e34e45e..62b471e8b 100644 --- a/src/game/WaypointMovementGenerator.h +++ b/src/game/WaypointMovementGenerator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Weather.cpp b/src/game/Weather.cpp index 64e3ff979..362ba33ec 100644 --- a/src/game/Weather.cpp +++ b/src/game/Weather.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/Weather.h b/src/game/Weather.h index 2cf86276a..cc9f02931 100644 --- a/src/game/Weather.h +++ b/src/game/Weather.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/World.cpp b/src/game/World.cpp index 5af45d949..3d4bd9eb9 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/World.h b/src/game/World.h index c9e50272a..170fc2a7a 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index 2f7037c12..9e4f0fa9e 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -149,7 +149,7 @@ void WorldSession::LogUnexpectedOpcode(WorldPacket* packet, const char *reason) /// Logging helper for unexpected opcodes void WorldSession::LogUnprocessedTail(WorldPacket *packet) { - sLog.outError( "SESSION: opcode %s (0x%.4X) have unprocessed tail data (read stop at %u from %u)", + sLog.outError( "SESSION: opcode %s (0x%.4X) have unprocessed tail data (read stop at " SIZEFMTD " from " SIZEFMTD ")", LookupOpcodeName(packet->GetOpcode()), packet->GetOpcode(), packet->rpos(),packet->wpos()); diff --git a/src/game/WorldSession.h b/src/game/WorldSession.h index 5a936ee8a..a1aad7bb7 100644 --- a/src/game/WorldSession.h +++ b/src/game/WorldSession.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp index f76a1d142..a818b618b 100644 --- a/src/game/WorldSocket.cpp +++ b/src/game/WorldSocket.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -475,7 +475,7 @@ int WorldSocket::handle_input_header (void) if ((header.size < 4) || (header.size > 10240) || (header.cmd > 10240)) { - sLog.outError ("WorldSocket::handle_input_header: client sent mailformed packet size = %d , cmd = %d", + sLog.outError ("WorldSocket::handle_input_header: client sent malformed packet size = %d , cmd = %d", header.size, header.cmd); errno = EINVAL; diff --git a/src/game/WorldSocket.h b/src/game/WorldSocket.h index ee0a3c2b0..584982cf3 100644 --- a/src/game/WorldSocket.h +++ b/src/game/WorldSocket.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/WorldSocketMgr.cpp b/src/game/WorldSocketMgr.cpp index b7a476123..24a54a752 100644 --- a/src/game/WorldSocketMgr.cpp +++ b/src/game/WorldSocketMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/WorldSocketMgr.h b/src/game/WorldSocketMgr.h index 75c98a1c9..98c97f5b0 100644 --- a/src/game/WorldSocketMgr.h +++ b/src/game/WorldSocketMgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/game/debugcmds.cpp b/src/game/debugcmds.cpp index 2d66fd18b..1596c7093 100644 --- a/src/game/debugcmds.cpp +++ b/src/game/debugcmds.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/mangosd/CliRunnable.cpp b/src/mangosd/CliRunnable.cpp index a97fd7fb6..4658db59a 100644 --- a/src/mangosd/CliRunnable.cpp +++ b/src/mangosd/CliRunnable.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -45,9 +45,9 @@ void utf8print(const char* str) char temp_buf[6000]; CharToOemBuffW(&wtemp_buf[0],&temp_buf[0],wtemp_len+1); - printf(temp_buf); + printf("%s", temp_buf); #else - printf(str); + printf("%s", str); #endif } diff --git a/src/mangosd/CliRunnable.h b/src/mangosd/CliRunnable.h index 1388c1a95..4e65c01bb 100644 --- a/src/mangosd/CliRunnable.h +++ b/src/mangosd/CliRunnable.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/mangosd/Main.cpp b/src/mangosd/Main.cpp index 3985ec76d..218fc5bef 100644 --- a/src/mangosd/Main.cpp +++ b/src/mangosd/Main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/mangosd/Makefile.am b/src/mangosd/Makefile.am index 3fd406888..25d5d79c1 100644 --- a/src/mangosd/Makefile.am +++ b/src/mangosd/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/src/mangosd/Master.cpp b/src/mangosd/Master.cpp index d4c60d5dd..867fe5d83 100644 --- a/src/mangosd/Master.cpp +++ b/src/mangosd/Master.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/mangosd/Master.h b/src/mangosd/Master.h index 777824f26..d99a2ca09 100644 --- a/src/mangosd/Master.h +++ b/src/mangosd/Master.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/mangosd/RASocket.cpp b/src/mangosd/RASocket.cpp index cceff509b..14511232d 100644 --- a/src/mangosd/RASocket.cpp +++ b/src/mangosd/RASocket.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/mangosd/RASocket.h b/src/mangosd/RASocket.h index 30f3394d5..91770d202 100644 --- a/src/mangosd/RASocket.h +++ b/src/mangosd/RASocket.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/mangosd/WorldRunnable.cpp b/src/mangosd/WorldRunnable.cpp index 28c4bf85b..4575a6e31 100644 --- a/src/mangosd/WorldRunnable.cpp +++ b/src/mangosd/WorldRunnable.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/mangosd/WorldRunnable.h b/src/mangosd/WorldRunnable.h index b48cca76b..e6532fe5a 100644 --- a/src/mangosd/WorldRunnable.h +++ b/src/mangosd/WorldRunnable.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/mangosd/mangosd.rc b/src/mangosd/mangosd.rc index a0c4a231e..d3a69eef6 100644 --- a/src/mangosd/mangosd.rc +++ b/src/mangosd/mangosd.rc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/realmd/AuthCodes.h b/src/realmd/AuthCodes.h index b6f9e1782..aa98567e6 100644 --- a/src/realmd/AuthCodes.h +++ b/src/realmd/AuthCodes.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/realmd/AuthSocket.cpp b/src/realmd/AuthSocket.cpp index 3f75e872e..35c3c3c52 100644 --- a/src/realmd/AuthSocket.cpp +++ b/src/realmd/AuthSocket.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/realmd/AuthSocket.h b/src/realmd/AuthSocket.h index 4c892101b..a3ce60d49 100644 --- a/src/realmd/AuthSocket.h +++ b/src/realmd/AuthSocket.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/realmd/Main.cpp b/src/realmd/Main.cpp index 38ea7f515..84f9ec0df 100644 --- a/src/realmd/Main.cpp +++ b/src/realmd/Main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/realmd/Makefile.am b/src/realmd/Makefile.am index 6aa09c392..259bf20b9 100644 --- a/src/realmd/Makefile.am +++ b/src/realmd/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/src/realmd/RealmList.cpp b/src/realmd/RealmList.cpp index cf99f144c..c6cf03005 100644 --- a/src/realmd/RealmList.cpp +++ b/src/realmd/RealmList.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/realmd/RealmList.h b/src/realmd/RealmList.h index a127ed68d..fbd229b18 100644 --- a/src/realmd/RealmList.h +++ b/src/realmd/RealmList.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/realmd/realmd.rc b/src/realmd/realmd.rc index d4740b5a4..224113e2f 100644 --- a/src/realmd/realmd.rc +++ b/src/realmd/realmd.rc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Auth/AuthCrypt.cpp b/src/shared/Auth/AuthCrypt.cpp index beec71763..782ae008b 100644 --- a/src/shared/Auth/AuthCrypt.cpp +++ b/src/shared/Auth/AuthCrypt.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Auth/AuthCrypt.h b/src/shared/Auth/AuthCrypt.h index de09584dd..0ec328b2d 100644 --- a/src/shared/Auth/AuthCrypt.h +++ b/src/shared/Auth/AuthCrypt.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Auth/BigNumber.cpp b/src/shared/Auth/BigNumber.cpp index 56365e889..929abaaf3 100644 --- a/src/shared/Auth/BigNumber.cpp +++ b/src/shared/Auth/BigNumber.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Auth/BigNumber.h b/src/shared/Auth/BigNumber.h index 49cc2ff35..611fe7d06 100644 --- a/src/shared/Auth/BigNumber.h +++ b/src/shared/Auth/BigNumber.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Auth/Hmac.cpp b/src/shared/Auth/Hmac.cpp index f3bfc7d44..e93f24362 100644 --- a/src/shared/Auth/Hmac.cpp +++ b/src/shared/Auth/Hmac.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Auth/Hmac.h b/src/shared/Auth/Hmac.h index c8e4e9a96..687f8e842 100644 --- a/src/shared/Auth/Hmac.h +++ b/src/shared/Auth/Hmac.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Auth/Makefile.am b/src/shared/Auth/Makefile.am index 34e56ad0a..869c1a180 100644 --- a/src/shared/Auth/Makefile.am +++ b/src/shared/Auth/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/src/shared/Auth/SARC4.cpp b/src/shared/Auth/SARC4.cpp index f59bb7f0c..eba3ae8c1 100644 --- a/src/shared/Auth/SARC4.cpp +++ b/src/shared/Auth/SARC4.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Auth/SARC4.h b/src/shared/Auth/SARC4.h index 3f15328d6..9805f10c9 100644 --- a/src/shared/Auth/SARC4.h +++ b/src/shared/Auth/SARC4.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Auth/Sha1.cpp b/src/shared/Auth/Sha1.cpp index 6beff2699..fcc806a0c 100644 --- a/src/shared/Auth/Sha1.cpp +++ b/src/shared/Auth/Sha1.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Auth/Sha1.h b/src/shared/Auth/Sha1.h index 754ab3f9e..1a777c8c8 100644 --- a/src/shared/Auth/Sha1.h +++ b/src/shared/Auth/Sha1.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/ByteBuffer.h b/src/shared/ByteBuffer.h index b40539402..26a74fb7e 100644 --- a/src/shared/ByteBuffer.h +++ b/src/shared/ByteBuffer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Common.cpp b/src/shared/Common.cpp index 24c68bb1d..b0cf5aadd 100644 --- a/src/shared/Common.cpp +++ b/src/shared/Common.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Common.h b/src/shared/Common.h index c3f16b73d..2f55b2674 100644 --- a/src/shared/Common.h +++ b/src/shared/Common.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -55,16 +55,16 @@ #include "Platform/Define.h" #if COMPILER == COMPILER_MICROSOFT -# pragma warning(disable:4996) // 'function': was declared deprecated +# pragma warning(disable:4996) // 'function': was declared deprecated #ifndef __SHOW_STUPID_WARNINGS__ -# pragma warning(disable:4005) // 'identifier' : macro redefinition -# pragma warning(disable:4018) // 'expression' : signed/unsigned mismatch -# pragma warning(disable:4244) // 'argument' : conversion from 'type1' to 'type2', possible loss of data -# pragma warning(disable:4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data -# pragma warning(disable:4305) // 'identifier' : truncation from 'type1' to 'type2' -# pragma warning(disable:4311) // 'variable' : pointer truncation from 'type' to 'type' -# pragma warning(disable:4355) // 'this' : used in base member initializer list -# pragma warning(disable:4800) // 'type' : forcing value to bool 'true' or 'false' (performance warning) +# pragma warning(disable:4005) // 'identifier' : macro redefinition +# pragma warning(disable:4018) // 'expression' : signed/unsigned mismatch +# pragma warning(disable:4244) // 'argument' : conversion from 'type1' to 'type2', possible loss of data +# pragma warning(disable:4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data +# pragma warning(disable:4305) // 'identifier' : truncation from 'type1' to 'type2' +# pragma warning(disable:4311) // 'variable' : pointer truncation from 'type' to 'type' +# pragma warning(disable:4355) // 'this' : used in base member initializer list +# pragma warning(disable:4800) // 'type' : forcing value to bool 'true' or 'false' (performance warning) #endif // __SHOW_STUPID_WARNINGS__ #endif // __GNUC__ @@ -116,20 +116,25 @@ #if COMPILER == COMPILER_MICROSOFT -#include +# include -#define I32FMT "%08I32X" -#define I64FMT "%016I64X" -#define snprintf _snprintf -#define vsnprintf _vsnprintf -#define finite(X) _finite(X) +# define I32FMT "%08I32X" +# define I64FMT "%016I64X" +# define snprintf _snprintf +# define vsnprintf _vsnprintf +# define finite(X) _finite(X) #else -#define stricmp strcasecmp -#define strnicmp strncasecmp -#define I32FMT "%08X" -#define I64FMT "%016llX" +# define stricmp strcasecmp +# define strnicmp strncasecmp + +# define I32FMT "%08X" +# if ACE_SIZEOF_LONG == 8 +# define I64FMT "%016lX" +# else +# define I64FMT "%016llX" +# endif /* ACE_SIZEOF_LONG == 8 */ #endif @@ -194,15 +199,15 @@ inline char * mangos_strdup(const char * source) // we always use stdlibc++ std::max/std::min, undefine some not C++ standard defines (Win API and some pother platforms) #ifdef max -#undef max +# undef max #endif #ifdef min -#undef min +# undef min #endif #ifndef M_PI -#define M_PI 3.14159265358979323846 +# define M_PI 3.14159265358979323846 #endif #endif diff --git a/src/shared/Config/Config.cpp b/src/shared/Config/Config.cpp index 6efcb6968..a9a2e3f80 100644 --- a/src/shared/Config/Config.cpp +++ b/src/shared/Config/Config.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Config/Config.h b/src/shared/Config/Config.h index 989c8e19f..296018408 100644 --- a/src/shared/Config/Config.h +++ b/src/shared/Config/Config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Config/ConfigEnv.h b/src/shared/Config/ConfigEnv.h index c0603a2b2..e9801b641 100644 --- a/src/shared/Config/ConfigEnv.h +++ b/src/shared/Config/ConfigEnv.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Config/Makefile.am b/src/shared/Config/Makefile.am index 8bfed3b3c..7d670af90 100644 --- a/src/shared/Config/Makefile.am +++ b/src/shared/Config/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/src/shared/Database/DBCFileLoader.cpp b/src/shared/Database/DBCFileLoader.cpp index 719138aff..613a87e25 100644 --- a/src/shared/Database/DBCFileLoader.cpp +++ b/src/shared/Database/DBCFileLoader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/DBCFileLoader.h b/src/shared/Database/DBCFileLoader.h index 13562148d..3564e8ce1 100644 --- a/src/shared/Database/DBCFileLoader.h +++ b/src/shared/Database/DBCFileLoader.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/DBCStore.h b/src/shared/Database/DBCStore.h index 523d5c5a0..a557edae0 100644 --- a/src/shared/Database/DBCStore.h +++ b/src/shared/Database/DBCStore.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp index dff2ff120..68bfb0db5 100644 --- a/src/shared/Database/Database.cpp +++ b/src/shared/Database/Database.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h index 5935692d2..a6dc98d70 100644 --- a/src/shared/Database/Database.h +++ b/src/shared/Database/Database.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/DatabaseEnv.h b/src/shared/Database/DatabaseEnv.h index 92758c3af..acb5567fa 100644 --- a/src/shared/Database/DatabaseEnv.h +++ b/src/shared/Database/DatabaseEnv.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/DatabaseImpl.h b/src/shared/Database/DatabaseImpl.h index 3e0ea9349..8e2d1c84f 100644 --- a/src/shared/Database/DatabaseImpl.h +++ b/src/shared/Database/DatabaseImpl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp index 969617272..84c211c75 100644 --- a/src/shared/Database/DatabaseMysql.cpp +++ b/src/shared/Database/DatabaseMysql.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h index c2eee285a..8205b7be3 100644 --- a/src/shared/Database/DatabaseMysql.h +++ b/src/shared/Database/DatabaseMysql.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/DatabasePostgre.cpp b/src/shared/Database/DatabasePostgre.cpp index 359728410..8a2cae0c2 100644 --- a/src/shared/Database/DatabasePostgre.cpp +++ b/src/shared/Database/DatabasePostgre.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/DatabasePostgre.h b/src/shared/Database/DatabasePostgre.h index 4d85eec98..1dd65d265 100644 --- a/src/shared/Database/DatabasePostgre.h +++ b/src/shared/Database/DatabasePostgre.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/Field.cpp b/src/shared/Database/Field.cpp index 592865d9f..679d0effa 100644 --- a/src/shared/Database/Field.cpp +++ b/src/shared/Database/Field.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/Field.h b/src/shared/Database/Field.h index e0ce21b91..8f23311aa 100644 --- a/src/shared/Database/Field.h +++ b/src/shared/Database/Field.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/Makefile.am b/src/shared/Database/Makefile.am index 572b72cd3..311ce9383 100644 --- a/src/shared/Database/Makefile.am +++ b/src/shared/Database/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/src/shared/Database/MySQLDelayThread.h b/src/shared/Database/MySQLDelayThread.h index 5355b0b8a..e41728bbf 100644 --- a/src/shared/Database/MySQLDelayThread.h +++ b/src/shared/Database/MySQLDelayThread.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/PGSQLDelayThread.h b/src/shared/Database/PGSQLDelayThread.h index 7ad2b5084..8aaafdf0c 100644 --- a/src/shared/Database/PGSQLDelayThread.h +++ b/src/shared/Database/PGSQLDelayThread.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h index 16fd85d10..7dd6e0673 100644 --- a/src/shared/Database/QueryResult.h +++ b/src/shared/Database/QueryResult.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/QueryResultMysql.cpp b/src/shared/Database/QueryResultMysql.cpp index 9eb2dde4e..19900fea6 100644 --- a/src/shared/Database/QueryResultMysql.cpp +++ b/src/shared/Database/QueryResultMysql.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/QueryResultMysql.h b/src/shared/Database/QueryResultMysql.h index e994719f8..77797e105 100644 --- a/src/shared/Database/QueryResultMysql.h +++ b/src/shared/Database/QueryResultMysql.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/QueryResultPostgre.cpp b/src/shared/Database/QueryResultPostgre.cpp index bd4bc72b8..7d989dbb0 100644 --- a/src/shared/Database/QueryResultPostgre.cpp +++ b/src/shared/Database/QueryResultPostgre.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/QueryResultPostgre.h b/src/shared/Database/QueryResultPostgre.h index b5f7978c0..420b6858f 100644 --- a/src/shared/Database/QueryResultPostgre.h +++ b/src/shared/Database/QueryResultPostgre.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp index 513f4b51d..67201e0a7 100644 --- a/src/shared/Database/SQLStorage.cpp +++ b/src/shared/Database/SQLStorage.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/SQLStorage.h b/src/shared/Database/SQLStorage.h index 139d808e2..1ef8c659d 100644 --- a/src/shared/Database/SQLStorage.h +++ b/src/shared/Database/SQLStorage.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h index bfc8c2c21..ac5e87644 100644 --- a/src/shared/Database/SQLStorageImpl.h +++ b/src/shared/Database/SQLStorageImpl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/SqlDelayThread.cpp b/src/shared/Database/SqlDelayThread.cpp index 9ad6756cd..20a832251 100644 --- a/src/shared/Database/SqlDelayThread.cpp +++ b/src/shared/Database/SqlDelayThread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/SqlDelayThread.h b/src/shared/Database/SqlDelayThread.h index 4e78e990e..0b3e633ef 100644 --- a/src/shared/Database/SqlDelayThread.h +++ b/src/shared/Database/SqlDelayThread.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp index bcea9078d..5bb446502 100644 --- a/src/shared/Database/SqlOperations.cpp +++ b/src/shared/Database/SqlOperations.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -95,13 +95,13 @@ bool SqlQueryHolder::SetQuery(size_t index, const char *sql) { if(m_queries.size() <= index) { - sLog.outError("Query index (%u) out of range (size: %u) for query: %s",index,(uint32)m_queries.size(),sql); + sLog.outError("Query index (" SIZEFMTD ") out of range (size: " SIZEFMTD ") for query: %s",index,(uint32)m_queries.size(),sql); return false; } if(m_queries[index].first != NULL) { - sLog.outError("Attempt assign query to holder index (%u) where other query stored (Old: [%s] New: [%s])", + sLog.outError("Attempt assign query to holder index (" SIZEFMTD ") where other query stored (Old: [%s] New: [%s])", index,m_queries[index].first,sql); return false; } @@ -115,7 +115,7 @@ bool SqlQueryHolder::SetPQuery(size_t index, const char *format, ...) { if(!format) { - sLog.outError("Query (index: %u) is empty.",index); + sLog.outError("Query (index: " SIZEFMTD ") is empty.",index); return false; } diff --git a/src/shared/Database/SqlOperations.h b/src/shared/Database/SqlOperations.h index 052ea425e..fa9437cc0 100644 --- a/src/shared/Database/SqlOperations.h +++ b/src/shared/Database/SqlOperations.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Errors.h b/src/shared/Errors.h index 701bda930..16ffff9b5 100644 --- a/src/shared/Errors.h +++ b/src/shared/Errors.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/LockedQueue.h b/src/shared/LockedQueue.h index abb68dd80..b3adb1372 100644 --- a/src/shared/LockedQueue.h +++ b/src/shared/LockedQueue.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 MaNGOS + * Copyright (C) 2009-2010 MaNGOS * * 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 diff --git a/src/shared/Log.cpp b/src/shared/Log.cpp index 429b089e7..9d9988ddc 100644 --- a/src/shared/Log.cpp +++ b/src/shared/Log.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 @@ -329,15 +329,15 @@ void Log::outTitle( const char * str) SetColor(true,WHITE); // not expected utf8 and then send as-is - printf( str ); + printf("%s", str); if(m_colored) ResetColor(true); - printf( "\n" ); + printf("\n"); if(logfile) { - fprintf(logfile, str); + fprintf(logfile, "%s", str); fprintf(logfile, "\n" ); fflush(logfile); } @@ -706,7 +706,7 @@ void Log::outWorldPacketDump( uint32 socket, uint32 opcode, char const* opcodeNa outTimestamp(worldLogfile); - fprintf(worldLogfile,"\n%s:\nSOCKET: %u\nLENGTH: %u\nOPCODE: %s (0x%.4X)\nDATA:\n", + fprintf(worldLogfile,"\n%s:\nSOCKET: %u\nLENGTH: " SIZEFMTD "\nOPCODE: %s (0x%.4X)\nDATA:\n", incoming ? "CLIENT" : "SERVER", socket, packet->size(), opcodeName, opcode); @@ -789,10 +789,10 @@ void outstring_log(const char * str, ...) char buf[256]; va_list ap; va_start(ap, str); - vsnprintf(buf,256, str, ap); + vsnprintf(buf, 256, str, ap); va_end(ap); - sLog.outString(buf); + sLog.outString("%s", buf); } void detail_log(const char * str, ...) @@ -806,7 +806,7 @@ void detail_log(const char * str, ...) vsnprintf(buf,256, str, ap); va_end(ap); - sLog.outDetail(buf); + sLog.outDetail("%s", buf); } void debug_log(const char * str, ...) @@ -820,7 +820,7 @@ void debug_log(const char * str, ...) vsnprintf(buf,256, str, ap); va_end(ap); - sLog.outDebug(buf); + sLog.outDebug("%s", buf); } void error_log(const char * str, ...) @@ -834,7 +834,7 @@ void error_log(const char * str, ...) vsnprintf(buf,256, str, ap); va_end(ap); - sLog.outError(buf); + sLog.outError("%s", buf); } void error_db_log(const char * str, ...) @@ -848,5 +848,5 @@ void error_db_log(const char * str, ...) vsnprintf(buf,256, str, ap); va_end(ap); - sLog.outErrorDb(buf); + sLog.outErrorDb("%s", buf); } diff --git a/src/shared/Log.h b/src/shared/Log.h index 2500c6722..9d08d66b3 100644 --- a/src/shared/Log.h +++ b/src/shared/Log.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Makefile.am b/src/shared/Makefile.am index fe77ef9c3..f98697d36 100644 --- a/src/shared/Makefile.am +++ b/src/shared/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/src/shared/MemoryLeaks.cpp b/src/shared/MemoryLeaks.cpp index ef7e36c3b..3da60255d 100644 --- a/src/shared/MemoryLeaks.cpp +++ b/src/shared/MemoryLeaks.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/MemoryLeaks.h b/src/shared/MemoryLeaks.h index 4e98961fb..7a6874b17 100644 --- a/src/shared/MemoryLeaks.h +++ b/src/shared/MemoryLeaks.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/PacketLog.cpp b/src/shared/PacketLog.cpp index 184e9e9b9..b04fb2da0 100644 --- a/src/shared/PacketLog.cpp +++ b/src/shared/PacketLog.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/PacketLog.h b/src/shared/PacketLog.h index a0ae06d33..7c56082b5 100644 --- a/src/shared/PacketLog.h +++ b/src/shared/PacketLog.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/ProgressBar.cpp b/src/shared/ProgressBar.cpp index 65fb65e42..f277eea16 100644 --- a/src/shared/ProgressBar.cpp +++ b/src/shared/ProgressBar.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/ProgressBar.h b/src/shared/ProgressBar.h index aaffcf9f7..dd4c5b64d 100644 --- a/src/shared/ProgressBar.h +++ b/src/shared/ProgressBar.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/ServiceWin32.cpp b/src/shared/ServiceWin32.cpp index 82b51652b..843b6b074 100644 --- a/src/shared/ServiceWin32.cpp +++ b/src/shared/ServiceWin32.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/shared/ServiceWin32.h b/src/shared/ServiceWin32.h index 924680969..77e822630 100644 --- a/src/shared/ServiceWin32.h +++ b/src/shared/ServiceWin32.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/shared/SystemConfig.h.in b/src/shared/SystemConfig.h.in index 532882ecb..a4d9317c2 100644 --- a/src/shared/SystemConfig.h.in +++ b/src/shared/SystemConfig.h.in @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Threading.cpp b/src/shared/Threading.cpp index 3938286db..c048b0f89 100644 --- a/src/shared/Threading.cpp +++ b/src/shared/Threading.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 MaNGOS + * Copyright (C) 2009-2010 MaNGOS * * 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 diff --git a/src/shared/Threading.h b/src/shared/Threading.h index 574b9641a..0684616aa 100644 --- a/src/shared/Threading.h +++ b/src/shared/Threading.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 MaNGOS + * Copyright (C) 2009-2010 MaNGOS * * 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 diff --git a/src/shared/Timer.h b/src/shared/Timer.h index c258fdcee..fde623a62 100644 --- a/src/shared/Timer.h +++ b/src/shared/Timer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Util.cpp b/src/shared/Util.cpp index cdd890bc7..7584d8c8a 100644 --- a/src/shared/Util.cpp +++ b/src/shared/Util.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/Util.h b/src/shared/Util.h index d7f269fe1..d8546cab5 100644 --- a/src/shared/Util.h +++ b/src/shared/Util.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/WorldPacket.h b/src/shared/WorldPacket.h index d038db86c..fadcbc73b 100644 --- a/src/shared/WorldPacket.h +++ b/src/shared/WorldPacket.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 911db56a7..d4998999f 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9086" + #define REVISION_NR "9124" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 1d1a0c56c..388180f74 100644 --- a/src/shared/revision_sql.h +++ b/src/shared/revision_sql.h @@ -1,6 +1,6 @@ #ifndef __REVISION_SQL_H__ #define __REVISION_SQL_H__ #define REVISION_DB_CHARACTERS "required_8874_01_characters_character_skills" - #define REVISION_DB_MANGOS "required_9074_01_mangos_command" + #define REVISION_DB_MANGOS "required_9121_01_mangos_npc_spellclick_spells" #define REVISION_DB_REALMD "required_9010_01_realmd_realmlist" #endif // __REVISION_SQL_H__ diff --git a/src/shared/vmap/BaseModel.cpp b/src/shared/vmap/BaseModel.cpp index 4a131c46a..4ba4ad4e8 100644 --- a/src/shared/vmap/BaseModel.cpp +++ b/src/shared/vmap/BaseModel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/BaseModel.h b/src/shared/vmap/BaseModel.h index f9bc977b0..232fa79dd 100644 --- a/src/shared/vmap/BaseModel.h +++ b/src/shared/vmap/BaseModel.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/CoordModelMapping.cpp b/src/shared/vmap/CoordModelMapping.cpp index 4b4dc50c9..6b2d0ec5b 100644 --- a/src/shared/vmap/CoordModelMapping.cpp +++ b/src/shared/vmap/CoordModelMapping.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/CoordModelMapping.h b/src/shared/vmap/CoordModelMapping.h index 0200caaa7..cc722d31d 100644 --- a/src/shared/vmap/CoordModelMapping.h +++ b/src/shared/vmap/CoordModelMapping.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/DebugCmdLogger.cpp b/src/shared/vmap/DebugCmdLogger.cpp index 036149977..bb6feff06 100644 --- a/src/shared/vmap/DebugCmdLogger.cpp +++ b/src/shared/vmap/DebugCmdLogger.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/DebugCmdLogger.h b/src/shared/vmap/DebugCmdLogger.h index b9cc05cec..ab5dd33e2 100644 --- a/src/shared/vmap/DebugCmdLogger.h +++ b/src/shared/vmap/DebugCmdLogger.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/IVMapManager.h b/src/shared/vmap/IVMapManager.h index d4b776d8d..8dd3f700d 100644 --- a/src/shared/vmap/IVMapManager.h +++ b/src/shared/vmap/IVMapManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/Makefile.am b/src/shared/vmap/Makefile.am index 8ebbb1e04..032cd565c 100644 --- a/src/shared/vmap/Makefile.am +++ b/src/shared/vmap/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/src/shared/vmap/ManagedModelContainer.cpp b/src/shared/vmap/ManagedModelContainer.cpp index 90e774536..ce6eecb65 100644 --- a/src/shared/vmap/ManagedModelContainer.cpp +++ b/src/shared/vmap/ManagedModelContainer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/ManagedModelContainer.h b/src/shared/vmap/ManagedModelContainer.h index b08bcb852..6133e179d 100644 --- a/src/shared/vmap/ManagedModelContainer.h +++ b/src/shared/vmap/ManagedModelContainer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/ModelContainer.cpp b/src/shared/vmap/ModelContainer.cpp index ff4f9358b..f069d773c 100644 --- a/src/shared/vmap/ModelContainer.cpp +++ b/src/shared/vmap/ModelContainer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/ModelContainer.h b/src/shared/vmap/ModelContainer.h index 729da5795..7eefdb9df 100644 --- a/src/shared/vmap/ModelContainer.h +++ b/src/shared/vmap/ModelContainer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/NodeValueAccess.h b/src/shared/vmap/NodeValueAccess.h index d3a3273d6..81401ee5a 100644 --- a/src/shared/vmap/NodeValueAccess.h +++ b/src/shared/vmap/NodeValueAccess.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/ShortBox.h b/src/shared/vmap/ShortBox.h index 32a1b37e3..db01ef1b4 100644 --- a/src/shared/vmap/ShortBox.h +++ b/src/shared/vmap/ShortBox.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/ShortVector.h b/src/shared/vmap/ShortVector.h index cbb143c22..9afd7facc 100644 --- a/src/shared/vmap/ShortVector.h +++ b/src/shared/vmap/ShortVector.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/SubModel.cpp b/src/shared/vmap/SubModel.cpp index 17ca10fd8..4024fb9d8 100644 --- a/src/shared/vmap/SubModel.cpp +++ b/src/shared/vmap/SubModel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/SubModel.h b/src/shared/vmap/SubModel.h index eff14033e..2dc856f0a 100644 --- a/src/shared/vmap/SubModel.h +++ b/src/shared/vmap/SubModel.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/TileAssembler.cpp b/src/shared/vmap/TileAssembler.cpp index 99bb2a4cd..7d4342b93 100644 --- a/src/shared/vmap/TileAssembler.cpp +++ b/src/shared/vmap/TileAssembler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/TileAssembler.h b/src/shared/vmap/TileAssembler.h index 7829e01db..28600c77f 100644 --- a/src/shared/vmap/TileAssembler.h +++ b/src/shared/vmap/TileAssembler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/TreeNode.cpp b/src/shared/vmap/TreeNode.cpp index 2c2ba9d79..5390e3efc 100644 --- a/src/shared/vmap/TreeNode.cpp +++ b/src/shared/vmap/TreeNode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/TreeNode.h b/src/shared/vmap/TreeNode.h index 96a1389ce..9ce299ece 100644 --- a/src/shared/vmap/TreeNode.h +++ b/src/shared/vmap/TreeNode.h @@ -1,5 +1,5 @@ /* -* Copyright (C) 2005-2009 MaNGOS +* Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/VMapDefinitions.h b/src/shared/vmap/VMapDefinitions.h index 3d21c7289..69fc5bd9b 100644 --- a/src/shared/vmap/VMapDefinitions.h +++ b/src/shared/vmap/VMapDefinitions.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/VMapFactory.cpp b/src/shared/vmap/VMapFactory.cpp index 7a8e68c6c..8b1d3498b 100644 --- a/src/shared/vmap/VMapFactory.cpp +++ b/src/shared/vmap/VMapFactory.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/VMapFactory.h b/src/shared/vmap/VMapFactory.h index e9d41c51f..8dc2c0193 100644 --- a/src/shared/vmap/VMapFactory.h +++ b/src/shared/vmap/VMapFactory.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/VMapManager.cpp b/src/shared/vmap/VMapManager.cpp index 9e4488183..2cf45c450 100644 --- a/src/shared/vmap/VMapManager.cpp +++ b/src/shared/vmap/VMapManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/VMapManager.h b/src/shared/vmap/VMapManager.h index 3d9057f91..a322f48d3 100644 --- a/src/shared/vmap/VMapManager.h +++ b/src/shared/vmap/VMapManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/shared/vmap/VMapTools.h b/src/shared/vmap/VMapTools.h index d59d9e6bb..dbbd9af92 100644 --- a/src/shared/vmap/VMapTools.h +++ b/src/shared/vmap/VMapTools.h @@ -1,5 +1,5 @@ /* -* Copyright (C) 2005-2009 MaNGOS +* Copyright (C) 2005-2010 MaNGOS * * 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 diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index 81040a495..b6b1e4e49 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/src/tools/genrevision/Makefile.am b/src/tools/genrevision/Makefile.am index fc66e8181..f29c3561b 100644 --- a/src/tools/genrevision/Makefile.am +++ b/src/tools/genrevision/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2009 MaNGOS +# Copyright (C) 2005-2010 MaNGOS # # 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 diff --git a/src/tools/genrevision/genrevision.cpp b/src/tools/genrevision/genrevision.cpp index ace3a0bbe..b0d7a39ad 100644 --- a/src/tools/genrevision/genrevision.cpp +++ b/src/tools/genrevision/genrevision.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2010 MaNGOS * * 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