From 69c8c84f09ae725e4e998d248a267b3f2a46a3d0 Mon Sep 17 00:00:00 2001 From: Rat Date: Sat, 18 Jul 2009 18:18:33 +0200 Subject: *implemented MOJO (yes the frog from Zul'Aman) have fun --HG-- branch : trunk --- sql/updates/4495_world_script.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/4495_world_script.sql (limited to 'sql/updates') diff --git a/sql/updates/4495_world_script.sql b/sql/updates/4495_world_script.sql new file mode 100644 index 00000000000..8e37e081e23 --- /dev/null +++ b/sql/updates/4495_world_script.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `ScriptName`='mob_mojo' WHERE `entry`='24480'; \ No newline at end of file -- cgit v1.2.3 From 7166e8d26fe1bdf0f5765dd3e9b110b395d412e7 Mon Sep 17 00:00:00 2001 From: Rat Date: Sat, 18 Jul 2009 22:15:56 +0200 Subject: *implemented basic Chat Channel saving *includes owner, banlist,announce,password, saving *todo: -make it cacheble -add a filter to not save some addon spec channels -find someone who does these for me :) --HG-- branch : trunk --- sql/updates/4498_characters_channels.sql | 14 ++++ src/game/Channel.cpp | 126 ++++++++++++++++++++++++++++++- src/game/Channel.h | 4 +- src/game/ChannelHandler.cpp | 3 + src/game/ChannelMgr.h | 5 +- 5 files changed, 146 insertions(+), 6 deletions(-) create mode 100644 sql/updates/4498_characters_channels.sql (limited to 'sql/updates') diff --git a/sql/updates/4498_characters_channels.sql b/sql/updates/4498_characters_channels.sql new file mode 100644 index 00000000000..f4e8162b4e9 --- /dev/null +++ b/sql/updates/4498_characters_channels.sql @@ -0,0 +1,14 @@ +-- ---------------------------- +-- Table structure for channels +-- ---------------------------- +DROP TABLE IF EXISTS `channels`; +CREATE TABLE `channels` ( + `m_name` text NOT NULL, + `m_team` int(10) unsigned NOT NULL, + `m_ownerGUID` int(11) unsigned NOT NULL default '0', + `m_announce` tinyint(1) unsigned NOT NULL default '0', + `m_moderate` tinyint(1) unsigned NOT NULL default '0', + `m_password` text, + `BannedList` longtext, + PRIMARY KEY (`m_name`(10),`m_team`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Access Requirements'; diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp index 9bb3463dbdb..a247abe19ee 100644 --- a/src/game/Channel.cpp +++ b/src/game/Channel.cpp @@ -23,9 +23,10 @@ #include "SocialMgr.h" #include "World.h" -Channel::Channel(const std::string& name, uint32 channel_id) -: m_announce(true), m_moderate(false), m_name(name), m_flags(0), m_channelId(channel_id), m_ownerGUID(0) +Channel::Channel(const std::string& name, uint32 channel_id, uint32 Team) + : m_name(name), m_announce(true), m_moderate(false), m_channelId(channel_id), m_ownerGUID(0), m_password(""), m_flags(0) { + m_Team = Team; // set special flags if built-in channel ChatChannelsEntry const* ch = GetChannelEntryFor(channel_id); if(ch) // it's built-in channel @@ -45,10 +46,54 @@ Channel::Channel(const std::string& name, uint32 channel_id) m_flags |= CHANNEL_FLAG_LFG; else // for all other channels m_flags |= CHANNEL_FLAG_NOT_LFG; + m_IsSaved = false; } else // it's custom channel { m_flags |= CHANNEL_FLAG_CUSTOM; + //load not built in channel if saved + QueryResult *result = CharacterDatabase.PQuery("SELECT m_name, m_team, m_ownerGUID, m_announce, m_moderate, m_password, BannedList FROM channels WHERE m_name = '%s' AND m_team = '%u'", name.c_str(), m_Team); + if (result)//load + { + Field *fields = result->Fetch(); + const char* db_name = fields[0].GetString(); + uint32 db_team = fields[1].GetUInt32(); + uint64 db_owner = fields[2].GetUInt64(); + bool db_announce = fields[3].GetBool(); + bool db_moderate = fields[4].GetBool(); + const char* db_password = fields[5].GetString(); + const char* db_BannedList = fields[6].GetString(); + + m_ownerGUID = db_owner; + m_announce = db_announce; + m_moderate = db_moderate; + m_password = db_password; + m_IsSaved = true; + + if(db_BannedList) + { + Tokens tokens = StrSplit(db_BannedList, " "); + Tokens::iterator iter; + for (iter = tokens.begin();iter != tokens.end(); ++iter) + { + uint64 banned_guid = atol((*iter).c_str()); + if(banned_guid) + { + sLog.outDebug("Channel(%s) loaded banned guid: %u",name.c_str(), banned_guid); + banned.insert(banned_guid); + } + } + } + }else{//save + std::ostringstream ss; + ss << "INSERT INTO channels (m_name,m_team,m_ownerGUID,m_announce,m_moderate,m_password) VALUES ('" + << name.c_str() << "','" << m_Team << "','0','1','0','')"; + if(CharacterDatabase.PExecuteLog( ss.str( ).c_str( ) )) + { + sLog.outDebug("New Channel(%s) saved", name.c_str()); + m_IsSaved = true; + } + } } } @@ -118,6 +163,10 @@ void Channel::Join(uint64 p, const char *pass) // if no owner first logged will become if(!IsConstant() && !m_ownerGUID) + { + SetOwner(p, (players.size() > 1 ? true : false)); + players[p].SetModerator(true); + }else if(!IsConstant() && m_ownerGUID && plr && m_ownerGUID == plr->GetGUID()) { SetOwner(p, (players.size() > 1 ? true : false)); players[p].SetModerator(true); @@ -161,7 +210,7 @@ void Channel::Leave(uint64 p, bool send) LeaveNotify(p); - if(changeowner) + if(changeowner && !m_IsSaved) { uint64 newowner = !players.empty() ? players.begin()->second.player : 0; SetOwner(newowner); @@ -213,6 +262,23 @@ void Channel::KickOrBan(uint64 good, const char *badname, bool ban) { banned.insert(bad->GetGUID()); MakePlayerBanned(&data, bad->GetGUID(), good); + //save banlist + if(m_IsSaved) + { + std::ostringstream banlist; + BannedList::iterator iter; + for (iter = banned.begin();iter != banned.end(); ++iter) + { + banlist << (*iter) << " "; + } + std::ostringstream ss; + ss << "UPDATE channels SET BannedList = '" << banlist.str().c_str() << "' WHERE m_name = '"<GetGUID(), good); @@ -265,6 +331,22 @@ void Channel::UnBan(uint64 good, const char *badname) WorldPacket data; MakePlayerUnbanned(&data, bad->GetGUID(), good); SendToAll(&data); + //save banlist + if(m_IsSaved) + { + std::ostringstream banlist; + BannedList::iterator iter; + for (iter = banned.begin();iter != banned.end(); ++iter) + { + banlist << (*iter) << " "; + } + std::ostringstream ss; + ss << "UPDATE channels SET BannedList = '" << banlist.str().c_str() << "' WHERE m_name = '"<> pass; if(ChannelMgr* cMgr = channelMgr(_player->GetTeam())) + { + cMgr->team = _player->GetTeam(); if(Channel *chn = cMgr->GetJoinChannel(channelname, channel_id)) chn->Join(_player->GetGUID(), pass.c_str()); + } } void WorldSession::HandleLeaveChannel(WorldPacket& recvPacket) diff --git a/src/game/ChannelMgr.h b/src/game/ChannelMgr.h index aeecfbfa541..956309e9873 100644 --- a/src/game/ChannelMgr.h +++ b/src/game/ChannelMgr.h @@ -31,8 +31,9 @@ class ChannelMgr { public: + uint32 team; typedef std::map ChannelMap; - ChannelMgr() {} + ChannelMgr() {team = 0;} ~ChannelMgr() { for(ChannelMap::const_iterator itr = channels.begin();itr!=channels.end(); ++itr) @@ -43,7 +44,7 @@ class ChannelMgr { if (channels.find(name) == channels.end()) { - Channel *nchan = new Channel(name,channel_id); + Channel *nchan = new Channel(name,channel_id, team); channels[name] = nchan; } return channels[name]; -- cgit v1.2.3