diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Language.h | 4 | ||||
| -rw-r--r-- | src/shared/Database/DBCStructure.h | 3 | ||||
| -rw-r--r-- | src/shared/Database/DBCfmt.cpp | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/game/Language.h b/src/game/Language.h index 0347bf8e676..7aaa9a069ee 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -689,7 +689,7 @@ enum TrinityStrings // Room for BG/ARENA 750-769 not used - LANG_ARENA_TESTING = 785, +/* LANG_ARENA_TESTING = 785, LANG_AUTO_ANN = 786, LANG_ANNOUNCE_COLOR = 787, @@ -711,7 +711,7 @@ enum TrinityStrings LANG_CANNOT_TELE_TO_BG = 1135, // "You cannot teleport to a battleground or arena map." LANG_CANNOT_SUMMON_TO_BG = 1136, // "You cannot summon players to a battleground or arena map." LANG_CANNOT_GO_TO_BG_GM = 1137, // "You must be in GM mode to teleport to a player in a battleground." - LANG_CANNOT_GO_TO_BG_FROM_BG = 1138, // "You cannot teleport to a battleground from another battleground. Please leave the current battleground first." + LANG_CANNOT_GO_TO_BG_FROM_BG = 1138, // "You cannot teleport to a battleground from another battleground. Please leave the current battleground first."*/ // = 716, not used LANG_BG_STARTED_ANNOUNCE_WORLD = 717, diff --git a/src/shared/Database/DBCStructure.h b/src/shared/Database/DBCStructure.h index 1b406718f47..c01b2f440fc 100644 --- a/src/shared/Database/DBCStructure.h +++ b/src/shared/Database/DBCStructure.h @@ -579,7 +579,6 @@ struct ChrClassesEntry uint32 powerType; // 2 // 3-4, unused //char* name[16]; // 5-20 unused - char* name[16]; // 5-20 unused // 21 string flag, unused //char* nameFemale[16]; // 21-36 unused, if different from base (male) case // 37 string flag, unused @@ -941,7 +940,7 @@ struct MapEntry bool IsMountAllowed() const { - return !IsDungeon() || + return !IsDungeon() || MapID==568 || MapID==309 || MapID==209 || MapID==534 || MapID==560 || MapID==509 || MapID==269; } diff --git a/src/shared/Database/DBCfmt.cpp b/src/shared/Database/DBCfmt.cpp index b6dc08a0e91..edcf7e2b2be 100644 --- a/src/shared/Database/DBCfmt.cpp +++ b/src/shared/Database/DBCfmt.cpp @@ -10,12 +10,12 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ const char Achievementfmt[]="niixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiixixxxxxxxxxxxxxxxxxxxi"; @@ -29,7 +29,6 @@ const char CharStartOutfitEntryfmt[]="diiiiiiiiiiiiiiiiiiiiiiiiixxxxxxxxxxxxxxxx const char CharTitlesEntryfmt[]="nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxi"; const char ChatChannelsEntryfmt[]="iixssssssssssssssssxxxxxxxxxxxxxxxxxx"; // ChatChannelsEntryfmt, index not used (more compact store) -//const char ChrClassesEntryfmt[]="nxixssssssssssssssssxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxix"; const char ChrClassesEntryfmt[]="nxixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxixii"; const char ChrRacesEntryfmt[]="nxixiixxixxxxissssssssssssssssxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxi"; const char CreatureDisplayInfofmt[]="nxxxfxxxxxxxxxxx"; @@ -77,7 +76,7 @@ const char SpellFocusObjectfmt[]="nxxxxxxxxxxxxxxxxx"; const char SpellItemEnchantmentfmt[]="nxiiiiiixxxiiissssssssssssssssxiiiixx"; const char SpellItemEnchantmentConditionfmt[]="nbbbbbxxxxxbbbbbbbbbbiiiiiXXXXX"; const char SpellRadiusfmt[]="nfxf"; -const char SpellRangefmt[]="nfxfxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; +const char SpellRangefmt[]="nfxfxixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; const char SpellRuneCostfmt[]="niiii"; const char SpellShapeshiftfmt[]="nxxxxxxxxxxxxxxxxxxiixixxxxxxxxxxxx"; const char StableSlotPricesfmt[] = "ni"; |