From 6a1a1eff9c46de1474d112df7105a84e2c94b650 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Mon, 24 Feb 2020 19:57:20 +0000 Subject: [PATCH] missing line ends and a warning fix Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4331 --- src/dosbox.cpp | 3 ++- src/gui/sdlmain.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/dosbox.cpp b/src/dosbox.cpp index 8ae1e4df..7c0b1814 100644 --- a/src/dosbox.cpp +++ b/src/dosbox.cpp @@ -571,7 +571,8 @@ void DOSBOX_Init(void) { Pstring->Set_help("Device that will receive the MIDI data from MPU-401."); Pstring = secprop->Add_string("midiconfig",Property::Changeable::WhenIdle,""); - Pstring->Set_help("Special configuration options for the device driver. This is usually the id or part of the name of the device you want to use (find the id/name with mixer/listmidi).\n" + Pstring->Set_help("Special configuration options for the device driver. This is usually the id or part of the name of the device you want to use\n" + "(find the id/name with mixer/listmidi).\n" "Or in the case of coreaudio, you can specify a soundfont here.\n" "When using a Roland MT-32 rev. 0 as midi output device, some games may require a delay in order to prevent 'buffer overflow' issues.\n" "In that case, add 'delaysysex', for example: midiconfig=2 delaysysex\n" diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp index 15f2f8cf..84cee0f3 100644 --- a/src/gui/sdlmain.cpp +++ b/src/gui/sdlmain.cpp @@ -903,7 +903,7 @@ dosurface: if (sdl.overlay && sdl.overlay->pitches[0] < 4 * width) { // We get a distorted image in this case. Cleanup and go to surface. - LOG_MSG("SDL: overlay pitch is too small. (%u < %u)", sdl.overlay->pitches[0], width * 4); + LOG_MSG("SDL: overlay pitch is too small. (%u < %" sBitfs(u) ")", sdl.overlay->pitches[0], width * 4); SDL_FreeYUVOverlay(sdl.overlay); sdl.overlay = 0; } @@ -2185,7 +2185,7 @@ void Config_Add_SDL() { Pstring = sdl_sec->Add_string("fullresolution",Property::Changeable::Always,"original"); Pstring->Set_help("What resolution to use for fullscreen: original, desktop or a fixed size (e.g. 1024x768).\n" "Using your monitor's native resolution with aspect=true might give the best results.\n" - "If you end up with small window on a large screen, try an output different from surface." + "If you end up with small window on a large screen, try an output different from surface.\n" "On Windows 10 with display scaling (Scale and layout) set to a value above 100%, it is recommended\n" "to use a lower full/windowresolution, in order to avoid window size problems.");