mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9374] Fxies for prev. commit.

Browse source 
NOTE: DON'T APPLY prev commit version sql update

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
hunuza 2010-02-14 15:07:46 +03:00 • committed by VladimirMangos
parent 282e0fd8aa
commit 77dc9d0582
7 changed files with 8 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/characters.sql
View file

@ -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';
--

2
sql/updates/9374_01_characters_character_glyphs.sql Normal file
View file

@ -0,0 +1,2 @@
ALTER TABLE character_db_version CHANGE COLUMN required_9359_01_characters_characters required_9374_01_characters_character_glyphs bit;

18
sql/updates/9999_character_glyphs.sql
View file

@ -1,18 +0,0 @@
DROP TABLE IF EXISTS `character_glyphs`;
CREATE TABLE `character_glyphs` (
`guid` int(11) unsigned NOT NULL,
`spec` tinyint(3) unsigned NOT NULL DEFAULT '0',
`slot` tinyint(3) unsigned NOT NULL DEFAULT '0',
`glyph` int(11) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`guid`,`spec`,`slot`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- Extract values from data blob fields and insert them into character_glyphs
INSERT INTO `character_glyphs` SELECT `guid`, 0, 0, (CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1319), ' ', -1) AS UNSIGNED)) AS `glyph` FROM `characters`;
INSERT INTO `character_glyphs` SELECT `guid`, 0, 1, (CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1320), ' ', -1) AS UNSIGNED)) AS `glyph` FROM `characters`;
INSERT INTO `character_glyphs` SELECT `guid`, 0, 2, (CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1321), ' ', -1) AS UNSIGNED)) AS `glyph` FROM `characters`;
INSERT INTO `character_glyphs` SELECT `guid`, 0, 3, (CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1322), ' ', -1) AS UNSIGNED)) AS `glyph` FROM `characters`;
INSERT INTO `character_glyphs` SELECT `guid`, 0, 4, (CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1323), ' ', -1) AS UNSIGNED)) AS `glyph` FROM `characters`;
INSERT INTO `character_glyphs` SELECT `guid`, 0, 5, (CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1324), ' ', -1) AS UNSIGNED)) AS `glyph` FROM `characters`;
DELETE FROM character_glyphs WHERE glyph = 0;

2
sql/updates/Makefile.am
View file

@ -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

6
src/game/Player.h
View file

@ -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) {}

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "9373"
#define REVISION_NR "9374"
#endif // __REVISION_NR_H__

2
src/shared/revision_sql.h
View file

@ -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__