[9374] Fxies for prev. commit.

NOTE: DON'T APPLY prev commit version sql update Signed-off-by: VladimirMangos <vladimir@getmangos.com>
mangos · Feb 14, 2010 · 521133a · 521133a
1 parent 7b5c46e
commit 521133a
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 26 deletions.
diff --git a/sql/characters.sql b/sql/characters.sql
@@ -21,7 +21,7 @@
 
 DROP TABLE IF EXISTS `character_db_version`;
 CREATE TABLE `character_db_version` (
-  `required_9359_01_characters_characters` bit(1) default NULL
+  `required_9374_01_characters_character_glyphs` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB';
 
 --

diff --git a/sql/updates/9374_01_characters_character_glyphs.sql b/sql/updates/9374_01_characters_character_glyphs.sql
@@ -0,0 +1,2 @@
+ALTER TABLE character_db_version CHANGE COLUMN required_9359_01_characters_characters required_9374_01_characters_character_glyphs bit;
+
diff --git a/sql/updates/9999_character_glyphs.sql b/sql/updates/9999_character_glyphs.sql
diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am
@@ -68,6 +68,7 @@ pkgdata_DATA = \
 	9359_01_characters_characters.sql \
 	9366_01_mangos_spell_bonus_data.sql \
 	9366_02_mangos_spell_proc_event.sql \
+	9374_01_characters_character_glyphs.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -116,4 +117,5 @@ EXTRA_DIST = \
 	9359_01_characters_characters.sql \
 	9366_01_mangos_spell_bonus_data.sql \
 	9366_02_mangos_spell_proc_event.sql \
+	9374_01_characters_character_glyphs.sql \
 	README
diff --git a/src/game/Player.h b/src/game/Player.h
@@ -207,8 +207,6 @@ struct Glyph
     GlyphUpdateState uState;
 
     Glyph() : id(0), uState(GLYPH_UNCHANGED) { }
-
-    Glyph(uint32 _id, GlyphUpdateState _uState) : id(_id), uState(_uState) { }
 
     uint32 GetId() { return id; }
 
@@ -232,13 +230,11 @@ struct Glyph
         {
             uState = GLYPH_CHANGED;
         }
-            
+
         id = newId;
     }
 };
 
-typedef std::map<uint16 /*pair16(spec, slot)*/,ActionButton> GlyphList;
-
 struct PlayerCreateInfoItem
 {
     PlayerCreateInfoItem(uint32 id, uint32 amount) : item_id(id), item_amount(amount) {}

diff --git 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 "9373"
+ #define REVISION_NR "9374"
 #endif // __REVISION_NR_H__
diff --git 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_9359_01_characters_characters"
+ #define REVISION_DB_CHARACTERS "required_9374_01_characters_character_glyphs"
  #define REVISION_DB_MANGOS "required_9366_02_mangos_spell_proc_event"
  #define REVISION_DB_REALMD "required_9010_01_realmd_realmlist"
 #endif // __REVISION_SQL_H__