mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-27 19:37:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ChatChannels fix - test PR

Browse source 
DO NOT MERGE

This is a test to see if it gets tripped up by Travis during the Linux
build.

If all okay, then this can be merged.
This commit is contained in:
Charles A Edwards 2016-08-02 18:47:31 +01:00 • committed by Antz
parent 9d5d28e780
commit 3a9b00aafd
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/Server/DBCStores.cpp
View file

@ -1035,6 +1035,7 @@ ChatChannelsEntry const* GetChannelEntryFor(uint32 channel_id)
return NULL;
}
/*
static ChatChannelsEntry worldCh = { 26, 4, "world" };
ChatChannelsEntry const* GetChannelEntryFor(const std::string& name)
@ -1073,6 +1074,7 @@ ChatChannelsEntry const* GetChannelEntryFor(const std::string& name)
return NULL;
}
*/
bool IsTotemCategoryCompatiableWith(uint32 itemTotemCategoryId, uint32 requiredTotemCategoryId)
{

2
src/game/Server/DBCStores.h
View file

@ -120,7 +120,7 @@ extern DBCStorage <AuctionHouseEntry> sAuctionHouseStore;
extern DBCStorage <BankBagSlotPricesEntry> sBankBagSlotPricesStore;
extern DBCStorage <BarberShopStyleEntry> sBarberShopStyleStore;
extern DBCStorage <BattlemasterListEntry> sBattlemasterListStore;
// extern DBCStorage <ChatChannelsEntry> sChatChannelsStore; -- accessed using function, no usable index
extern DBCStorage <ChatChannelsEntry> sChatChannelsStore; // -- accessed using function, no usable index
extern DBCStorage <CharStartOutfitEntry> sCharStartOutfitStore;
extern DBCStorage <CharTitlesEntry> sCharTitlesStore;
extern DBCStorage <ChrClassesEntry> sChrClassesStore;

3
src/game/Server/DBCStructure.h
View file

@ -673,7 +673,8 @@ struct ChatChannelsEntry
uint32 ChannelID; // 0 m_ID
uint32 flags; // 1 m_flags
//uint32 // 2 m_factionGroup
char* pattern[16]; // 3 m_name_lang
DBCString pattern; // 3 m_name_lang
// char* pattern[16]; // 3 m_name_lang
//char* name; // 4 m_shortcut_lang
};