mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 16:37:01 +00:00
[10257] Fixed typo in "alliance" in recent commit changes.
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
parent
9a6535963c
commit
5951ebeacc
9 changed files with 15 additions and 8 deletions
|
|
@ -24,7 +24,7 @@ CREATE TABLE `db_version` (
|
||||||
`version` varchar(120) default NULL,
|
`version` varchar(120) default NULL,
|
||||||
`creature_ai_version` varchar(120) default NULL,
|
`creature_ai_version` varchar(120) default NULL,
|
||||||
`cache_id` int(10) default '0',
|
`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';
|
) 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.'),
|
('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.'),
|
('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',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 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.'),
|
('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.'),
|
('aura',3,'Syntax: .aura #spellid\r\n\r\nAdd the aura from spell #spellid to the selected Unit.'),
|
||||||
|
|
|
||||||
5
sql/updates/10257_01_mangos_command.sql
Normal file
5
sql/updates/10257_01_mangos_command.sql
Normal file
|
|
@ -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.');
|
||||||
|
|
@ -124,6 +124,7 @@ pkgdata_DATA = \
|
||||||
10252_01_mangos_reputation_reward_rate.sql \
|
10252_01_mangos_reputation_reward_rate.sql \
|
||||||
10254_01_characters_auctionhouse.sql \
|
10254_01_characters_auctionhouse.sql \
|
||||||
10256_01_mangos_command.sql \
|
10256_01_mangos_command.sql \
|
||||||
|
10257_01_mangos_command.sql \
|
||||||
README
|
README
|
||||||
|
|
||||||
## Additional files to include when running 'make dist'
|
## Additional files to include when running 'make dist'
|
||||||
|
|
@ -228,4 +229,5 @@ EXTRA_DIST = \
|
||||||
10252_01_mangos_reputation_reward_rate.sql \
|
10252_01_mangos_reputation_reward_rate.sql \
|
||||||
10254_01_characters_auctionhouse.sql \
|
10254_01_characters_auctionhouse.sql \
|
||||||
10256_01_mangos_command.sql \
|
10256_01_mangos_command.sql \
|
||||||
|
10257_01_mangos_command.sql \
|
||||||
README
|
README
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ enum BG_EY_WorldStates
|
||||||
BLOOD_ELF_UNCONTROL = 2722,
|
BLOOD_ELF_UNCONTROL = 2722,
|
||||||
PROGRESS_BAR_PERCENT_GREY = 2720, //100 = empty (only grey), 0 = blue|red (no grey)
|
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_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,
|
NETHERSTORM_FLAG = 2757,
|
||||||
//set to 2 when flag is picked up, and to 1 if it is dropped
|
//set to 2 when flag is picked up, and to 1 if it is dropped
|
||||||
NETHERSTORM_FLAG_STATE_ALLIANCE = 2769,
|
NETHERSTORM_FLAG_STATE_ALLIANCE = 2769,
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@ ChatCommand * ChatHandler::getCommandTable()
|
||||||
|
|
||||||
static ChatCommand auctionCommandTable[] =
|
static ChatCommand auctionCommandTable[] =
|
||||||
{
|
{
|
||||||
{ "aliance", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAuctionAlianceCommand, "", NULL },
|
{ "alliance", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAuctionAllianceCommand, "", NULL },
|
||||||
{ "goblin", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAuctionGoblinCommand, "", NULL },
|
{ "goblin", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAuctionGoblinCommand, "", NULL },
|
||||||
{ "horde", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAuctionHordeCommand, "", NULL },
|
{ "horde", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAuctionHordeCommand, "", NULL },
|
||||||
{ "", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAuctionCommand, "", NULL },
|
{ "", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAuctionCommand, "", NULL },
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,7 @@ class ChatHandler
|
||||||
bool HandleAccountSetGmLevelCommand(const char* args);
|
bool HandleAccountSetGmLevelCommand(const char* args);
|
||||||
bool HandleAccountSetPasswordCommand(const char* args);
|
bool HandleAccountSetPasswordCommand(const char* args);
|
||||||
|
|
||||||
bool HandleAuctionAlianceCommand(const char* args);
|
bool HandleAuctionAllianceCommand(const char* args);
|
||||||
bool HandleAuctionGoblinCommand(const char* args);
|
bool HandleAuctionGoblinCommand(const char* args);
|
||||||
bool HandleAuctionHordeCommand(const char* args);
|
bool HandleAuctionHordeCommand(const char* args);
|
||||||
bool HandleAuctionCommand(const char* args);
|
bool HandleAuctionCommand(const char* args);
|
||||||
|
|
|
||||||
|
|
@ -4145,7 +4145,7 @@ bool ChatHandler::HandleHideAreaCommand(const char* args)
|
||||||
return true;
|
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->GetPlayer()->SetAuctionAccessMode(m_session->GetPlayer()->GetTeam() != ALLIANCE ? -1 : 0);
|
||||||
m_session->SendAuctionHello(m_session->GetPlayer());
|
m_session->SendAuctionHello(m_session->GetPlayer());
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "10256"
|
#define REVISION_NR "10257"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#ifndef __REVISION_SQL_H__
|
#ifndef __REVISION_SQL_H__
|
||||||
#define __REVISION_SQL_H__
|
#define __REVISION_SQL_H__
|
||||||
#define REVISION_DB_CHARACTERS "required_10254_01_characters_auctionhouse"
|
#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"
|
#define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
|
||||||
#endif // __REVISION_SQL_H__
|
#endif // __REVISION_SQL_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue