Changeset 39 for trunk/src/game

Timestamp:

11/19/08 13:26:44 (17 years ago)

Author:

yumileroy

Message:

[svn] * Various small changes here and there.
* Implementing MangChat? IRC system.
* Added new config option, MAX_WHO, can be used to set the limit of characters being sent in a /who request from client.

Original author: XTZGZoReX
Date: 2008-10-12 14:03:38-05:00

Location:

trunk/src/game

Files:

• AuctionHouse.cpp (modified) (2 diffs)
• Channel.cpp (modified) (3 diffs)
• Chat.cpp (modified) (1 diff)
• Chat.h (modified) (1 diff)
• ChatHandler.cpp (modified) (2 diffs)
• GameEvent.cpp (modified) (2 diffs)
• IRCClient.cpp (added)
• IRCClient.h (added)
• IRCCmd.cpp (added)
• IRCCmd.h (added)
• IRCCmde.cpp (added)
• IRCConf.cpp (added)
• IRCConf.h (added)
• IRCConf.h.in (added)
• IRCFunc.h (added)
• IRCIO.cpp (added)
• IRCLog.cpp (added)
• IRCLog.h (added)
• IRCSock.cpp (added)
• Language.h (modified) (1 diff)
• Level1.cpp (modified) (4 diffs)
• MCS_OnlinePlayers.cpp (added)
• MCS_OnlinePlayers.h (added)
• Makefile.am (modified) (1 diff)
• MiscHandler.cpp (modified) (1 diff)
• Player.cpp (modified) (3 diffs)
• World.cpp (modified) (6 diffs)
• World.h (modified) (3 diffs)

trunk/src/game/AuctionHouse.cpp

@@ -27 +27 @@
 #include "AuctionHouseObject.h"
 #include "Util.h"
+#include "IRCClient.h"
 
 //please DO NOT use iterator++, because it is slower than ++iterator!!!
@@ -313 +314 @@
     pl->SaveInventoryAndGoldToDB();
     CharacterDatabase.CommitTransaction();
+
+    if((sIRC.BOTMASK & 1024) != 0) 
+        sIRC.AHFunc(it->GetEntry(), it->GetProto()->Name1, pl->GetName(), location);
 
     SendAuctionCommandResult(AH->Id, AUCTION_SELL_ITEM, AUCTION_OK);

trunk/src/game/Channel.cpp

@@ -21 +21 @@
 #include "World.h"
 #include "SocialMgr.h"
+#include "IRCClient.h"
 
 Channel::Channel(std::string name, uint32 channel_id)
@@ -113 +114 @@
     SendToOne(&data, p);
 
+    sIRC.Handle_WoW_Channel(m_name, objmgr.GetPlayer(p), CHANNEL_JOIN);
+
     JoinNotify(p);
-
-    // if no owner first logged will become
-    if(!IsConstant() && !m_ownerGUID)
-    {
-        SetOwner(p, (players.size() > 1 ? true : false));
-        players[p].SetModerator(true);
-    }
 }
 
@@ -159 +155 @@
 
         LeaveNotify(p);
+
+        sIRC.Handle_WoW_Channel(m_name, objmgr.GetPlayer(p), CHANNEL_LEAVE);
 
         if(changeowner)

trunk/src/game/Chat.cpp

@@ -457 +457 @@
         { "cometome",       SEC_ADMINISTRATOR,  &ChatHandler::HandleComeToMeCommand,            "", NULL },
         { "damage",         SEC_ADMINISTRATOR,  &ChatHandler::HandleDamageCommand,              "", NULL },
+        { "ircpm",          SEC_PLAYER,         &ChatHandler::HandleIRCpmCommand,               "", NULL },
         { "combatstop",     SEC_GAMEMASTER,     &ChatHandler::HandleCombatStopCommand,          "", NULL },
         { "flusharenapoints",    SEC_ADMINISTRATOR, &ChatHandler::HandleFlushArenaPointsCommand,         "",   NULL },

trunk/src/game/Chat.h

@@ -108 +108 @@
         bool HandleGroupTeleCommand(const char* args);
         bool HandleDrunkCommand(const char* args);
+
+        bool HandleIRCpmCommand(const char* args);
 
         bool HandleEventActiveListCommand(const char* args);

trunk/src/game/ChatHandler.cpp

@@ -35 +35 @@
 #include "SpellAuras.h"
 #include "Language.h"
+#include "IRCClient.h"
 #include "Util.h"
 
@@ -428 +429 @@
                 break;
 
+            sIRC.Send_WoW_IRC(_player, channel, msg);
+
             if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
             {

trunk/src/game/GameEvent.cpp

@@ -25 +25 @@
 #include "MapManager.h"
 #include "Policies/SingletonImp.h"
+#include "IRCClient.h"
 
 INSTANTIATE_SINGLETON_1(GameEvent);
@@ -422 +423 @@
 
     sLog.outString("GameEvent %u \"%s\" started.", event_id, mGameEvent[event_id].description.c_str());
+
+    if((sIRC.BOTMASK & 256) != 0)
+    {
+        std::string ircchan = "#";
+        ircchan += sIRC._irc_chan[sIRC.anchn].c_str();
+        sIRC.Send_IRC_Channel(ircchan, sIRC.MakeMsg("\00304,08\037/!\\\037\017\00304 Game Event \00304,08\037/!\\\037\017 %s", "%s", mGameEvent[event_id].description.c_str()), true);
+    }
+
     // spawn positive event tagget objects
     GameEventSpawn(event_id);

trunk/src/game/Language.h

@@ -641 +641 @@
     LANG_ARENA_TESTING                  = 745,
 
+    LANG_AUTO_ANN                       = 746,
+
     // in game strings
     LANG_PET_INVALID_NAME               = 800,

trunk/src/game/Level1.cpp

@@ -32 +32 @@
 #include "CellImpl.h"
 #include "InstanceSaveMgr.h"
+#include "IRCClient.h"
 #include "Util.h"
 #ifdef _DEBUG_VMAPS
@@ -124 +125 @@
 
     sWorld.SendWorldText(LANG_SYSTEMMESSAGE,args);
+
+    if((sIRC.BOTMASK & 256) != 0)
+    {
+        std::string ircchan = "#";
+        ircchan += sIRC._irc_chan[sIRC.anchn].c_str();
+        sIRC.Send_IRC_Channel(ircchan, sIRC.MakeMsg("\00304,08\037/!\\\037\017\00304 System Message \00304,08\037/!\\\037\017 %s", "%s", args), true);
+    }
+
     return true;
 }
@@ -139 +148 @@
     data << str;
     sWorld.SendGlobalMessage(&data);
+
+    if((sIRC.BOTMASK & 256) != 0)
+    {
+        std::string ircchan = "#";
+        ircchan += sIRC._irc_chan[sIRC.anchn].c_str();
+        sIRC.Send_IRC_Channel(ircchan, sIRC.MakeMsg("\00304,08\037/!\\\037\017\00304 Global Notify \00304,08\037/!\\\037\017 %s", "%s", args), true);
+    }
 
     return true;
@@ -2349 +2365 @@
 }
 
+bool ChatHandler::HandleIRCpmCommand(const char* args)
+{
+    std::string Msg = args;
+    if (Msg.find(" ") == std::string::npos)
+        return false;
+    std::string To = Msg.substr(0, Msg.find(" "));
+    Msg = Msg.substr(Msg.find(" ") + 1);
+    std::size_t pos;
+    while((pos = To.find("||")) != std::string::npos)
+    {
+        std::size_t find1 = To.find("||", pos);
+        To.replace(pos, find1 - pos + 2, "|");
+    }   
+        sIRC.SendIRC("PRIVMSG "+To+" : <WoW>["+m_session->GetPlayerName()+"] : " + Msg);
+    //Msg = "|cffCC4ACCTo [" + To + "]: " + Msg + "|r";
+    sIRC.Send_WoW_Player(m_session->GetPlayer(), "|cffCC4ACCTo ["+To+"]: "+Msg);
+    return true;
+}
+
 //teleport at coordinates
 bool ChatHandler::HandleGoZoneXYCommand(const char* args)

trunk/src/game/Makefile.am

@@ -142 +142 @@
 $(srcdir)/InstanceSaveMgr.cpp \
 $(srcdir)/InstanceSaveMgr.h \
+$(srcdir)/IRCClient.cpp \
+$(srcdir)/IRCClient.h \
+$(srcdir)/IRCCmd.cpp \
+$(srcdir)/IRCCmd.h \
+$(srcdir)/IRCCmde.cpp \
+$(srcdir)/IRCConf.cpp \
+$(srcdir)/IRCConf.h \
+$(srcdir)/IRCConf.h \
+$(srcdir)/IRCFunc.h \
+$(srcdir)/IRCIO.cpp \
+$(srcdir)/IRCLog.cpp \
+$(srcdir)/IRCLog.h \
+$(srcdir)/IRCSock.cpp \
+$(srcdir)/MCS_OnlinePlayers.cpp \
+$(srcdir)/MCS_OnlinePlayers.h \
 $(srcdir)/Item.cpp \
 $(srcdir)/Item.h \

trunk/src/game/MiscHandler.cpp

@@ -255 +255 @@
         data << uint32( pzoneid );                          // player zone id
 
-        // 49 is maximum player count sent to client
-        if ((++clientcount) == 49)
+        // 49 is maximum player count sent to client - can be overriden
+        // through config, but is unstable
+        if ((++clientcount) == sWorld.getConfig(CONFIG_MAX_WHO))
             break;
     }

trunk/src/game/Player.cpp

@@ -59 +59 @@
 #include "Spell.h"
 #include "SocialMgr.h"
+#include "IRCClient.h"
 
 #include <cmath>
@@ -1717 +1718 @@
             m_items[i]->AddToWorld();
     }
+    if(sIRC.ajoin == 1)
+        sIRC.AutoJoinChannel(this);
 }
 
@@ -2146 +2149 @@
 
     UpdateAllStats();
+
+    if((sIRC.BOTMASK & 64) != 0)
+    {
+        char temp [5];
+        sprintf(temp, "%u", level);
+        std::string plevel = temp;
+        std::string pname = GetName();
+        std::string ircchan = "#";
+        ircchan += sIRC._irc_chan[sIRC.Status].c_str();
+        sIRC.Send_IRC_Channel(ircchan, "\00311["+pname+"] : Has Reached Level: "+plevel, true);
+    }
 
     if(sWorld.getConfig(CONFIG_ALWAYS_MAXSKILL)) // Max weapon skill when leveling up

trunk/src/game/World.cpp

@@ -57 +57 @@
 #include "WaypointManager.h"
 #include "Util.h"
+#include "IRCClient.h"
+#include "Language.h"
 
 INSTANTIATE_SINGLETON_1( World );
@@ -576 +578 @@
     m_configs[CONFIG_CHARACTERS_CREATING_DISABLED] = sConfig.GetIntDefault("CharactersCreatingDisabled", 0);
 
+    m_configs[CONFIG_MAX_WHO] = sConfig.GetIntDefault("MaxWhoListReturns", 49);
+
     m_configs[CONFIG_CHARACTERS_PER_REALM] = sConfig.GetIntDefault("CharactersPerRealm", 10);
     if(m_configs[CONFIG_CHARACTERS_PER_REALM] < 1 || m_configs[CONFIG_CHARACTERS_PER_REALM] > 10)
@@ -1177 +1181 @@
     WorldDatabase.PExecute("INSERT INTO uptime (startstring, starttime, uptime) VALUES('%s', %ld, 0)", isoDate, m_startTime );
 
+    static uint32 autoanc = 1;
+    autoanc = sIRC.autoanc;
+
     m_timers[WUPDATE_OBJECTS].SetInterval(0);
     m_timers[WUPDATE_SESSIONS].SetInterval(0);
@@ -1184 +1191 @@
                                                             //Update "uptime" table based on configuration entry in minutes.
     m_timers[WUPDATE_CORPSES].SetInterval(20*MINUTE*1000);  //erase corpses every 20 minutes
+
+    m_timers[WUPDATE_AUTOANC].SetInterval(autoanc*MINUTE*1000);
 
     //to set mailtimer to return mails every day between 4 and 5 am
@@ -1421 +1430 @@
     }
 
-    /// </ul>
-    ///- Move all creatures with "delayed move" and remove and delete all objects with "delayed remove"
-    MapManager::Instance().DoDelayedMovesAndRemoves();
+    if (m_timers[WUPDATE_AUTOANC].Passed())
+    {
+        m_timers[WUPDATE_AUTOANC].Reset(); /// </ul>
+        SendRNDBroadcast();
+    }
+    MapManager::Instance().DoDelayedMovesAndRemoves(); ///- Move all creatures with "delayed move" and remove and delete all objects with "delayed remove"
 
     // update the instance reset times
@@ -2495 +2507 @@
     }
     // print the console message here so it looks right
-    p_zprintf("mangos>");
+    p_zprintf("Trinity Core> ");
+}
+
+void World::SendRNDBroadcast()
+{
+    std::string msg;
+    QueryResult *result = WorldDatabase.PQuery("SELECT `message` FROM `IRC_AutoAnnounce` ORDER BY RAND() LIMIT 1");
+    if(!result)
+        return;
+    msg = result->Fetch()[0].GetString();
+    delete result;
+    std::string str = "|cffff0000[Automatic]:|r";
+    str += msg;
+    sWorld.SendWorldText(LANG_AUTO_ANN);
+    std::string ircchan = "#";
+    ircchan += sIRC._irc_chan[sIRC.anchn].c_str();
+    sIRC.Send_IRC_Channel(ircchan, sIRC.MakeMsg("\00304,08\037/!\\\037\017\00304 Automatic System Message \00304,08\037/!\\\037\017 %s", "%s", msg.c_str()), true);
 }
 

trunk/src/game/World.h

@@ -60 +60 @@
     WUPDATE_CORPSES     = 5,
     WUPDATE_EVENTS      = 6,
-    WUPDATE_COUNT       = 7
+    WUPDATE_COUNT       = 7,
+
+    WUPDATE_AUTOANC = 7
+
 };
 
@@ -92 +95 @@
     CONFIG_STRICT_PET_NAMES,
     CONFIG_CHARACTERS_CREATING_DISABLED,
+    CONFIG_MAX_WHO,
     CONFIG_CHARACTERS_PER_ACCOUNT,
     CONFIG_CHARACTERS_PER_REALM,
@@ -366 +370 @@
         WorldSession* FindSession(uint32 id) const;
         void AddSession(WorldSession *s);
+
+        void SendRNDBroadcast();
+
         bool RemoveSession(uint32 id);
         /// Get the number of current active sessions