mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2024-11-14 12:18:22 +00:00
strip carriage return from txt files
This commit is contained in:
parent
3163c91a4a
commit
3845dc77f9
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user