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

[9692] Switch to support client 3.3.3a (build 11723)

Browse source 
Merge branch '330'

You need regenerate dbc/map/vmap files.

Thanks to TOM_RUS who make most work for adding 3.3.3 support. ;)
This commit is contained in:
VladimirMangos 2010-04-08 03:49:19 +04:00
parent b37933454d
commit cf6aac84fd
10 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sql/333/1_characters_mail.sql
View file

@ -1 +0,0 @@
alter table `mail` add column `body` longtext CHARSET utf8 COLLATE utf8_general_ci NULL after `subject`;

2
sql/characters.sql
View file

@ -21,7 +21,7 @@
DROP TABLE IF EXISTS `character_db_version`;
CREATE TABLE `character_db_version` (
`required_9687_01_characters_character_queststatus_daily` bit(1) default NULL
`required_9692_02_characters_mail` bit(1) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB';
--

2
sql/mangos.sql
View file

@ -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_9690_01_mangos_spell_proc_event` bit(1) default NULL
`required_9692_03_mangos_spell_proc_event` bit(1) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
--

3
sql/updates/9692_01_characters_mail.sql Normal file
View file

@ -0,0 +1,3 @@
ALTER TABLE character_db_version CHANGE COLUMN required_9687_01_characters_character_queststatus_daily required_9692_01_characters_mail bit;
alter table `mail` add column `body` longtext CHARSET utf8 COLLATE utf8_general_ci NULL after `subject`;

2
sql/333/2_characters_mail.sql → sql/updates/9692_02_characters_mail.sql
View file

@ -1,3 +1,5 @@
ALTER TABLE character_db_version CHANGE COLUMN required_9692_01_characters_mail required_9692_02_characters_mail bit;
UPDATE `mail` LEFT JOIN `item_text` ON `mail`.`itemtextid` = `item_text`.`id` SET `mail`.`body`=`item_text`.`text`;
DELETE item_text FROM mail, item_text WHERE mail.itemtextid = item_text.id;
ALTER TABLE `mail` DROP COLUMN `itemtextid`;

2
sql/333/3_spell_proc_event.sql → sql/updates/9692_03_mangos_spell_proc_event.sql
View file

@ -1,3 +1,5 @@
ALTER TABLE db_version CHANGE COLUMN required_9690_01_mangos_spell_proc_event required_9692_03_mangos_spell_proc_event bit;
-- Rampage: now passive instead of being a proc
DELETE FROM `spell_proc_event` WHERE `entry` = 29801;
-- Unleashed Rage: now passive instead of being a proc

6
sql/updates/Makefile.am
View file

@ -106,6 +106,9 @@ pkgdata_DATA = \
9686_01_characters_character_queststatus_weekly.sql \
9687_01_characters_character_queststatus_daily.sql \
9690_01_mangos_spell_proc_event.sql \
9692_01_characters_mail.sql \
9692_02_characters_mail.sql \
9692_03_mangos_spell_proc_event.sql \
README
## Additional files to include when running 'make dist'
@ -192,4 +195,7 @@ EXTRA_DIST = \
9686_01_characters_character_queststatus_weekly.sql \
9687_01_characters_character_queststatus_daily.sql \
9690_01_mangos_spell_proc_event.sql \
9692_01_characters_mail.sql \
9692_02_characters_mail.sql \
9692_03_mangos_spell_proc_event.sql \
README

14
src/game/DBCStores.cpp
View file

@ -622,13 +622,13 @@ void LoadDBCStores(const std::string& dataPath)
}
// Check loaded DBC files proper version
if( !sSpellStore.LookupEntry(74445) || // last added spell in 3.3.2
!sMapStore.LookupEntry(718) || // last map added in 3.3.2
!sGemPropertiesStore.LookupEntry(1629) || // last gem property added in 3.3.2
!sItemExtendedCostStore.LookupEntry(2982) || // last item extended cost added in 3.3.2
!sCharTitlesStore.LookupEntry(177) || // last char title added in 3.3.2
!sAreaStore.LookupEntry(3461) || // last area (areaflag) added in 3.3.2
!sItemStore.LookupEntry(52686) ) // last client known item added in 3.3.2
if( !sAreaStore.LookupEntry(3617) || // last area (areaflag) added in 3.3.3a
!sCharTitlesStore.LookupEntry(177) || // last char title added in 3.3.3a
!sGemPropertiesStore.LookupEntry(1629) || // last added spell in 3.3.3a
!sItemStore.LookupEntry(54860) || // last gem property added in 3.3.3a
!sItemExtendedCostStore.LookupEntry(2997) || // last item extended cost added in 3.3.3a
!sMapStore.LookupEntry(724) || // last map added in 3.3.3a
!sSpellStore.LookupEntry(76567) ) // last client known item added in 3.3.3a
{
sLog.outError("\nYou have mixed version DBC files. Please re-extract DBC files for one from client build: %s",AcceptableClientBuildsListStr().c_str());
exit(1);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "9691"
#define REVISION_NR "9692"
#endif // __REVISION_NR_H__

4
src/shared/revision_sql.h
View file

@ -1,6 +1,6 @@
#ifndef __REVISION_SQL_H__
#define __REVISION_SQL_H__
#define REVISION_DB_CHARACTERS "required_9687_01_characters_character_queststatus_daily"
#define REVISION_DB_MANGOS "required_9690_01_mangos_spell_proc_event"
#define REVISION_DB_CHARACTERS "required_9692_02_characters_mail"
#define REVISION_DB_MANGOS "required_9692_03_mangos_spell_proc_event"
#define REVISION_DB_REALMD "required_9010_01_realmd_realmlist"
#endif // __REVISION_SQL_H__