Permalink
Browse files

Merge branch 'master' of git://github.com/cmangos/mangos-wotlk

  • Loading branch information...
2 parents ebae824 + 299041c commit 03a5c35357b3c57791a535d41b16221e725df4df @blueboy blueboy committed Oct 31, 2012
Showing with 1,895 additions and 1,209 deletions.
  1. +56 −29 README
  2. +3 −3 contrib/extractor_binary/ExtractResources.sh
  3. +1 −1 contrib/extractor_binary/README.txt
  4. BIN contrib/extractor_binary/{vmapExtractor3.exe → vmapExtractor.exe}
  5. +2 −2 contrib/git_id/git_id.cpp
  6. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/.gitignore
  7. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/CMakeLists.txt
  8. +3 −3 contrib/{vmap_extractor_v3 → vmap_extractor}/README
  9. +1 −1 contrib/{vmap_extractor_v3 → vmap_extractor}/make_vmaps.bat
  10. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/CMakeLists.txt
  11. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/adtfile.cpp
  12. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/adtfile.h
  13. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/dbcfile.cpp
  14. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/dbcfile.h
  15. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/loadlib/loadlib.h
  16. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/model.cpp
  17. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/model.h
  18. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/modelheaders.h
  19. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/mpq_libmpq.cpp
  20. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/mpq_libmpq04.h
  21. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/vec3d.h
  22. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/vmapexport.cpp
  23. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/vmapexport.h
  24. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/wdtfile.cpp
  25. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/wdtfile.h
  26. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/wmo.cpp
  27. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/wmo.h
  28. +1 −1 ...p_extractor_v3/win/VC100/vmapExtractor3.vcxproj → vmap_extractor/win/VC100/vmapExtractor.vcxproj}
  29. +2 −2 ...{vmap_extractor_v3/win/VC90/vmapExtractor3.vcproj → vmap_extractor/win/VC90/vmapExtractor.vcproj}
  30. +1 −1 ...rib/{vmap_extractor_v3/win/vmapExtractor3_VC100.sln → vmap_extractor/win/vmapExtractor_VC100.sln}
  31. +1 −1 contrib/{vmap_extractor_v3/win/vmapExtractor3_VC90.sln → vmap_extractor/win/vmapExtractor_VC90.sln}
  32. +21 −3 doc/EventAI.txt
  33. +46 −2 sql/mangos.sql
  34. +13 −0 sql/updates/12188_01_mangos_vehicle_accessory.sql
  35. +23 −0 sql/updates/12189_01_mangos_creature_template_spells.sql
  36. +2 −2 src/game/AuctionHouseBot/AuctionHouseBot.cpp
  37. +1 −1 src/game/BattleGround/BattleGroundAV.cpp
  38. +48 −33 src/game/Creature.cpp
  39. +13 −9 src/game/Creature.h
  40. +21 −14 src/game/CreatureEventAI.cpp
  41. +4 −2 src/game/CreatureEventAI.h
  42. +3 −2 src/game/CreatureEventAIMgr.cpp
  43. +23 −0 src/game/DBCEnums.h
  44. +4 −0 src/game/DBCStores.cpp
  45. +1 −1 src/game/DuelHandler.cpp
  46. +3 −3 src/game/FleeingMovementGenerator.cpp
  47. +1 −1 src/game/GridNotifiersImpl.h
  48. +1 −1 src/game/HomeMovementGenerator.cpp
  49. +7 −7 src/game/Level3.cpp
  50. +2 −4 src/game/LootHandler.cpp
  51. +9 −9 src/game/LootMgr.cpp
  52. +1 −0 src/game/Map.h
  53. +2 −8 src/game/MiscHandler.cpp
  54. +0 −6 src/game/MotionMaster.cpp
  55. +0 −3 src/game/MotionMaster.h
  56. +1 −1 src/game/MoveMap.h
  57. +0 −2 src/game/MovementGenerator.h
  58. +5 −2 src/game/MovementHandler.cpp
  59. +1 −1 src/game/NPCHandler.cpp
  60. +0 −2 src/game/Object.h
  61. +96 −162 src/game/ObjectMgr.cpp
  62. +11 −30 src/game/ObjectMgr.h
  63. +2 −2 src/game/Opcodes.cpp
  64. +1 −1 src/game/OutdoorPvP/OutdoorPvPNA.cpp
  65. +1 −1 src/game/OutdoorPvP/OutdoorPvPNA.h
  66. +2 −2 src/game/OutdoorPvP/OutdoorPvPSI.cpp
  67. +6 −6 src/game/OutdoorPvP/OutdoorPvPZM.cpp
  68. +15 −20 src/game/PathFinder.cpp
  69. +1 −1 src/game/Pet.cpp
  70. +61 −67 src/game/Player.cpp
  71. +102 −102 src/game/Player.h
  72. +2 −2 src/game/QueryHandler.cpp
  73. +2 −2 src/game/RandomMovementGenerator.cpp
  74. +12 −4 src/game/SQLStorages.cpp
  75. +6 −2 src/game/SQLStorages.h
  76. +50 −59 src/game/ScriptMgr.cpp
  77. +13 −4 src/game/SharedDefines.h
  78. +136 −78 src/game/Spell.cpp
  79. +4 −0 src/game/Spell.h
  80. +2 −2 src/game/SpellAuraDefines.h
  81. +59 −42 src/game/SpellAuras.cpp
  82. +1 −0 src/game/SpellAuras.h
  83. +84 −20 src/game/SpellEffects.cpp
  84. +7 −4 src/game/SpellMgr.cpp
  85. +1 −3 src/game/SpellMgr.h
  86. +40 −75 src/game/TargetedMovementGenerator.cpp
  87. +4 −5 src/game/TargetedMovementGenerator.h
  88. +2 −2 src/game/Totem.cpp
  89. +1 −1 src/game/Totem.h
  90. +20 −1 src/game/TransportSystem.cpp
  91. +6 −0 src/game/TransportSystem.h
  92. +135 −110 src/game/Unit.cpp
  93. +17 −8 src/game/Unit.h
  94. +2 −2 src/game/UnitAuraProcHandler.cpp
  95. +117 −17 src/game/Vehicle.cpp
  96. +20 −2 src/game/Vehicle.h
  97. +40 −0 src/game/VehicleHandler.cpp
  98. +3 −3 src/game/WaypointMovementGenerator.cpp
  99. +1 −1 src/game/Weather.cpp
  100. +7 −1 src/game/World.cpp
  101. +1 −1 src/game/WorldSession.cpp
  102. +2 −0 src/game/WorldSession.h
  103. +3 −2 src/game/movement/MoveSpline.cpp
  104. +1 −1 src/game/movement/MoveSplineInit.cpp
  105. +3 −1 src/game/movement/MoveSplineInitArgs.h
  106. +5 −5 src/mangosd/mangosd.conf.dist.in
  107. +1 −1 src/shared/Database/DBCFileLoader.h
  108. +180 −58 src/shared/Database/SQLStorage.cpp
  109. +204 −46 src/shared/Database/SQLStorage.h
  110. +68 −80 src/shared/Database/SQLStorageImpl.h
  111. +2 −2 src/shared/Database/SqlOperations.cpp
  112. +2 −2 src/shared/Log.cpp
  113. +2 −1 src/shared/WheatyExceptionReport.cpp
  114. +1 −1 src/shared/revision_nr.h
  115. +1 −1 src/shared/revision_sql.h
View
85 README
@@ -1,8 +1,8 @@
-= MaNGOS -- README =
+= C(ontinued)-MaNGOS -- README =
-Copyright (C) 2005-2012 MaNGOS project <http://getmangos.com/>
+Copyright (C) 2005-2012 C(ontinued)-MaNGOS project
- MaNGOS is free software; you can redistribute it and/or modify
+ CMaNGOS is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
@@ -16,37 +16,64 @@ Copyright (C) 2005-2012 MaNGOS project <http://getmangos.com/>
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- In addition, as a special exception, the MaNGOS project
- gives permission to link the code of its release of MaNGOS with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version.
+ Exceptions where the GPL does not apply are below
+
+=== Welcome to C(ontinued)-MaNGOS ===
+
+C(ontinued)-MaNGOS is a project with the goal:
+
+ Doing WoW-Emulation Right!
+
+This means, we want to focus on:
-Comments are welcome.
+* WoW-Emulation:
+ This project is about developing a server software to be able to
+ emulate some well known MMORPG service
- - theluda <theluda@getmangos.com>
+* Doing:
+ - This project is focused about developing content!
+ - Also there are many more aspects that need to be done and are
+ considered equally important.
+ So anybody who wants to do stuff is very welcome to do so!
-== Welcome to MaNGOS ==
+* Right:
+ - Our goal always must be to provide the best code we can
+ - Being 'right' is defined by the behavior of the system
+ we want to emulate
+ - Developing things right also contains documenting and discussing
+ _how_ to do things better, hence
+ - Learning and Teaching are very important in our view, and must
+ always be part of what we do.
-MaNGOS (the Massive Network Game Object Server) is an Open Source reference
-implementation for a MMORPG server system. Please see the file COPYING for
-license details.
+To be able to provide for these goals, we assert:
-For further information on the MaNGOS project, please visit our project web
-site at <http://getmangos.com/>
+* Freedom
+ - for our developers and contributers on things that interest them.
+ No one here is telling anybody _what_ to do.
+ If you want somebody to do something for you, pay him,
+ but we are here to enjoy.
+ - to have FUN with developing.
-Documentation on various development related topics can be found in the doc/
-subdirectory, including Doxygen-generated API documentation.
+* A friendly environment
+ - we try to let personal issues behind us
+ - we only argue about content, and not about thin air!
+ - we follow the Netiquette <insert link when found>
-The required SQL files for creating the database backend are included in the
-sql/ subdirectory. In case you are upgrading from an older MaNGOS release,
-make sure you as well take a look at the SQL files in the sql/updates/ sub-
-directory.
+Documentation can be found in the doc/ subdirectory.
-In order to build and install MaNGOS under Windows, simply use the delivered
-project files under win/. If you use a different system use CMake to generate
-the appropriate build files for your system.
+-- The C(ontinued)-MaNGOS Team!
+
+== Exceptions to GPL ==
+
+ Some third-party libraries CMaNGOS uses have other licenses, that must be uphold.
+ These libraries are located within the dep/ directory
+
+ In addition, as a special exception, the CMaNGOS project
+ gives permission to link the code of its release of MaNGOS with the
+ OpenSSL project's "OpenSSL" library (or with modified versions of it
+ that use the same license as the "OpenSSL" library), and distribute
+ the linked executables. You must obey the GNU General Public License
+ in all respects for all of the code used other than "OpenSSL". If you
+ modify this file, you may extend this exception to your version of the
+ file, but you are not obligated to do so. If you do not wish to do
+ so, delete this exception statement from your version.
@@ -144,11 +144,11 @@ fi
if [ "$USE_VMAPS" = "1" ]
then
echo "`date`: Start extraction of vmaps..." | tee -a $LOG_FILE
- vmapExtractor3 | tee -a $DETAIL_LOG_FILE
+ vmapExtractor | tee -a $DETAIL_LOG_FILE
echo "`date`: Extracting of vmaps finished" | tee -a $LOG_FILE
mkdir vmaps
echo "`date`: Start assembling of vmaps..." | tee -a $LOG_FILE
- vmap_assembler.exe buildings vmaps | tee -a $DETAIL_LOG_FILE
+ vmap_assembler buildings vmaps | tee -a $DETAIL_LOG_FILE
echo "`date`: Assembling of vmaps finished" | tee -a $LOG_FILE
echo | tee -a $LOG_FILE
@@ -158,5 +158,5 @@ fi
## Extract mmaps
if [ "$USE_MMAPS" = "1" ]
then
- MoveMapGen.sh $NUM_CPU $LOG_FILE $DETAIL_LOG_FILE
+ sh MoveMapGen.sh $NUM_CPU $LOG_FILE $DETAIL_LOG_FILE
fi
@@ -31,6 +31,6 @@ MaNGOSExtractor_detailed.log which includes all the information about the extrac
If you want to toggle some parts in the extraction process, there are a few internal variables in the extraction scripts, that can be modified.
-Consider the Readme's in the directories extractor, vmap_assembler, vmap_extractor_v3 and mmap for further information about detail.
+Consider the Readme's in the directories extractor, vmap_assembler, vmap_extractor and mmap for further information about detail.
Also especially related to mmaps updating you might be interested in using the MoveMapGen.sh script.
@@ -53,8 +53,8 @@
#define NUM_DATABASES 3
char remotes[NUM_REMOTES][MAX_REMOTE] = {
- "git@github.com:mangos/mangos.git",
- "git://github.com/mangos/mangos.git" // used for fetch if present
+ "git@github.com:cmangos/mangos-wotlk.git",
+ "git://github.com/cmangos/mangos-wotlk.git" // used for fetch if present
};
char remote_branch[MAX_REMOTE] = "master";
@@ -9,7 +9,7 @@ Linux:
$ ./configure
$ make
- After that, cd to contrib/vmap_extractor_v2/ and execute:
+ After that, cd to contrib/vmap_extractor/ and execute:
$ cmake .
$ make
@@ -30,8 +30,8 @@ Windows:
1. Building
- Just build the solution in contrib\vmap_extractor_v2\win
- Resulting binaries will be in contrib\vmap_extractor_v2\bin\$(PlatformName)_$(ConfigurationName)
+ Just build the solution in contrib\vmap_extractor\win
+ Resulting binaries will be in contrib\vmap_extractor\bin\$(PlatformName)_$(ConfigurationName)
2. Extracting
@@ -14,7 +14,7 @@ IF EXIST buildings\dir (ECHO The buildings folder already exist do you want to d
echo If YES hit Enter to continue if no CLOSE the program now! . . .
pause>nul
DEL /S /Q buildings)
-vmapExtractor3.exe
+vmapExtractor.exe
cls
echo.
echo.
@@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}</ProjectGuid>
- <RootNamespace>vmapExtractor3</RootNamespace>
+ <RootNamespace>vmapExtractor</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="vmapExtractor3"
+ Name="vmapExtractor"
ProjectGUID="{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}"
- RootNamespace="vmapExtractor3"
+ RootNamespace="vmapExtractor"
TargetFrameworkVersion="196613"
>
<Platforms>
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmapExtractor3", "VC100\vmapExtractor3.vcxproj", "{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmapExtractor", "VC100\vmapExtractor.vcxproj", "{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}"
ProjectSection(ProjectDependencies) = postProject
{B96F612A-C91D-43B3-A4C3-D4294817EC6C} = {B96F612A-C91D-43B3-A4C3-D4294817EC6C}
{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmapExtractor3", "VC90\vmapExtractor3.vcproj", "{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmapExtractor", "VC90\vmapExtractor.vcproj", "{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}"
ProjectSection(ProjectDependencies) = postProject
{B96F612A-C91D-43B3-A4C3-D4294817EC6C} = {B96F612A-C91D-43B3-A4C3-D4294817EC6C}
{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
View
@@ -64,7 +64,7 @@ Some events such as EVENT_T_AGGRO, EVENT_T_DEATH, EVENT_T_SPAWNED, and EVENT_T_E
# Internal Name Event Param Usage (Param1, Param2, Param3, Param4) Description
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-0 EVENT_T_TIMER InitialMin, InitialMax, RepeatMin, RepeatMax Expires at first between (Param1) and (Param2) and then will repeat between every (Param3) and (Param4), EXPIRES ONLY IN COMBAT.
+0 EVENT_T_TIMER_IN_COMBAT InitialMin, InitialMax, RepeatMin, RepeatMax Expires at first between (Param1) and (Param2) and then will repeat between every (Param3) and (Param4), EXPIRES ONLY IN COMBAT.
1 EVENT_T_TIMER_OOC InitialMin, InitialMax, RepeatMin, RepeatMax Expires at first between (Param1) and (Param2) and then will repeat between every (Param3) and (Param4), EXPIRES ONLY OUT OF COMBAT BUT NOT DURING EVADE.
2 EVENT_T_HP HPMax%, HPMin%, RepeatMin, RepeatMax Expires when the NPC's HP% is between (Param1) and (Param2). Will repeat between every (Param3) and (Param4) If Event Conditions Are Still Met.
3 EVENT_T_MANA ManaMax%, ManaMin%, RepeatMin, RepeatMax Expires when the NPC's Mana% is between (Param1) and (Param2). Will repeat between every (Param3) and (Param4) If Event Conditions Are Still Met.
@@ -91,6 +91,7 @@ Some events such as EVENT_T_AGGRO, EVENT_T_DEATH, EVENT_T_SPAWNED, and EVENT_T_E
26 EVENT_T_SUMMONED_JUST_DESPAWN CreatureId, RepeatMin, RepeatMax Expires before creature with entry = (Param1) is despawn (Param1 = 0 means all spawns). Will repeat every (Param2) and (Param3).
27 EVENT_T_MISSING_AURA SpellID, AmmountInStack, RepeatMin, RepeatMax Expires when a creature not has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4).
28 EVENT_T_TARGET_MISSING_AURA SpellID, AmmountInStack, RepeatMin, RepeatMax Expires when a target unit not has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4).
+29 EVENT_T_TIMER_GENERIC InitialMin, InitialMax, RepeatMin, RepeatMax Expires at first between (Param1) and (Param2) and then will repeat between every (Param3) and (Param4).
=========================================
Action Types
@@ -162,7 +163,7 @@ BOTH - This event can trigger both in and out of combat.
Events that do not have lables on them are events that are directly involved with the in and out of combat state.
------------------
-0 = EVENT_T_TIMER:
+0 = EVENT_T_TIMER_IN_COMBAT:
------------------
Parameter 1: InitialMin - Minumum Time used to calculate Random Initial Expire
Parameter 2: InitialMax - Maximum Time used to calculate Random Initial Expire
@@ -180,7 +181,7 @@ Parameter 2: InitialMax - Maximum Time used to calculate Random Initial Event Ex
Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Event Expire
Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Event Expire
-OUT OF COMBAT ONLY - Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4) from then on.
+OUT OF COMBAT ONLY (Not while evading) - Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4) from then on.
This is commonly used for events that occur and repeat outside of combat like random NPC Say or Random Emotes.
---------------
@@ -428,6 +429,23 @@ Parameter 2: Amount - This is the amount or less of SpellID's auras at creature
Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+---------------------------------
+28 = EVENT_T_TARGET_MISSING_AURA:
+---------------------------------
+Parameter 1: SpellId - This is the SpellID That the Aura Check will look for to be missing
+Parameter 2: Amount - This is the amount or less of SpellID's auras at creature required for event expire.
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+---------------------------
+29 = EVENT_T_TIMER_GENERIC:
+---------------------------
+Parameter 1: InitialMin - Minumum Time used to calculate Random Initial Expire
+Parameter 2: InitialMax - Maximum Time used to calculate Random Initial Expire
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+IN COMBAT and OUT OF COMBAT - Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4) from then on.
=========================================
View
@@ -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_12148_02_mangos_mangos_string` bit(1) default NULL
+ `required_12189_01_mangos_creature_template_spells` bit(1) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
--
@@ -1386,13 +1386,37 @@ CREATE TABLE `creature_template_addon` (
--
-- Dumping data for table `creature_template_addon`
--
-
LOCK TABLES `creature_template_addon` WRITE;
/*!40000 ALTER TABLE `creature_template_addon` DISABLE KEYS */;
/*!40000 ALTER TABLE `creature_template_addon` ENABLE KEYS */;
UNLOCK TABLES;
--
+-- Table structure for table `creature_template_spells`
+--
+DROP TABLE IF EXISTS `creature_template_spells`;
+CREATE TABLE `creature_template_spells` (
+ `entry` mediumint(8) unsigned NOT NULL,
+ `spell1` mediumint(8) unsigned NOT NULL,
+ `spell2` mediumint(8) unsigned NOT NULL default '0',
+ `spell3` mediumint(8) unsigned NOT NULL default '0',
+ `spell4` mediumint(8) unsigned NOT NULL default '0',
+ `spell5` mediumint(8) unsigned NOT NULL default '0',
+ `spell6` mediumint(8) unsigned NOT NULL default '0',
+ `spell7` mediumint(8) unsigned NOT NULL default '0',
+ `spell8` mediumint(8) unsigned NOT NULL default '0',
+ PRIMARY KEY (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Creature System (Spells used by creature)';
+
+--
+-- Dumping data for table `creature_template_spells`
+--
+LOCK TABLES `creature_template_spells` WRITE;
+/*!40000 ALTER TABLE `creature_template_spells` DISABLE KEYS */;
+/*!40000 ALTER TABLE `creature_template_spells` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
-- Table structure for table `db_script_string`
--
@@ -18867,6 +18891,26 @@ LOCK TABLES `transports` WRITE;
UNLOCK TABLES;
--
+-- Table structure for table `vehicle_accessory`
+--
+DROP TABLE IF EXISTS vehicle_accessory;
+CREATE TABLE `vehicle_accessory` (
+ `vehicle_entry` int(10) UNSIGNED NOT NULL COMMENT 'entry of the npc who has some accessory as vehicle',
+ `seat` mediumint(8) UNSIGNED NOT NULL COMMENT 'onto which seat shall the passenger be boarded',
+ `accessory_entry` int(10) UNSIGNED NOT NULL COMMENT 'entry of the passenger that is to be boarded',
+ `comment` varchar(255) NOT NULL,
+ PRIMARY KEY (`vehicle_entry`, `seat`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Vehicle Accessory (passengers that are auto-boarded onto a vehicle)';
+
+--
+-- Dumping data for table `vehicle_accessory`
+--
+LOCK TABLES `vehicle_accessory` WRITE;
+/*!40000 ALTER TABLE `vehicle_accessory` DISABLE KEYS */;
+/*!40000 ALTER TABLE `vehicle_accessory` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
-- Table structure for table `world_template`
--
@@ -0,0 +1,13 @@
+ALTER TABLE db_version CHANGE COLUMN required_12148_02_mangos_mangos_string required_12188_01_mangos_vehicle_accessory bit;
+
+--
+-- Table structure for table `vehicle_accessory`
+--
+DROP TABLE IF EXISTS vehicle_accessory;
+CREATE TABLE `vehicle_accessory` (
+ `vehicle_entry` int(10) UNSIGNED NOT NULL COMMENT 'entry of the npc who has some accessory as vehicle',
+ `seat` mediumint(8) UNSIGNED NOT NULL COMMENT 'onto which seat shall the passenger be boarded',
+ `accessory_entry` int(10) UNSIGNED NOT NULL COMMENT 'entry of the passenger that is to be boarded',
+ `comment` varchar(255) NOT NULL,
+ PRIMARY KEY (`vehicle_entry`, `seat`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Vehicle Accessory (passengers that are auto-boarded onto a vehicle)';
@@ -0,0 +1,23 @@
+ALTER TABLE db_version CHANGE COLUMN required_12188_01_mangos_vehicle_accessory required_12189_01_mangos_creature_template_spells bit;
+
+--
+-- Table structure for table `creature_template_spells`
+--
+DROP TABLE IF EXISTS `creature_template_spells`;
+CREATE TABLE `creature_template_spells` (
+ `entry` mediumint(8) unsigned NOT NULL,
+ `spell1` mediumint(8) unsigned NOT NULL,
+ `spell2` mediumint(8) unsigned NOT NULL default '0',
+ `spell3` mediumint(8) unsigned NOT NULL default '0',
+ `spell4` mediumint(8) unsigned NOT NULL default '0',
+ `spell5` mediumint(8) unsigned NOT NULL default '0',
+ `spell6` mediumint(8) unsigned NOT NULL default '0',
+ `spell7` mediumint(8) unsigned NOT NULL default '0',
+ `spell8` mediumint(8) unsigned NOT NULL default '0',
+ PRIMARY KEY (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Creature System (Spells used by creature)';
+
+--
+-- Dumping data for table `creature_template_spells`
+--
+INSERT INTO creature_template_spells (entry, spell1, spell2, spell3, spell4) SELECT entry, spell1, spell2, spell3, spell4 FROM creature_template WHERE spell1!=0;
@@ -956,8 +956,8 @@ bool AuctionBotSeller::Initialize()
uint32 itemsAdded = 0;
- BarGoLink bar(sItemStorage.MaxEntry);
- for (uint32 itemID = 0; itemID < sItemStorage.MaxEntry; ++itemID)
+ BarGoLink bar(sItemStorage.GetMaxEntry());
+ for (uint32 itemID = 0; itemID < sItemStorage.GetMaxEntry(); ++itemID)
{
ItemPrototype const* prototype = sObjectMgr.GetItemPrototype(itemID);
Oops, something went wrong.

0 comments on commit 03a5c35

Please sign in to comment.