From dab1f96f667049843cf73e375f0dd294bb5f9fc7 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Mon, 19 Jan 2009 23:51:07 +0300 Subject: [PATCH] [7118] resolve problems with partly appied [7117] --- sql/mangos.sql | 4 ++-- ...mplate.sql => 7118_01_mangos_skill_discovery_template.sql} | 2 +- sql/updates/Makefile.am | 4 ++-- src/game/SkillDiscovery.cpp | 2 +- src/shared/revision_nr.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename sql/updates/{7117_01_mangos_skill_discovery_template.sql => 7118_01_mangos_skill_discovery_template.sql} (82%) diff --git a/sql/mangos.sql b/sql/mangos.sql index b2e3c89e0..b2198d4f7 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -22,7 +22,7 @@ DROP TABLE IF EXISTS `db_version`; CREATE TABLE `db_version` ( `version` varchar(120) default NULL, - `required_7117_01_mangos_skill_discovery_template` bit(1) default NULL + `required_7118_01_mangos_skill_discovery_template` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -13001,7 +13001,7 @@ CREATE TABLE `skill_discovery_template` ( `reqSpell` mediumint(8) unsigned NOT NULL default '0' COMMENT 'spell requirement', `reqClass` tinyint(2) unsigned NOT NULL default '0' COMMENT 'class requirement', `chance` float NOT NULL default '0' COMMENT 'chance to discover', - PRIMARY KEY (`spellId`,`reqSpell`), + PRIMARY KEY (`spellId`,`reqSpell`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Skill Discovery System'; -- diff --git a/sql/updates/7117_01_mangos_skill_discovery_template.sql b/sql/updates/7118_01_mangos_skill_discovery_template.sql similarity index 82% rename from sql/updates/7117_01_mangos_skill_discovery_template.sql rename to sql/updates/7118_01_mangos_skill_discovery_template.sql index c9cb8ad7c..f854855e6 100644 --- a/sql/updates/7117_01_mangos_skill_discovery_template.sql +++ b/sql/updates/7118_01_mangos_skill_discovery_template.sql @@ -1,4 +1,4 @@ -ALTER TABLE db_version CHANGE COLUMN required_7107_01_mangos_string required_7117_01_mangos_skill_discovery_template bit; +ALTER TABLE db_version CHANGE COLUMN required_7107_01_mangos_string required_7118_01_mangos_skill_discovery_template bit; ALTER TABLE skill_discovery_template DROP PRIMARY KEY, diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 648949442..0632de798 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -142,7 +142,7 @@ pkgdata_DATA = \ 7100_01_characters_character_spell.sql \ 7107_01_mangos_string.sql \ 7113_01_characters_character_achievement_progress.sql \ - 7117_01_mangos_skill_discovery_template.sql \ + 7118_01_mangos_skill_discovery_template.sql \ README ## Additional files to include when running 'make dist' @@ -265,5 +265,5 @@ EXTRA_DIST = \ 7100_01_characters_character_spell.sql \ 7107_01_mangos_string.sql \ 7113_01_characters_character_achievement_progress.sql \ - 7117_01_mangos_skill_discovery_template.sql \ + 7118_01_mangos_skill_discovery_template.sql \ README diff --git a/src/game/SkillDiscovery.cpp b/src/game/SkillDiscovery.cpp index eb7b687bf..fb24eb1c0 100644 --- a/src/game/SkillDiscovery.cpp +++ b/src/game/SkillDiscovery.cpp @@ -93,7 +93,7 @@ void LoadSkillDiscoveryTable() } // mechanic discovery - if (spellEntry->Mechanic != MECHANIC_DISCOVERY && + if (spellEntry->Mechanic != MECHANIC_DISCOVERY && // explicit discovery ability !IsExplicitDiscoverySpell(spellEntry)) { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index baa9e020a..01eb472e8 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 "7117" + #define REVISION_NR "7118" #endif // __REVISION_NR_H__