Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-25 06:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38 from yuwui/patch/strip_cr

Browse Source
This commit is contained in:
Wincent Holm 2021-12-06 07:46:14 +01:00 committed by GitHub
commit 34f1d4002b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dGame/UserManager.cpp
View File

@ -2,6 +2,7 @@
#include <fstream> #include <fstream>
#include <future> #include <future>
#include <sstream> #include <sstream>
#include <algorithm>
#include "Database.h" #include "Database.h"
#include "Game.h" #include "Game.h"
@ -25,38 +26,46 @@ UserManager * UserManager::m_Address = nullptr;
uint32_t FindCharShirtID(uint32_t shirtColor, uint32_t shirtStyle); uint32_t FindCharShirtID(uint32_t shirtColor, uint32_t shirtStyle);
uint32_t FindCharPantsID(uint32_t pantsColor); uint32_t FindCharPantsID(uint32_t pantsColor);
inline void StripCR(std::string& str) {
str.erase(std::remove(str.begin(), str.end(), '\r'), str.end());
}
void UserManager::Initialize() { void UserManager::Initialize() {
std::string firstNamePath = "./res/names/minifigname_first.txt"; std::string firstNamePath = "./res/names/minifigname_first.txt";
std::string middleNamePath = "./res/names/minifigname_middle.txt"; std::string middleNamePath = "./res/names/minifigname_middle.txt";
std::string lastNamePath = "./res/names/minifigname_last.txt"; std::string lastNamePath = "./res/names/minifigname_last.txt";
std::string line; std::string line;
std::fstream fnFile(firstNamePath, std::ios::in); std::fstream fnFile(firstNamePath, std::ios::in);
std::fstream mnFile(middleNamePath, std::ios::in); std::fstream mnFile(middleNamePath, std::ios::in);
std::fstream lnFile(lastNamePath, std::ios::in); std::fstream lnFile(lastNamePath, std::ios::in);
while (std::getline(fnFile, line, '\n')) { while (std::getline(fnFile, line, '\n')) {
std::string name = line; std::string name = line;
m_FirstNames.push_back(name); StripCR(name);
} m_FirstNames.push_back(name);
}
while (std::getline(mnFile, line, '\n')) { while (std::getline(mnFile, line, '\n')) {
std::string name = line; std::string name = line;
m_MiddleNames.push_back(name); StripCR(name);
} m_MiddleNames.push_back(name);
}
while (std::getline(lnFile, line, '\n')) { while (std::getline(lnFile, line, '\n')) {
std::string name = line; std::string name = line;
m_LastNames.push_back(name); StripCR(name);
} m_LastNames.push_back(name);
}
fnFile.close(); fnFile.close();
mnFile.close(); mnFile.close();
lnFile.close(); lnFile.close();
//Load our pre-approved names: //Load our pre-approved names:
std::fstream chatList("./res/chatplus_en_us.txt", std::ios::in); std::fstream chatList("./res/chatplus_en_us.txt", std::ios::in);
while (std::getline(chatList, line, '\n')) { while (std::getline(chatList, line, '\n')) {
StripCR(line);
m_PreapprovedNames.push_back(line); m_PreapprovedNames.push_back(line);
} }