Fix another comment

Dockerfile

@@ -38,4 +38,4 @@ EXPOSE 23000/tcp
 EXPOSE 23001/tcp
 EXPOSE 8003/tcp
 
-LABEL Name=openfusion Version=2.0.0
+LABEL Name=openfusion Version=1.6.0

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 OpenFusion Contributors
+Copyright (c) 2020-2024 OpenFusion Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -14,22 +14,22 @@ OpenFusion is a reverse-engineered server for FusionFall. It primarily targets v
 
 ### Getting Started
 #### Method A: Installer (Easiest)
-1. Download the launcher installer by clicking [here](https://github.com/OpenFusionProject/OpenFusionLauncher/releases/latest/download/OpenFusionLauncher-Windows-Installer.exe) - choose to run the file.
+1. Download the client installer by clicking [here](https://github.com/OpenFusionProject/OpenFusion/releases/download/1.6/OpenFusionClient-1.6-Installer.exe) - choose to run the file.
-2. After a few moments, the launcher should open: you will be given a choice between two public servers by default. Select the one you wish to play and click connect.
+2. After a few moments, the client should open: you will be given a choice between two public servers by default. Select the one you wish to play and click connect.
 3. To create an account, simply enter the details you wish to use at the login screen then click Log In. Do *not* click register, as this will just lead to a blank screen.
 4. Make a new character, and enjoy the game! Your progress will be saved automatically, and you can resume playing by entering the login details you used in step 3.
 
 #### Method B: Standalone .zip file
-1. Download the launcher from [here](https://github.com/OpenFusionProject/OpenFusionLauncher/releases/latest/download/OpenFusionLauncher-Windows-Portable.zip).
+1. Download the client from [here](https://github.com/OpenFusionProject/OpenFusion/releases/download/1.6/OpenFusionClient-1.6.zip).
 2. Extract it to a folder of your choice. Note: if you are upgrading from an older version, it is preferable to start with a fresh folder rather than overwriting a previous install.
-3. Run OpenFusionLauncher.exe - you will be given a choice between two public servers by default. Select the one you wish to play and click connect.
+3. Run OpenFusionClient.exe - you will be given a choice between two public servers by default. Select the one you wish to play and click connect.
 4. To create an account, simply enter the details you wish to use at the login screen then click Log In. Do *not* click register, as this will just lead to a blank screen.
 5. Make a new character, and enjoy the game! Your progress will be saved automatically, and you can resume playing by entering the login details you used in step 4.
 
 Instructions for getting the client to run on Linux through Wine can be found [here](https://openfusion.dev/docs/guides/running-on-linux/).
 
 ### Hosting a server
-1. Grab `OpenFusionServer-Windows-Original.zip` or `OpenFusionServer-Windows-Academy.zip` from [here](https://github.com/OpenFusionProject/OpenFusion/releases/latest).
+1. Grab `OpenFusionServer-1.6-Original.zip` or `OpenFusionServer-1.6-Academy.zip` from [here](https://github.com/OpenFusionProject/OpenFusion/releases/tag/1.6).
 2. Extract it to a folder of your choice, then run `winfusion.exe` (Windows) or `fusion` (Linux) to start the server.
 3. Add a new server to the client's list:
     1. For Description, enter anything you want. This is what will show up in the server list.

config.ini

@@ -12,8 +12,6 @@ sandbox=true
 [login]
 # must be kept in sync with loginInfo.php
 port=23000
-# will all name wheel names be approved instantly?
-acceptallwheelnames=true
 # will all custom names be approved instantly?
 acceptallcustomnames=true
 # should attempts to log into non-existent accounts

sql/migration5.sql

@@ -1,8 +0,0 @@
-BEGIN TRANSACTION;
--- New Columns
-ALTER TABLE Accounts ADD Email TEXT DEFAULT '' NOT NULL;
-ALTER TABLE Accounts ADD LastPasswordReset INTEGER DEFAULT 0 NOT NULL;
--- Update DB Version
-UPDATE Meta SET Value = 6 WHERE Key = 'DatabaseVersion';
-UPDATE Meta SET Value = strftime('%s', 'now') WHERE Key = 'LastMigration';
-COMMIT;

sql/tables.sql

@@ -1,16 +1,14 @@
 CREATE TABLE IF NOT EXISTS Accounts (
-    AccountID         INTEGER NOT NULL,
+    AccountID    INTEGER NOT NULL,
-    Login             TEXT    NOT NULL UNIQUE COLLATE NOCASE,
+    Login        TEXT    NOT NULL UNIQUE COLLATE NOCASE,
-    Password          TEXT    NOT NULL,
+    Password     TEXT    NOT NULL,
-    Selected          INTEGER  DEFAULT 1 NOT NULL,
+    Selected     INTEGER  DEFAULT 1 NOT NULL,
-    AccountLevel      INTEGER NOT NULL,
+    AccountLevel INTEGER NOT NULL,
-    Created           INTEGER DEFAULT (strftime('%s', 'now')) NOT NULL,
+    Created      INTEGER DEFAULT (strftime('%s', 'now')) NOT NULL,
-    LastLogin         INTEGER DEFAULT (strftime('%s', 'now')) NOT NULL,
+    LastLogin    INTEGER DEFAULT (strftime('%s', 'now')) NOT NULL,
-    BannedUntil       INTEGER DEFAULT 0 NOT NULL,
+    BannedUntil  INTEGER DEFAULT 0 NOT NULL,
-    BannedSince       INTEGER DEFAULT 0 NOT NULL,
+    BannedSince  INTEGER DEFAULT 0 NOT NULL,
-    BanReason         TEXT    DEFAULT '' NOT NULL,
+    BanReason    TEXT    DEFAULT '' NOT NULL,
-    Email             TEXT    DEFAULT '' NOT NULL,
-    LastPasswordReset INTEGER DEFAULT 0 NOT NULL,
     PRIMARY KEY(AccountID AUTOINCREMENT)
 );
 

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

@@ -396,14 +396,6 @@ static void heartbeatPlayer(CNSocket* sock, CNPacketData* data) {
 
 static void exitGame(CNSocket* sock, CNPacketData* data) {
     auto exitData = (sP_CL2FE_REQ_PC_EXIT*)data->buf;
-
-    // Refresh any auth cookie, in case "change character" was used
-    Player* plr = getPlayer(sock);
-    if (plr != nullptr) {
-        // 5 seconds should be enough to log in again
-        Database::refreshCookie(plr->accountId, 5);
-    }
-
     INITSTRUCT(sP_FE2CL_REP_PC_EXIT_SUCC, response);
 
     response.iID = exitData->iID;
@@ -620,10 +612,6 @@ std::string PlayerManager::getPlayerName(Player *plr, bool id) {
     if (plr == nullptr)
         return "NOT IN GAME";
 
-    if (plr->PCStyle.iNameCheck != 1) {
-        return "Player " + std::to_string(plr->iID);
-    }
-
     std::string ret = "";
     if (id && plr->accountLevel <= 30)
         ret += "(GM) ";

src/TableData.cpp

@@ -1,7 +1,5 @@
 #include "TableData.hpp"
 
-#include "servers/CNLoginServer.hpp"
-
 #include "NPCManager.hpp"
 #include "Missions.hpp"
 #include "Items.hpp"
@@ -81,25 +79,6 @@ static void loadXDT(json& xdtData) {
     NPCManager::NPCData = xdtData["m_pNpcTable"]["m_pNpcData"];
 
     try {
-        // load name wheel names
-        json firstNameData = xdtData["m_pNameTable"]["m_pFirstName"];
-        for (json::iterator _name = firstNameData.begin(); _name != firstNameData.end(); _name++) {
-            auto name = _name.value();
-            LoginServer::WheelFirstNames.push_back(name["m_pstrNameString"]);
-        }
-
-        json middleNameData = xdtData["m_pNameTable"]["m_pMiddleName"];
-        for (json::iterator _name = middleNameData.begin(); _name != middleNameData.end(); _name++) {
-            auto name = _name.value();
-            LoginServer::WheelMiddleNames.push_back(name["m_pstrNameString"]);
-        }
-
-        json lastNameData = xdtData["m_pNameTable"]["m_pLastName"];
-        for (json::iterator _name = lastNameData.begin(); _name != lastNameData.end(); _name++) {
-            auto name = _name.value();
-            LoginServer::WheelLastNames.push_back(name["m_pstrNameString"]);
-        }
-
         // load warps
         json warpData = xdtData["m_pInstanceTable"]["m_pWarpData"];
 

src/db/Database.hpp

@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#define DATABASE_VERSION 6
+#define DATABASE_VERSION 5
 
 namespace Database {
 
@@ -56,7 +56,6 @@ namespace Database {
     // return true if cookie is valid for the account.
     // invalidates the stored cookie afterwards
     bool checkCookie(int accountId, const char *cookie);
-    void refreshCookie(int accountId, int durationSec);
 
     // interface for the /ban command
     bool banPlayer(int playerId, std::string& reason);
@@ -69,7 +68,7 @@ namespace Database {
     bool isNameFree(std::string firstName, std::string lastName);
     bool isSlotFree(int accountId, int slotNum);
     /// returns ID, 0 if something failed
-    int createCharacter(int slot, int accountId, const char* firstName, const char* lastName, int nameCheck);
+    int createCharacter(sP_CL2LS_REQ_SAVE_CHAR_NAME* save, int AccountID);
     /// returns true if query succeeded
     bool finishCharacter(sP_CL2LS_REQ_CHAR_CREATE* character, int accountId);
     /// returns true if query succeeded
@@ -85,7 +84,7 @@ namespace Database {
     };
     void evaluateCustomName(int characterID, CustomName decision);
     /// returns true if query succeeded
-    bool changeName(int playerId, int accountId, const char* firstName, const char* lastName, int nameCheck);
+    bool changeName(sP_CL2LS_REQ_CHANGE_CHAR_NAME* save, int accountId);
 
     // getting players
     void getPlayer(Player* plr, int id);

src/db/login.cpp

@@ -2,8 +2,6 @@
 
 #include "db/internal.hpp"
 
-#include "servers/CNLoginServer.hpp"
-
 #include "bcrypt/BCrypt.hpp"
 
 void Database::findAccount(Account* account, std::string login) {
@@ -153,27 +151,6 @@ bool Database::checkCookie(int accountId, const char *tryCookie) {
     return match;
 }
 
-void Database::refreshCookie(int accountId, int durationSec) {
-    std::lock_guard<std::mutex> lock(dbCrit);
-
-    const char* sql = R"(
-        UPDATE Auth
-        SET Expires = ?
-        WHERE AccountID = ?;
-        )";
-    
-    int expires = getTimestamp() + durationSec;
-
-    sqlite3_stmt* stmt;
-    sqlite3_prepare_v2(db, sql, -1, &stmt, NULL);
-    sqlite3_bind_int(stmt, 1, expires);
-    sqlite3_bind_int(stmt, 2, accountId);
-    int rc = sqlite3_step(stmt);
-    sqlite3_finalize(stmt);
-    if (rc != SQLITE_DONE)
-        std::cout << "[WARN] Database fail on refreshCookie(): " << sqlite3_errmsg(db) << std::endl;
-}
-
 void Database::updateSelected(int accountId, int slot) {
     std::lock_guard<std::mutex> lock(dbCrit);
 
@@ -293,7 +270,7 @@ bool Database::isSlotFree(int accountId, int slotNum) {
     return result;
 }
 
-int Database::createCharacter(int slot, int accountId, const char* firstName, const char* lastName, int nameCheck) {
+int Database::createCharacter(sP_CL2LS_REQ_SAVE_CHAR_NAME* save, int AccountID) {
     std::lock_guard<std::mutex> lock(dbCrit);
 
     sqlite3_exec(db, "BEGIN TRANSACTION;", NULL, NULL, NULL);
@@ -306,17 +283,22 @@ int Database::createCharacter(int slot, int accountId, const char* firstName, co
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
         )";
     sqlite3_stmt* stmt;
+    std::string firstName = AUTOU16TOU8(save->szFirstName);
+    std::string lastName =  AUTOU16TOU8(save->szLastName);
 
     sqlite3_prepare_v2(db, sql, -1, &stmt, NULL);
-    sqlite3_bind_int(stmt, 1, accountId);
+    sqlite3_bind_int(stmt, 1, AccountID);
-    sqlite3_bind_int(stmt, 2, slot);
+    sqlite3_bind_int(stmt, 2, save->iSlotNum);
-    sqlite3_bind_text(stmt, 3, firstName, -1, NULL);
+    sqlite3_bind_text(stmt, 3, firstName.c_str(), -1, NULL);
-    sqlite3_bind_text(stmt, 4, lastName, -1, NULL);
+    sqlite3_bind_text(stmt, 4, lastName.c_str(), -1, NULL);
     sqlite3_bind_int(stmt, 5, settings::SPAWN_X);
     sqlite3_bind_int(stmt, 6, settings::SPAWN_Y);
     sqlite3_bind_int(stmt, 7, settings::SPAWN_Z);
     sqlite3_bind_int(stmt, 8, settings::SPAWN_ANGLE);
     sqlite3_bind_int(stmt, 9, PC_MAXHEALTH(1));
+
+    // if FNCode isn't 0, it's a wheel name
+    int nameCheck = (settings::APPROVEALLNAMES || save->iFNCode) ? 1 : 0;
     sqlite3_bind_int(stmt, 10, nameCheck);
 
     // blobs
@@ -645,7 +627,7 @@ void Database::evaluateCustomName(int characterID, CustomName decision) {
     sqlite3_finalize(stmt);
 }
 
-bool Database::changeName(int playerId, int accountId, const char* firstName, const char* lastName, int nameCheck) {
+bool Database::changeName(sP_CL2LS_REQ_CHANGE_CHAR_NAME* save, int accountId) {
     std::lock_guard<std::mutex> lock(dbCrit);
 
     const char* sql = R"(
@@ -659,10 +641,15 @@ bool Database::changeName(int playerId, int accountId, const char* firstName, co
     sqlite3_stmt* stmt;
     sqlite3_prepare_v2(db, sql, -1, &stmt, NULL);
 
-    sqlite3_bind_text(stmt, 1, firstName, -1, NULL);
+    std::string firstName = AUTOU16TOU8(save->szFirstName);
-    sqlite3_bind_text(stmt, 2, lastName, -1, NULL);
+    std::string lastName = AUTOU16TOU8(save->szLastName);
+
+    sqlite3_bind_text(stmt, 1, firstName.c_str(), -1, NULL);
+    sqlite3_bind_text(stmt, 2, lastName.c_str(), -1, NULL);
+    // if FNCode isn't 0, it's a wheel name
+    int nameCheck = (settings::APPROVEALLNAMES || save->iFNCode) ? 1 : 0;
     sqlite3_bind_int(stmt, 3, nameCheck);
-    sqlite3_bind_int(stmt, 4, playerId);
+    sqlite3_bind_int(stmt, 4, save->iPCUID);
     sqlite3_bind_int(stmt, 5, accountId);
 
     int rc = sqlite3_step(stmt);

src/servers/CNLoginServer.cpp

@@ -1,5 +1,4 @@
 #include "servers/CNLoginServer.hpp"
-#include "servers/Monitor.hpp"
 
 #include "core/CNShared.hpp"
 #include "db/Database.hpp"
@@ -13,12 +12,6 @@
 
 std::map<CNSocket*, CNLoginData> CNLoginServer::loginSessions;
 
-namespace LoginServer {
-    std::vector<std::string> WheelFirstNames;
-    std::vector<std::string> WheelMiddleNames;
-    std::vector<std::string> WheelLastNames;
-}
-
 CNLoginServer::CNLoginServer(uint16_t p) {
     serverType = "login";
     port = p;
@@ -292,29 +285,10 @@ void CNLoginServer::nameSave(CNSocket* sock, CNPacketData* data) {
     INITSTRUCT(sP_LS2CL_REP_SAVE_CHAR_NAME_SUCC, resp);
 
     int errorCode = 0;
-
+    if (!CNLoginServer::isCharacterNameGood(AUTOU16TOU8(save->szFirstName), AUTOU16TOU8(save->szLastName))) {
-    std::string firstName = AUTOU16TOU8(save->szFirstName);
+        errorCode = 4;
-    std::string lastName = AUTOU16TOU8(save->szLastName);
+    } else if (!Database::isNameFree(AUTOU16TOU8(save->szFirstName), AUTOU16TOU8(save->szLastName))) {
-    int nameCheck = 0;
+        errorCode = 1;
-
-    // if FNCode isn't 0, it's a wheel name
-    if (save->iFNCode != 0) {
-        if (!CNLoginServer::isNameWheelNameGood(save->iFNCode, save->iMNCode, save->iLNCode, firstName, lastName)) {
-            errorCode = 4;
-        } else {
-            nameCheck = settings:: APPROVEWHEELNAMES ? 1 : 0;
-        }
-    } else {
-        // custom name
-        nameCheck = settings::APPROVECUSTOMNAMES ? 1 : 0;
-    }
-
-    if (errorCode == 0) {
-        if (!CNLoginServer::isCharacterNameGood(firstName, lastName)) {
-            errorCode = 4;
-        } else if (!Database::isNameFree(firstName, lastName)) {
-            errorCode = 1;
-        }
     }
 
     if (errorCode != 0) {
@@ -332,19 +306,12 @@ void CNLoginServer::nameSave(CNSocket* sock, CNPacketData* data) {
     if (!Database::isSlotFree(loginSessions[sock].userID, save->iSlotNum))
         return invalidCharacter(sock);
 
-    resp.iPC_UID = Database::createCharacter(save->iSlotNum, loginSessions[sock].userID, firstName.c_str(), lastName.c_str(), nameCheck);
+    resp.iPC_UID = Database::createCharacter(save, loginSessions[sock].userID);
     // if query somehow failed
     if (resp.iPC_UID == 0) {
         std::cout << "[WARN] Login Server: Database failed to create new character!" << std::endl;
         return invalidCharacter(sock);
     }
-
-    // fire name check event if needed
-    if (nameCheck != 1) {
-        std::string namereq = std::to_string(resp.iPC_UID) + " " + firstName + " " + lastName;
-        Monitor::namereqs.push_back(namereq);
-    }
-
     resp.iSlotNum = save->iSlotNum;
     resp.iGender = save->iGender;
     
@@ -360,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: " << firstName << " " << lastName;
+        std::cout << "\tName: " << AUTOU16TOU8(save->szFirstName) << " " << AUTOU16TOU8(save->szLastName) << std::endl;
-        if (nameCheck != 1) std::cout << " (pending approval)";
-        std::cout << std::endl;
     )
 }
 
@@ -529,30 +494,11 @@ void CNLoginServer::changeName(CNSocket* sock, CNPacketData* data) {
     auto save = (sP_CL2LS_REQ_CHANGE_CHAR_NAME*)data->buf;
 
     int errorCode = 0;
-
+    if (!CNLoginServer::isCharacterNameGood(AUTOU16TOU8(save->szFirstName), AUTOU16TOU8(save->szLastName))) {
-    std::string firstName = AUTOU16TOU8(save->szFirstName);
+        errorCode = 4;
-    std::string lastName = AUTOU16TOU8(save->szLastName);
-    int nameCheck = 0;
-
-    // if FNCode isn't 0, it's a wheel name
-    if (save->iFNCode != 0) {
-        if (!CNLoginServer::isNameWheelNameGood(save->iFNCode, save->iMNCode, save->iLNCode, firstName, lastName)) {
-            errorCode = 4;
-        } else {
-            nameCheck = settings::APPROVEWHEELNAMES ? 1 : 0;
-        }
-    } else {
-        // custom name
-        nameCheck = settings::APPROVECUSTOMNAMES ? 1 : 0;
     }
-
+    else if (!Database::isNameFree(AUTOU16TOU8(save->szFirstName), AUTOU16TOU8(save->szLastName))) {
-    if (errorCode == 0) {
+        errorCode = 1;
-        if (!CNLoginServer::isCharacterNameGood(firstName, lastName)) {
-            errorCode = 4;
-        }
-        else if (!Database::isNameFree(firstName, lastName)) {
-            errorCode = 1;
-        }
     }
 
     if (errorCode != 0) {
@@ -567,15 +513,9 @@ void CNLoginServer::changeName(CNSocket* sock, CNPacketData* data) {
         return;
     }
 
-    if (!Database::changeName(save->iPCUID, loginSessions[sock].userID, firstName.c_str(), lastName.c_str(), nameCheck))
+    if (!Database::changeName(save, loginSessions[sock].userID))
         return invalidCharacter(sock);
 
-    // fire name check event if needed
-    if (nameCheck != 1) {
-        std::string namereq = std::to_string(save->iPCUID) + " " + firstName + " " + lastName;
-        Monitor::namereqs.push_back(namereq);
-    }
-
     INITSTRUCT(sP_LS2CL_REP_CHANGE_CHAR_NAME_SUCC, resp);
     resp.iPC_UID = save->iPCUID;
     memcpy(resp.szFirstName, save->szFirstName, sizeof(resp.szFirstName));
@@ -587,10 +527,8 @@ void CNLoginServer::changeName(CNSocket* sock, CNPacketData* data) {
     sock->sendPacket(resp, P_LS2CL_REP_CHANGE_CHAR_NAME_SUCC);
 
     DEBUGLOG(
-        std::cout << "Login Server: Name change request for character [" << save->iPCUID << "]" << std::endl;
+        std::cout << "Login Server: Name check success for character [" << save->iPCUID << "]" << std::endl;
-        std::cout << "\tNew name: " << firstName << " " << lastName;
+        std::cout << "\tNew name: " << AUTOU16TOU8(save->szFirstName) << " " << AUTOU16TOU8(save->szLastName) << std::endl;     
-        if (nameCheck != 1) std::cout << " (pending approval)";
-        std::cout << std::endl;
     )
 }
 
@@ -683,42 +621,6 @@ bool CNLoginServer::isPasswordCorrect(std::string actualPassword, std::string tr
     return BCrypt::validatePassword(tryPassword, actualPassword);
 }
 
-bool CNLoginServer::isNameWheelNameGood(int fnCode, int mnCode, int lnCode, std::string& firstName, std::string& lastName) {
-    if (fnCode >= LoginServer::WheelFirstNames.size()
-        || mnCode >= LoginServer::WheelMiddleNames.size()
-        || lnCode >= LoginServer::WheelLastNames.size()) {
-        std::cout << "[WARN] Login Server: Invalid name codes received: " << fnCode << " " << mnCode << " " << lnCode << std::endl;
-        return false;
-    }
-
-    // client sends 1 if not selected for these. they point to a single blank space. why.
-    // just change them to 0, which points to an empty string; keeps the code much cleaner
-    if (mnCode == 1) mnCode = 0;
-    if (lnCode == 1) lnCode = 0;
-
-    std::string firstNameFromWheel = LoginServer::WheelFirstNames[fnCode];
-
-    std::string middleNamePart = LoginServer::WheelMiddleNames[mnCode];
-    std::string lastNamePart = LoginServer::WheelLastNames[lnCode];
-    if (mnCode != 0 && middleNamePart[middleNamePart.size() - 1] != ' ') {
-        // If there's a middle name, we need to lowercase the last name
-        std::transform(lastNamePart.begin(), lastNamePart.end(), lastNamePart.begin(), ::tolower);
-    }
-    std::string lastNameFromWheel = middleNamePart + lastNamePart;
-
-    if (firstNameFromWheel.empty() || lastNameFromWheel.empty()) {
-        std::cout << "[WARN] Login Server: Invalid wheel name combo: " << fnCode << " " << mnCode << " " << lnCode << std::endl;
-        return false;
-    }
-
-    if (firstName != firstNameFromWheel || lastName != lastNameFromWheel) {
-        std::cout << "[WARN] Login Server: Name wheel mismatch. Expected " << firstNameFromWheel << " " << lastNameFromWheel << ", got " << firstName << " " << lastName << std::endl;
-        return false;
-    }
-
-    return true;
-}
-
 bool CNLoginServer::isCharacterNameGood(std::string Firstname, std::string Lastname) {
     //Allow alphanumeric and dot characters in names(disallows dot and space characters at the beginning of a name)
     std::regex firstnamecheck(R"(((?! )(?!\.)[a-zA-Z0-9]*\.{0,1}(?!\.+ +)[a-zA-Z0-9]* {0,1}(?! +))*$)");

src/servers/CNLoginServer.hpp

@@ -7,12 +7,6 @@
 
 #include <map>
 
-namespace LoginServer {
-    extern std::vector<std::string> WheelFirstNames;
-    extern std::vector<std::string> WheelMiddleNames;
-    extern std::vector<std::string> WheelLastNames;
-}
-
 struct CNLoginData {
     int userID;
     time_t lastHeartbeat;
@@ -57,7 +51,6 @@ private:
     static bool isPasswordGood(std::string& password);
     static bool isPasswordCorrect(std::string actualPassword, std::string tryPassword);
     static bool isAccountInUse(int accountId);
-    static bool isNameWheelNameGood(int fnCode, int mnCode, int lnCode, std::string& firstName, std::string& lastName);
     static bool isCharacterNameGood(std::string Firstname, std::string Lastname);
     static bool isAuthMethodAllowed(AuthMethod authMethod);
     static bool checkUsername(CNSocket* sock, std::string& username);

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);
 };

src/settings.cpp

@@ -12,8 +12,7 @@ bool settings::SANDBOX = true;
 std::string settings::SANDBOXEXTRAPATH = "";
 
 int settings::LOGINPORT = 23000;
-bool settings::APPROVEWHEELNAMES = true;
+bool settings::APPROVEALLNAMES = true;
-bool settings::APPROVECUSTOMNAMES = true;
 bool settings::AUTOCREATEACCOUNTS = true;
 std::string settings::AUTHMETHODS = "password";
 int settings::DBSAVEINTERVAL = 240;
@@ -90,8 +89,7 @@ void settings::init() {
     SANDBOX = reader.GetBoolean("", "sandbox", SANDBOX);
     SANDBOXEXTRAPATH = reader.Get("", "sandboxextrapath", SANDBOXEXTRAPATH);
     LOGINPORT = reader.GetInteger("login", "port", LOGINPORT);
-    APPROVEWHEELNAMES = reader.GetBoolean("login", "acceptallwheelnames", APPROVEWHEELNAMES);
+    APPROVEALLNAMES = reader.GetBoolean("login", "acceptallcustomnames", APPROVEALLNAMES);
-    APPROVECUSTOMNAMES = reader.GetBoolean("login", "acceptallcustomnames", APPROVECUSTOMNAMES);
     AUTOCREATEACCOUNTS = reader.GetBoolean("login", "autocreateaccounts", AUTOCREATEACCOUNTS);
     AUTHMETHODS = reader.Get("login", "authmethods", AUTHMETHODS);
     DBSAVEINTERVAL = reader.GetInteger("login", "dbsaveinterval", DBSAVEINTERVAL);

src/settings.hpp

@@ -9,8 +9,7 @@ namespace settings {
     extern bool SANDBOX;
     extern std::string SANDBOXEXTRAPATH;
     extern int LOGINPORT;
-    extern bool APPROVEWHEELNAMES;
+    extern bool APPROVEALLNAMES;
-    extern bool APPROVECUSTOMNAMES;
     extern bool AUTOCREATEACCOUNTS;
     extern std::string AUTHMETHODS;
     extern int DBSAVEINTERVAL;

win-setup.ps1

@@ -1,52 +0,0 @@
-# Run this first if needed:
-# Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process
-param (
-    # height of largest column without top bar
-    [Parameter(Mandatory=$true)]
-    [string]$protocolVersion
-)
-
-$ErrorActionPreference = 'Stop'
-# check for vscmd
-if ([string]::IsNullOrEmpty($env:VSCMD_VER)) {
-    Write-Host 'Must be run inside of VS Developer Powershell'
-    exit 1
-}
-
-# check for git
-try {
-    $git_version = git --version
-} catch {
-    Write-Host 'git not installed'
-    exit 1
-}
-
-# setup vcpkg
-if (Test-Path -Path 'vcpkg\') {
-    Write-Host 'vcpkg already setup'
-} else {
-    Write-Host 'Setting up vcpkg...'
-    git clone "https://github.com/microsoft/vcpkg.git"
-}
-
-if (-not (Test-Path -Path 'vcpkg\vcpkg.exe')) {
-    Write-Host 'Bootstrapping vcpkg...'
-    Start-Process -Wait -NoNewWindow -FilePath 'vcpkg\bootstrap-vcpkg.bat' -ArgumentList '-disableMetrics'
-}
-
-$env:VCPKG_ROOT='' # ignore msvc's vcpkg root, it doesn't work
-$vcpkg = (Resolve-Path -Path '.\vcpkg')
-Write-Host "vcpkg installed to $vcpkg"
-Start-Process -Wait -NoNewWindow -FilePath 'vcpkg\vcpkg.exe' -ArgumentList 'install sqlite3:x64-windows'
-
-# setup cmake project
-if (Test-Path -Path 'build\') {
-    Write-Host 'cmake project already setup';
-} else {
-    Write-Host 'Setting up cmake project...'
-    Start-Process -Wait -NoNewWindow -FilePath 'cmake' -ArgumentList "-B build -DPROTOCOL_VERSION=$protocolVersion -DCMAKE_TOOLCHAIN_FILE=$vcpkg\scripts\buildsystems\vcpkg.cmake"
-}
-
-Write-Host 'Done!'
-$sln = (Resolve-Path -Path '.\build\OpenFusion.sln')
-Write-Host "Solution file is at $sln"