src/Chat.cpp

@@ -1,7 +1,6 @@
 #include "Chat.hpp"
 
 #include "servers/CNShardServer.hpp"
-#include "servers/Monitor.hpp"
 
 #include "Player.hpp"
 #include "PlayerManager.hpp"
@@ -9,6 +8,8 @@
 
 #include <assert.h>
 
+std::vector<std::string> Chat::dump;
+
 using namespace Chat;
 
 static void chatHandler(CNSocket* sock, CNPacketData* data) {
@@ -27,7 +28,7 @@ static void chatHandler(CNSocket* sock, CNPacketData* data) {
     std::string logLine = "[FreeChat] " + PlayerManager::getPlayerName(plr, true) + ": " + fullChat;
 
     std::cout << logLine << std::endl;
-    Monitor::chats.push_back(logLine);
+    dump.push_back(logLine);
 
     // send to client
     INITSTRUCT(sP_FE2CL_REP_SEND_FREECHAT_MESSAGE_SUCC, resp);
@@ -50,7 +51,7 @@ static void menuChatHandler(CNSocket* sock, CNPacketData* data) {
     std::string logLine = "[MenuChat] " + PlayerManager::getPlayerName(plr, true) + ": " + fullChat;
 
     std::cout << logLine << std::endl;
-    Monitor::chats.push_back(logLine);
+    dump.push_back(logLine);
 
     // send to client
     INITSTRUCT(sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_SUCC, resp);
@@ -102,14 +103,14 @@ static void announcementHandler(CNSocket* sock, CNPacketData* data) {
     memcpy(msg.szAnnounceMsg, announcement->szAnnounceMsg, sizeof(msg.szAnnounceMsg));
     std::map<CNSocket*, Player*>::iterator it;
 
-    // This value is completely arbitrary, but these make the most sense when you consider the architecture of the game
     switch (announcement->iAreaType) {
     case 0: // area (all players in viewable chunks)
         sock->sendPacket(msg, P_FE2CL_GM_REP_PC_ANNOUNCE);
         PlayerManager::sendToViewable(sock, msg, P_FE2CL_GM_REP_PC_ANNOUNCE);
         break;
-    case 1: // channel
+    case 1: // shard
-    case 2: // shard
+    case 2: // world
+        break; // not applicable to OpenFusion
     case 3: // global (all players)
         for (it = PlayerManager::players.begin(); it != PlayerManager::players.end(); it++) {
             CNSocket* allSock = it->first;
@@ -119,12 +120,9 @@ static void announcementHandler(CNSocket* sock, CNPacketData* data) {
         break;
     }
 
-    std::string logLine = std::to_string(announcement->iAreaType) + " "
+    std::string logLine = "[Bcast " + std::to_string(announcement->iAreaType) + "] " + PlayerManager::getPlayerName(plr, false) + ": " + AUTOU16TOU8(msg.szAnnounceMsg);
-                        + std::to_string(announcement->iAnnounceType) + " "
+    std::cout << logLine << std::endl;
-                        + std::to_string(announcement->iDuringTime) + " "
+    dump.push_back("**" + logLine + "**");
-                        + PlayerManager::getPlayerName(plr, false) + ": " + AUTOU16TOU8(msg.szAnnounceMsg);
-    std::cout << "Broadcast " << logLine << std::endl;
-    Monitor::bcasts.push_back(logLine);
 }
 
 // Buddy freechatting
@@ -157,7 +155,7 @@ static void buddyChatHandler(CNSocket* sock, CNPacketData* data) {
 
     std::string logLine = "[BuddyChat] " + PlayerManager::getPlayerName(plr) + " (to " + PlayerManager::getPlayerName(otherPlr) + "): " + fullChat;
     std::cout << logLine << std::endl;
-    Monitor::chats.push_back(logLine);
+    dump.push_back(logLine);
 
     U8toU16(fullChat, (char16_t*)&resp.szFreeChat, sizeof(resp.szFreeChat));
 
@@ -187,7 +185,7 @@ static void buddyMenuChatHandler(CNSocket* sock, CNPacketData* data) {
     std::string logLine = "[BuddyMenuChat] " + PlayerManager::getPlayerName(plr) + " (to " + PlayerManager::getPlayerName(otherPlr) + "): " + fullChat;
 
     std::cout << logLine << std::endl;
-    Monitor::chats.push_back(logLine);
+    dump.push_back(logLine);
 
     U8toU16(fullChat, (char16_t*)&resp.szFreeChat, sizeof(resp.szFreeChat));
 
@@ -220,7 +218,7 @@ static void tradeChatHandler(CNSocket* sock, CNPacketData* data) {
     std::string logLine = "[TradeChat] " + PlayerManager::getPlayerName(plr) + " (to " + PlayerManager::getPlayerName(otherPlr) + "): " + fullChat;
 
     std::cout << logLine << std::endl;
-    Monitor::chats.push_back(logLine);
+    dump.push_back(logLine);
 
     resp.iEmoteCode = pacdat->iEmoteCode;
     sock->sendPacket(resp, P_FE2CL_REP_PC_TRADE_EMOTES_CHAT);
@@ -243,7 +241,7 @@ static void groupChatHandler(CNSocket* sock, CNPacketData* data) {
 
     std::string logLine = "[GroupChat] " + PlayerManager::getPlayerName(plr, true) + ": " + fullChat;
     std::cout << logLine << std::endl;
-    Monitor::chats.push_back(logLine);
+    dump.push_back(logLine);
 
     // send to client
     INITSTRUCT(sP_FE2CL_REP_SEND_ALL_GROUP_FREECHAT_MESSAGE_SUCC, resp);
@@ -266,7 +264,7 @@ static void groupMenuChatHandler(CNSocket* sock, CNPacketData* data) {
     std::string logLine = "[GroupMenuChat] " + PlayerManager::getPlayerName(plr, true) + ": " + fullChat;
 
     std::cout << logLine << std::endl;
-    Monitor::chats.push_back(logLine);
+    dump.push_back(logLine);
 
     // send to client
     INITSTRUCT(sP_FE2CL_REP_SEND_ALL_GROUP_MENUCHAT_MESSAGE_SUCC, resp);

src/Chat.hpp

@@ -8,6 +8,7 @@
 #include <vector>
 
 namespace Chat {
+    extern std::vector<std::string> dump;
     void init();
 
     void sendServerMessage(CNSocket* sock, std::string msg); // uses MOTD

src/Email.cpp

@@ -3,7 +3,6 @@
 #include "core/Core.hpp"
 #include "db/Database.hpp"
 #include "servers/CNShardServer.hpp"
-#include "servers/Monitor.hpp"
 
 #include "PlayerManager.hpp"
 #include "Items.hpp"
@@ -11,6 +10,8 @@
 
 using namespace Email;
 
+std::vector<std::string> Email::dump;
+
 // New email notification
 static void emailUpdateCheck(CNSocket* sock, CNPacketData* data) {
     INITSTRUCT(sP_FE2CL_REP_PC_NEW_EMAIL, resp);
@@ -323,7 +324,7 @@ static void emailSend(CNSocket* sock, CNPacketData* data) {
 
     std::string logEmail = "[Email] " + PlayerManager::getPlayerName(plr, true) + " (to " + PlayerManager::getPlayerName(&otherPlr, true) + "): <" + email.SubjectLine + ">\n" + email.MsgBody;
     std::cout << logEmail << std::endl;
-    Monitor::emails.push_back(logEmail);
+    dump.push_back(logEmail);
 
     // notification to recipient if online
     CNSocket* recipient = PlayerManager::getSockFromID(pkt->iTo_PCUID);

src/Email.hpp

@@ -4,5 +4,7 @@
 #include <string>
 
 namespace Email {
+    extern std::vector<std::string> dump;
+    
     void init();
 }

src/PlayerManager.cpp

@@ -620,10 +620,6 @@ std::string PlayerManager::getPlayerName(Player *plr, bool id) {
     if (plr == nullptr)
         return "NOT IN GAME";
 
-    if (plr->PCStyle.iNameCheck == 0) {
-        return "Player " + std::to_string(plr->iID);
-    }
-
     std::string ret = "";
     if (id && plr->accountLevel <= 30)
         ret += "(GM) ";

src/servers/CNLoginServer.cpp

@@ -1,5 +1,4 @@
 #include "servers/CNLoginServer.hpp"
-#include "servers/Monitor.hpp"
 
 #include "core/CNShared.hpp"
 #include "db/Database.hpp"
@@ -313,16 +312,6 @@ void CNLoginServer::nameSave(CNSocket* sock, CNPacketData* data) {
         std::cout << "[WARN] Login Server: Database failed to create new character!" << std::endl;
         return invalidCharacter(sock);
     }
-
-    Player plr;
-    Database::getPlayer(&plr, (int)resp.iPC_UID);
-
-    // fire name check event if needed
-    if (plr.PCStyle.iNameCheck == 0) {
-        std::string namereq = std::to_string(resp.iPC_UID) + " " + AUTOU16TOU8(save->szFirstName) + " " + AUTOU16TOU8(save->szLastName);
-        Monitor::namereqs.push_back(namereq);
-    }
-
     resp.iSlotNum = save->iSlotNum;
     resp.iGender = save->iGender;
     
@@ -338,9 +327,7 @@ void CNLoginServer::nameSave(CNSocket* sock, CNPacketData* data) {
     DEBUGLOG(
         std::cout << "Login Server: new character created" << std::endl;
         std::cout << "\tSlot: " << (int)save->iSlotNum << std::endl;
-        std::cout << "\tName: " << AUTOU16TOU8(save->szFirstName) << " " << AUTOU16TOU8(save->szLastName);
+        std::cout << "\tName: " << AUTOU16TOU8(save->szFirstName) << " " << AUTOU16TOU8(save->szLastName) << std::endl;
-        if (plr.PCStyle.iNameCheck == 0) std::cout << " (pending approval)";
-        std::cout << std::endl;
     )
 }
 

src/servers/Monitor.cpp

@@ -14,13 +14,6 @@ static std::mutex sockLock; // guards socket list
 static std::list<SOCKET> sockets;
 static sockaddr_in address;
 
-std::vector<std::string> Monitor::chats;
-std::vector<std::string> Monitor::bcasts;
-std::vector<std::string> Monitor::emails;
-std::vector<std::string> Monitor::namereqs;
-
-using namespace Monitor;
-
 static bool transmit(std::list<SOCKET>::iterator& it, char *buff, int len) {
     int n = 0;
     int sock = *it;
@@ -106,23 +99,15 @@ outer:
         }
 
         // chat
-        for (auto& str : chats) {
+        for (auto& str : Chat::dump) {
             n = std::snprintf(buff, sizeof(buff), "chat %s\n", str.c_str());
 
             if (!transmit(it, buff, n))
                 goto outer;
         }
 
-        // announcements
-        for (auto& str : bcasts) {
-            n = std::snprintf(buff, sizeof(buff), "bcast %s\n", str.c_str());
-
-            if (!transmit(it, buff, n))
-                goto outer;
-        }
-
         // emails
-        for (auto& str : emails) {
+        for (auto& str : Email::dump) {
             n = process_email(buff, str);
 
             if (!transmit(it, buff, n))
@@ -132,24 +117,14 @@ outer:
                 goto outer;
         }
 
-        // name requests
-        for (auto& str : namereqs) {
-            n = std::snprintf(buff, sizeof(buff), "namereq %s\n", str.c_str());
-
-            if (!transmit(it, buff, n))
-                goto outer;
-        }
-
         if (!transmit(it, (char*)"end\n", 4))
             continue;
 
         it++;
     }
 
-    chats.clear();
+    Chat::dump.clear();
-    bcasts.clear();
+    Email::dump.clear();
-    emails.clear();
-    namereqs.clear();
 }
 
 bool Monitor::acceptConnection(SOCKET fd, uint16_t revents) {

src/servers/Monitor.hpp

@@ -3,11 +3,6 @@
 #include "core/Core.hpp"
 
 namespace Monitor {
-    extern std::vector<std::string> chats;
-    extern std::vector<std::string> bcasts;
-    extern std::vector<std::string> emails;
-    extern std::vector<std::string> namereqs;
-
     SOCKET init();
     bool acceptConnection(SOCKET, uint16_t);
 };