diff --git a/sql/mangos.sql b/sql/mangos.sql index b6d8cf99c..a789eb5c7 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -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_10256_01_mangos_command` bit(1) default NULL + `required_10257_01_mangos_command` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -521,7 +521,7 @@ INSERT INTO `command` VALUES ('additemset',3,'Syntax: .additemset #itemsetid\r\n\r\nAdd items from itemset of id #itemsetid to your or selected character inventory. Will add by one example each item from itemset.'), ('announce',1,'Syntax: .announce $MessageToBroadcast\r\n\r\nSend a global message to all players online in chat log.'), ('auction',3,'Syntax: .auction\r\n\r\nShow your team auction store.'), -('auction aliance',3,'Syntax: .auction aliance\r\n\r\nShow aliance auction store independent from your team.'), +('auction alliance',3,'Syntax: .auction alliance\r\n\r\nShow alliance auction store independent from your team.'), ('auction goblin',3,'Syntax: .auction goblin\r\n\r\nShow goblin auction store common for all teams.'), ('auction horde',3,'Syntax: .auction horde\r\n\r\nShow horde auction store independent from your team.'), ('aura',3,'Syntax: .aura #spellid\r\n\r\nAdd the aura from spell #spellid to the selected Unit.'), diff --git a/sql/updates/10257_01_mangos_command.sql b/sql/updates/10257_01_mangos_command.sql new file mode 100644 index 000000000..cf86124d4 --- /dev/null +++ b/sql/updates/10257_01_mangos_command.sql @@ -0,0 +1,5 @@ +ALTER TABLE db_version CHANGE COLUMN required_10256_01_mangos_command required_10257_01_mangos_command bit; + +DELETE FROM command WHERE name IN ('auction aliance','auction alliance'); +INSERT INTO command (name, security, help) VALUES +('auction alliance',3,'Syntax: .auction alliance\r\n\r\nShow alliance auction store independent from your team.'); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 5df7700d7..99e78e94c 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -124,6 +124,7 @@ pkgdata_DATA = \ 10252_01_mangos_reputation_reward_rate.sql \ 10254_01_characters_auctionhouse.sql \ 10256_01_mangos_command.sql \ + 10257_01_mangos_command.sql \ README ## Additional files to include when running 'make dist' @@ -228,4 +229,5 @@ EXTRA_DIST = \ 10252_01_mangos_reputation_reward_rate.sql \ 10254_01_characters_auctionhouse.sql \ 10256_01_mangos_command.sql \ + 10257_01_mangos_command.sql \ README diff --git a/src/game/BattleGroundEY.h b/src/game/BattleGroundEY.h index bfd17a53f..5fbdae64b 100644 --- a/src/game/BattleGroundEY.h +++ b/src/game/BattleGroundEY.h @@ -46,7 +46,7 @@ enum BG_EY_WorldStates BLOOD_ELF_UNCONTROL = 2722, PROGRESS_BAR_PERCENT_GREY = 2720, //100 = empty (only grey), 0 = blue|red (no grey) PROGRESS_BAR_STATUS = 2719, //50 init!, 48 ... hordak bere .. 33 .. 0 = full 100% hordacky , 100 = full alliance - PROGRESS_BAR_SHOW = 2718, //1 init, 0 druhy send - bez messagu, 1 = controlled aliance + PROGRESS_BAR_SHOW = 2718, //1 init, 0 druhy send - bez messagu, 1 = controlled alliance NETHERSTORM_FLAG = 2757, //set to 2 when flag is picked up, and to 1 if it is dropped NETHERSTORM_FLAG_STATE_ALLIANCE = 2769, diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index f528b3861..ce3cdeade 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -87,7 +87,7 @@ ChatCommand * ChatHandler::getCommandTable() static ChatCommand auctionCommandTable[] = { - { "aliance", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAuctionAlianceCommand, "", NULL }, + { "alliance", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAuctionAllianceCommand, "", NULL }, { "goblin", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAuctionGoblinCommand, "", NULL }, { "horde", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAuctionHordeCommand, "", NULL }, { "", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAuctionCommand, "", NULL }, diff --git a/src/game/Chat.h b/src/game/Chat.h index 197645f8c..0f2968c50 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -119,7 +119,7 @@ class ChatHandler bool HandleAccountSetGmLevelCommand(const char* args); bool HandleAccountSetPasswordCommand(const char* args); - bool HandleAuctionAlianceCommand(const char* args); + bool HandleAuctionAllianceCommand(const char* args); bool HandleAuctionGoblinCommand(const char* args); bool HandleAuctionHordeCommand(const char* args); bool HandleAuctionCommand(const char* args); diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 4a554b9b1..18db39e87 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -4145,7 +4145,7 @@ bool ChatHandler::HandleHideAreaCommand(const char* args) return true; } -bool ChatHandler::HandleAuctionAlianceCommand(const char* /*args*/) +bool ChatHandler::HandleAuctionAllianceCommand(const char* /*args*/) { m_session->GetPlayer()->SetAuctionAccessMode(m_session->GetPlayer()->GetTeam() != ALLIANCE ? -1 : 0); m_session->SendAuctionHello(m_session->GetPlayer()); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 1b0178246..973abb008 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 "10256" + #define REVISION_NR "10257" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 50aa35cc0..3abb35e93 100644 --- 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_10254_01_characters_auctionhouse" - #define REVISION_DB_MANGOS "required_10256_01_mangos_command" + #define REVISION_DB_MANGOS "required_10257_01_mangos_command" #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version" #endif // __REVISION_SQL_H__