dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Command line: Fix truncation of help text

Browse Source 
Use std::string
This commit is contained in:
Jonathan G Rennison
2024-07-03 00:19:38 +01:00
parent ffaa36c8d2
commit 5f34407ce1
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/openttd.cpp
View File

@@ -273,12 +273,10 @@ void CDECL ShowInfoF(const char *str, ...)
*/ */
static void ShowHelp() static void ShowHelp()
{ {
char buf[8192]; char buf[2048];
char *p = buf;
p += seprintf(p, lastof(buf), "OpenTTD %s\n", _openttd_revision); std::string msg = stdstr_fmt("OpenTTD %s\n", _openttd_revision);
p = strecpy(p, msg += "\n"
"\n"
"\n" "\n"
"Command line options:\n" "Command line options:\n"
" -v drv = Set video driver (see below)\n" " -v drv = Set video driver (see below)\n"
@@ -309,46 +307,49 @@ static void ShowHelp()
" -Q = Don't scan for/load NewGRF files on startup\n" " -Q = Don't scan for/load NewGRF files on startup\n"
" -QQ = Disable NewGRF scanning/loading entirely\n" " -QQ = Disable NewGRF scanning/loading entirely\n"
" -Z = Write detailed version information and exit\n" " -Z = Write detailed version information and exit\n"
"\n", "\n";
lastof(buf)
);
/* List the graphics packs */ /* List the graphics packs */
p = BaseGraphics::GetSetsList(p, lastof(buf)); BaseGraphics::GetSetsList(buf, lastof(buf));
msg += buf;
/* List the sounds packs */ /* List the sounds packs */
p = BaseSounds::GetSetsList(p, lastof(buf)); BaseSounds::GetSetsList(buf, lastof(buf));
msg += buf;
/* List the music packs */ /* List the music packs */
p = BaseMusic::GetSetsList(p, lastof(buf)); BaseMusic::GetSetsList(buf, lastof(buf));
msg += buf;
/* List the drivers */ /* List the drivers */
p = DriverFactoryBase::GetDriversInfo(p, lastof(buf)); DriverFactoryBase::GetDriversInfo(buf, lastof(buf));
msg += buf;
/* List the blitters */ /* List the blitters */
p = BlitterFactory::GetBlittersInfo(p, lastof(buf)); BlitterFactory::GetBlittersInfo(buf, lastof(buf));
msg += buf;
/* List the debug facilities. */ /* List the debug facilities. */
p = DumpDebugFacilityNames(p, lastof(buf)); DumpDebugFacilityNames(buf, lastof(buf));
msg += buf;
/* We need to initialize the AI, so it finds the AIs */ /* We need to initialize the AI, so it finds the AIs */
AI::Initialize(); AI::Initialize();
const std::string ai_list = AI::GetConsoleList(true); msg += AI::GetConsoleList(true);
p = strecpy(p, ai_list.c_str(), lastof(buf));
AI::Uninitialize(true); AI::Uninitialize(true);
/* We need to initialize the GameScript, so it finds the GSs */ /* We need to initialize the GameScript, so it finds the GSs */
Game::Initialize(); Game::Initialize();
const std::string game_list = Game::GetConsoleList(true); msg += Game::GetConsoleList(true);
p = strecpy(p, game_list.c_str(), lastof(buf));
Game::Uninitialize(true); Game::Uninitialize(true);
/* ShowInfo put output to stderr, but version information should go /* ShowInfo put output to stderr, but version information should go
* to stdout; this is the only exception */ * to stdout; this is the only exception */
#if !defined(_WIN32) #if !defined(_WIN32)
printf("%s\n", buf); msg += "\n";
fputs(msg.c_str(), stdout);
#else #else
ShowInfoI(buf); ShowInfoI(msg);
#endif #endif
} }