summaryrefslogtreecommitdiffstats
path: root/game/shared/splash.cc
diff options
context:
space:
mode:
Diffstat (limited to 'game/shared/splash.cc')
-rw-r--r--game/shared/splash.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/game/shared/splash.cc b/game/shared/splash.cc
index 068c5c6..2381f7a 100644
--- a/game/shared/splash.cc
+++ b/game/shared/splash.cc
@@ -1,27 +1,28 @@
#include "shared/pch.hh"
+
#include "shared/splash.hh"
-constexpr static const char *SPLASHES_FILENAME_CLIENT = "misc/splashes_client.txt";
-constexpr static const char *SPLASHES_FILENAME_SERVER = "misc/splashes_server.txt";
+constexpr static const char* SPLASHES_FILENAME_CLIENT = "misc/splashes_client.txt";
+constexpr static const char* SPLASHES_FILENAME_SERVER = "misc/splashes_server.txt";
constexpr static std::size_t SPLASH_SERVER_MAX_LENGTH = 32;
static std::mt19937_64 splash_random;
static std::vector<std::string> splash_lines;
-static std::string sanitize_line(const std::string &line)
+static std::string sanitize_line(const std::string& line)
{
std::string result;
for(auto chr : line) {
- if((chr == '\r') || (chr == '\n'))
- continue;
- result.push_back(chr);
+ if(chr != '\r' && chr != '\n') {
+ result.push_back(chr);
+ }
}
return result;
}
-static void splash_init_filename(const char *filename)
+static void splash_init_filename(const char* filename)
{
if(auto file = PHYSFS_openRead(filename)) {
auto source = std::string(PHYSFS_fileLength(file), char(0x00));
@@ -34,8 +35,7 @@ static void splash_init_filename(const char *filename)
while(std::getline(stream, line))
splash_lines.push_back(sanitize_line(line));
splash_random.seed(std::random_device()());
- }
- else {
+ } else {
splash_lines.push_back(fmt::format("{}: {}", filename, PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())));
splash_random.seed(std::random_device()());
}