Skip to content

Commit 28a6c75

Browse files
FlamefireFlow86
authored andcommitted
Remove superflous newlines at end of error messages
The function already adds them and having them causes trouble with translations
1 parent 2c095fc commit 28a6c75

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

libs/s25main/GameManager.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ bool GameManager::Start()
4343
/// Videotreiber laden
4444
if(!videoDriver_.LoadDriver(settings_.driver.video))
4545
{
46-
s25util::error(_("Video driver couldn't be loaded!\n"));
46+
s25util::error(_("Video driver couldn't be loaded!"));
4747
return false;
4848
}
4949

@@ -58,7 +58,7 @@ bool GameManager::Start()
5858
/// Audiodriver laden
5959
if(!audioDriver_.LoadDriver(settings_.driver.audio))
6060
{
61-
s25util::warning(_("Audio driver couldn't be loaded!\n"));
61+
s25util::warning(_("Audio driver couldn't be loaded!"));
6262
// return false;
6363
}
6464

@@ -164,7 +164,7 @@ bool GameManager::ShowSplashscreen()
164164
auto image = boost::dynamic_pointer_cast<glArchivItem_Bitmap>(arSplash.release(0));
165165
if(!image)
166166
{
167-
s25util::error(_("Splash screen couldn't be loaded!\n"));
167+
s25util::error(_("Splash screen couldn't be loaded!"));
168168
return false;
169169
}
170170
windowManager_.Switch(std::make_unique<dskSplash>(std::move(image)));

libs/s25main/Settings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ void Settings::Load()
208208
// global
209209
// {
210210
if(iniGlobal->getValue("gameversion") != rttr::version::GetRevision())
211-
s25util::warning("Your application version has changed - please recheck your settings!\n");
211+
s25util::warning("Your application version has changed - please recheck your settings!");
212212

213213
global.submit_debug_data = iniGlobal->getIntValue("submit_debug_data");
214214
global.use_upnp = iniGlobal->getBoolValue("use_upnp");

libs/s25main/drivers/DriverWrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ bool DriverWrapper::Load(const DriverType dt, std::string& preference)
7373

7474
if(!dll)
7575
{
76-
s25util::fatal_error("Could not load driver library\n");
76+
s25util::fatal_error("Could not load driver library");
7777
return false;
7878
}
7979

libs/s25main/drivers/VideoDriverWrapper.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,21 @@ bool VideoDriverWrapper::CreateScreen(const VideoMode size, const bool fullscree
9696
{
9797
if(!videodriver)
9898
{
99-
s25util::fatal_error("No video driver selected!\n");
99+
s25util::fatal_error("No video driver selected!");
100100
return false;
101101
}
102102

103103
if(!videodriver->CreateScreen(rttr::version::GetTitle(), size, fullscreen))
104104
{
105-
s25util::fatal_error("Could not create window!\n");
105+
s25util::fatal_error("Could not create window!");
106106
return false;
107107
}
108108

109109
// DriverWrapper Initialisieren
110110
// Extensions laden
111111
if(!LoadAllExtensions())
112112
{
113-
s25util::fatal_error("Failed to initialize the OpenGL context!\n");
113+
s25util::fatal_error("Failed to initialize the OpenGL context!");
114114
return false;
115115
}
116116

@@ -138,7 +138,7 @@ bool VideoDriverWrapper::ResizeScreen(const VideoMode size, const bool fullscree
138138
{
139139
if(!videodriver)
140140
{
141-
s25util::fatal_error("No video driver selected!\n");
141+
s25util::fatal_error("No video driver selected!");
142142
return false;
143143
}
144144

@@ -165,7 +165,7 @@ bool VideoDriverWrapper::DestroyScreen()
165165
{
166166
if(!videodriver)
167167
{
168-
s25util::fatal_error("No video driver selected!\n");
168+
s25util::fatal_error("No video driver selected!");
169169
return false;
170170
}
171171

@@ -253,7 +253,7 @@ void VideoDriverWrapper::SwapBuffers()
253253
{
254254
if(!videodriver)
255255
{
256-
s25util::fatal_error("No video driver selected!\n");
256+
s25util::fatal_error("No video driver selected!");
257257
return;
258258
}
259259
frameLimiter_->sleepTillNextFrame(FrameCounter::clock::now());
@@ -272,7 +272,7 @@ bool VideoDriverWrapper::Run()
272272
{
273273
if(!videodriver)
274274
{
275-
s25util::fatal_error("No video driver selected!\n");
275+
s25util::fatal_error("No video driver selected!");
276276
return false;
277277
}
278278

@@ -404,7 +404,7 @@ void* VideoDriverWrapper::loadExtension(const std::string& extension)
404404
{
405405
if(!videodriver)
406406
{
407-
s25util::fatal_error("Kein Videotreiber ausgewaehlt!\n");
407+
s25util::fatal_error("No video driver selected!");
408408
return (nullptr);
409409
}
410410

0 commit comments

Comments
 (0)