Fix load spell.dbc, sql table spell_dbc also drop unused fields.

--HG--
branch : trunk

3 files changed, 8 insertions, 8 deletions

diff --git a/sql/updates/7846_world_spell_dbc.sql b/sql/updates/7846_world_spell_dbc.sql
new file mode 100644
index 00000000000..0173fb01c53
--- /dev/null
+++ b/sql/updates/7846_world_spell_dbc.sql
@@ -0,0 +1,6 @@
+ALTER TABLE spell_dbc DROP EffectBaseDice1;
+ALTER TABLE spell_dbc DROP EffectBaseDice2;
+ALTER TABLE spell_dbc DROP EffectBaseDice3;
+ALTER TABLE spell_dbc DROP EffectDicePerLevel1;
+ALTER TABLE spell_dbc DROP EffectDicePerLevel2;
+ALTER TABLE spell_dbc DROP EffectDicePerLevel3;
diff --git a/sql/world.sql b/sql/world.sql
index 4d3f4c5ab91..8cda40b82e2 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -5118,12 +5118,6 @@ CREATE TABLE `spell_dbc` (
   `EffectDieSides1` int(11) NOT NULL DEFAULT '0',
   `EffectDieSides2` int(11) NOT NULL DEFAULT '0',
   `EffectDieSides3` int(11) NOT NULL DEFAULT '0',
-  `EffectBaseDice1` int(11) NOT NULL DEFAULT '0',
-  `EffectBaseDice2` int(11) NOT NULL DEFAULT '0',
-  `EffectBaseDice3` int(11) NOT NULL DEFAULT '0',
-  `EffectDicePerLevel1` float NOT NULL DEFAULT '0',
-  `EffectDicePerLevel2` float NOT NULL DEFAULT '0',
-  `EffectDicePerLevel3` float NOT NULL DEFAULT '0',
   `EffectRealPointsPerLevel1` float NOT NULL DEFAULT '0',
   `EffectRealPointsPerLevel2` float NOT NULL DEFAULT '0',
   `EffectRealPointsPerLevel3` float NOT NULL DEFAULT '0',
diff --git a/src/game/DBCfmt.h b/src/game/DBCfmt.h
index 0a090d0fd0b..b2507bd1ff1 100644
--- a/src/game/DBCfmt.h
+++ b/src/game/DBCfmt.h
@@ -93,8 +93,8 @@ const char SpellDifficultyfmt[]="niiii";
 const std::string CustomSpellDifficultyfmt="ppppp";
 const std::string CustomSpellDifficultyIndex="id";
 const char SpellDurationfmt[]="niii";
-const char SpellEntryfmt[]="niiiiiiiiiixixixiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiifxiiiiiiiiiiiiiiiiiiiiiiiiiiiifffiiiiiiiiiiiiiiiiiiiiifffiiiiiiiiiiiiiiifffiiiiiiiiiiiiixssssssssssssssssxssssssssssssssssxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiiiiiiiiiiixfffxxxiiiiixxxxxxx";
-const std::string CustomSpellEntryfmt="pappppppppaaaaaapaaaaaaaaaaapaaapapppppppaaaaapaapaaaaaaaaaaaaaaaaaappppppppppppppppppppppppppppppppppppppppppaaaaaapppppppppaaapppppppppaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaappppppppapppaaaaappaaaaaaa";
+const char SpellEntryfmt[]="niiiiiiiiiiiixixiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiifxiiiiiiiiiiiiiiiiiiiiiiiiiiiifffiiiiiiiiiiiiiiiiiiiiifffiiiiiiiiiiiiiiifffiiiiiiiiiiiiixssssssssssssssssxssssssssssssssssxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiiiiiiiiiiixfffxxxiiiiixxxxxxx";
+const std::string CustomSpellEntryfmt="pappppppppaaaaaapaaaaaaaaaaapaaapapppppppaaaaapaapaaaaaaaaaaaaaaaaaappppppppppppppppppppppppppppppppppppaaaaaapppppppppaaapppppppppaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaappppppppapppaaaaappaaaaaaa";
 const std::string CustomSpellEntryIndex = "Id";
 const char SpellFocusObjectfmt[]="nxxxxxxxxxxxxxxxxx";
 const char SpellItemEnchantmentfmt[]="nxiiiiiixxxiiissssssssssssssssxiiiiiii";