diff --git a/sql/mangos.sql b/sql/mangos.sql index 0ef37c8ed..82e052f27 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_11953_01_mangos_playercreateinfo_spell` bit(1) default NULL + `required_11955_02_mangos_command` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -620,7 +620,6 @@ INSERT INTO `command` VALUES ('honor add',2,'Syntax: .honor add $amount\r\n\r\nAdd a certain amount of honor (gained today) to the selected player.'), ('honor addkill',2,'Syntax: .honor addkikll\r\n\r\nAdd the targeted unit as one of your pvp kills today (you only get honor if it\'s a racial leader or a player)'), ('honor update',2,'Syntax: .honor update\r\n\r\nForce the yesterday\'s honor fields to be updated with today\'s data, which will get reset for the selected player.'), -('hover',3,'Syntax: .hover #flag\r\n\r\nEnable or disable hover mode for your character.\r\n\r\nUse a #flag of value 1 to enable, use a #flag value of 0 to disable hover.'), ('instance unbind',3,'Syntax: .instance unbind all\r\n All of the selected player\'s binds will be cleared.\r\n.instance unbind #mapid\r\n Only the specified #mapid instance will be cleared.'), ('instance listbinds',3,'Syntax: .instance listbinds\r\n Lists the binds of the selected player.'), ('instance stats',3,'Syntax: .instance stats\r\n Shows statistics about instances.'), @@ -3655,8 +3654,6 @@ INSERT INTO `mangos_string` VALUES (552,'%s has no more explored zones.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (553,'%s has explored all zones for you.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (554,'%s has hidden all zones from you.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(555,'Hover enabled',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(556,'Hover disabled',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (557,'%s level up you to (%i)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (558,'%s level down you to (%i)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (559,'%s reset your level progress.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), diff --git a/sql/updates/11955_01_mangos_mangos_string.sql b/sql/updates/11955_01_mangos_mangos_string.sql new file mode 100644 index 000000000..7f8477752 --- /dev/null +++ b/sql/updates/11955_01_mangos_mangos_string.sql @@ -0,0 +1,3 @@ +ALTER TABLE db_version CHANGE COLUMN required_11953_01_mangos_playercreateinfo_spell required_11955_01_mangos_mangos_string bit; + +DELETE FROM mangos_string WHERE entry IN (555,556); diff --git a/sql/updates/11955_02_mangos_command.sql b/sql/updates/11955_02_mangos_command.sql new file mode 100644 index 000000000..87cacab08 --- /dev/null +++ b/sql/updates/11955_02_mangos_command.sql @@ -0,0 +1,3 @@ +ALTER TABLE db_version CHANGE COLUMN required_11955_01_mangos_mangos_string required_11955_02_mangos_command bit; + +DELETE FROM command WHERE name LIKE 'hover'; diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index 0f508756e..0a9deae93 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -794,7 +794,6 @@ ChatCommand * ChatHandler::getCommandTable() { "linkgrave", SEC_ADMINISTRATOR, false, &ChatHandler::HandleLinkGraveCommand, "", NULL }, { "neargrave", SEC_ADMINISTRATOR, false, &ChatHandler::HandleNearGraveCommand, "", NULL }, { "explorecheat", SEC_ADMINISTRATOR, false, &ChatHandler::HandleExploreCheatCommand, "", NULL }, - { "hover", SEC_ADMINISTRATOR, false, &ChatHandler::HandleHoverCommand, "", NULL }, { "levelup", SEC_ADMINISTRATOR, false, &ChatHandler::HandleLevelUpCommand, "", NULL }, { "showarea", SEC_ADMINISTRATOR, false, &ChatHandler::HandleShowAreaCommand, "", NULL }, { "hidearea", SEC_ADMINISTRATOR, false, &ChatHandler::HandleHideAreaCommand, "", NULL }, diff --git a/src/game/Chat.h b/src/game/Chat.h index 7e72cdcb6..948df91f0 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -572,7 +572,6 @@ class MANGOS_DLL_SPEC ChatHandler bool HandleLinkGraveCommand(char* args); bool HandleNearGraveCommand(char* args); bool HandleExploreCheatCommand(char* args); - bool HandleHoverCommand(char* args); bool HandleLevelUpCommand(char* args); bool HandleShowAreaCommand(char* args); bool HandleHideAreaCommand(char* args); diff --git a/src/game/Language.h b/src/game/Language.h index 0450afc3e..370f85076 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -572,8 +572,8 @@ enum MangosStrings LANG_YOURS_EXPLORE_SET_ALL = 553, LANG_YOURS_EXPLORE_SET_NOTHING = 554, - LANG_HOVER_ENABLED = 555, - LANG_HOVER_DISABLED = 556, + // 555, // not used + // 556, // not used LANG_YOURS_LEVEL_UP = 557, LANG_YOURS_LEVEL_DOWN = 558, LANG_YOURS_LEVEL_PROGRESS_RESET = 559, diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 0d225f396..71e960955 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -4372,22 +4372,6 @@ bool ChatHandler::HandleExploreCheatCommand(char* args) return true; } -bool ChatHandler::HandleHoverCommand(char* args) -{ - uint32 flag; - if (!ExtractOptUInt32(&args, flag, 1)) - return false; - - m_session->GetPlayer()->SetHover(flag); - - if (flag) - SendSysMessage(LANG_HOVER_ENABLED); - else - SendSysMessage(LANG_HOVER_DISABLED); - - return true; -} - void ChatHandler::HandleCharacterLevel(Player* player, ObjectGuid player_guid, uint32 oldlevel, uint32 newlevel) { if(player) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 77a2ba1c1..4ded6aa11 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -8419,14 +8419,6 @@ void Unit::SetSpeedRate(UnitMoveType mtype, float rate, bool forced) CallForAllControlledUnits(SetSpeedRateHelper(mtype,forced), CONTROLLED_PET|CONTROLLED_GUARDIANS|CONTROLLED_CHARM|CONTROLLED_MINIPET); } -void Unit::SetHover(bool on) -{ - if(on) - CastSpell(this, 11010, true); - else - RemoveAurasDueToSpell(11010); -} - void Unit::SetDeathState(DeathState s) { if (s != ALIVE && s!= JUST_ALIVED) diff --git a/src/game/Unit.h b/src/game/Unit.h index 5d9040717..e118e070b 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1845,7 +1845,6 @@ class MANGOS_DLL_SPEC Unit : public WorldObject float GetSpeedRate( UnitMoveType mtype ) const { return m_speed_rate[mtype]; } void SetSpeedRate(UnitMoveType mtype, float rate, bool forced = false); - void SetHover(bool on); bool isHover() const { return HasAuraType(SPELL_AURA_HOVER); } void KnockBackFrom(Unit* target, float horizontalSpeed, float verticalSpeed); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b871f876c..4403b7a40 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 "11954" + #define REVISION_NR "11955" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 24429966e..f0da23c1f 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_11785_02_characters_instance" - #define REVISION_DB_MANGOS "required_11953_01_mangos_playercreateinfo_spell" + #define REVISION_DB_MANGOS "required_11955_02_mangos_command" #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version" #endif // __REVISION_SQL_H__