Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-22 05:27:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

strip carriage return from txt files

Browse Source
This commit is contained in:
yuwui 2021-12-06 07:04:18 +01:00
parent 3163c91a4a
commit 3845dc77f9
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
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,6 +26,10 @@ 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";
@ -37,16 +42,19 @@ void UserManager::Initialize() {
while (std::getline(fnFile, line, '\n')) { while (std::getline(fnFile, line, '\n')) {
std::string name = line; std::string name = line;
StripCR(name);
m_FirstNames.push_back(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;
StripCR(name);
m_MiddleNames.push_back(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;
StripCR(name);
m_LastNames.push_back(name); m_LastNames.push_back(name);
} }
@ -57,6 +65,7 @@ void UserManager::Initialize() {
//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);
} }