From 9fd41d05083ad018b9d8711d43db12ecf03a0c49 Mon Sep 17 00:00:00 2001
From: stfx <stfx@hotmail.de>
Date: Fri, 13 Apr 2012 17:41:58 +0200
Subject: [PATCH] [11958] Add support for no-fly-zone text message

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
---
 sql/mangos.sql                                | 3 ++-
 sql/updates/11958_01_mangos_mangos_string.sql | 4 ++++
 src/game/Language.h                           | 3 ++-
 src/game/SpellAuras.cpp                       | 4 ++++
 src/shared/revision_nr.h                      | 2 +-
 src/shared/revision_sql.h                     | 2 +-
 6 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 sql/updates/11958_01_mangos_mangos_string.sql

diff --git a/sql/mangos.sql b/sql/mangos.sql
index 82e052f27..08ba90c6f 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_11955_02_mangos_command` bit(1) default NULL
+  `required_11958_01_mangos_mangos_string` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -3845,6 +3845,7 @@ INSERT INTO `mangos_string` VALUES
 (814,'Member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (815,'Initiate',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (816,'Your body is too exhausted to travel to the Spectral Realm.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(817,'Warning: You\'ve entered a no-fly zone and are about to be dismounted!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1000,'Exiting daemon...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1001,'Account deleted: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1002,'Account %s NOT deleted (probably sql file format was updated)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
diff --git a/sql/updates/11958_01_mangos_mangos_string.sql b/sql/updates/11958_01_mangos_mangos_string.sql
new file mode 100644
index 000000000..7fc954ba7
--- /dev/null
+++ b/sql/updates/11958_01_mangos_mangos_string.sql
@@ -0,0 +1,4 @@
+ALTER TABLE db_version CHANGE COLUMN required_11955_02_mangos_command required_11958_01_mangos_mangos_string bit;
+
+DELETE FROM mangos_string WHERE entry=817;
+INSERT INTO mangos_string VALUES (817,'Warning: You\'ve entered a no-fly zone and are about to be dismounted!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/src/game/Language.h b/src/game/Language.h
index 370f85076..0cbfd2896 100644
--- a/src/game/Language.h
+++ b/src/game/Language.h
@@ -810,7 +810,8 @@ enum MangosStrings
     LANG_GUILD_MEMBER                   = 814,
     LANG_GUILD_INITIATE                 = 815,
     LANG_FAIL_ENTER_SPECTRAL_REALM      = 816,
-    // Room for in-game strings           817-999 not used
+    LANG_NO_FLY_ZONE                    = 817,
+    // Room for in-game strings           818-999 not used
 
     // Level 4 (CLI only commands)
     LANG_COMMAND_EXIT                   = 1000,
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 44d2ee3b7..ccc0212f6 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -45,6 +45,7 @@
 #include "GridNotifiersImpl.h"
 #include "Vehicle.h"
 #include "CellImpl.h"
+#include "Language.h"
 
 #define NULL_AURA_SLOT 0xFF
 
@@ -2147,6 +2148,9 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                     case 54729:                             // Winged Steed of the Ebon Blade
                         Spell::SelectMountByAreaAndSkill(target, GetSpellProto(), 0, 0, 54726, 54727, 0);
                         return;
+                    case 58600:                             // Restricted Flight Area
+                        target->MonsterWhisper(LANG_NO_FLY_ZONE, target, true);
+                        return;
                     case 62061:                             // Festive Holiday Mount
                         if (target->HasAuraType(SPELL_AURA_MOUNTED))
                             // Reindeer Transformation
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 913eb334d..4b712abe1 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 "11957"
+ #define REVISION_NR "11958"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h
index f0da23c1f..cbcaf821d 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_11955_02_mangos_command"
+ #define REVISION_DB_MANGOS "required_11958_01_mangos_mangos_string"
  #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
 #endif // __REVISION_SQL_H__