diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:34:29 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:39:44 +0200 |
| commit | 01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6 (patch) | |
| tree | 544b07f3aa41abe7907bcd2040cdad11ebc324bb /gui/console.cpp | |
| parent | 9cf2c83e5e5a35816ab153bf8443dac691829ea8 (diff) | |
| parent | a41d72a44a660c72fdadbc3a8ef580e5e03cb890 (diff) | |
| download | scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.gz scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.bz2 scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.zip | |
Merge branch 'master'
Diffstat (limited to 'gui/console.cpp')
| -rw-r--r-- | gui/console.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gui/console.cpp b/gui/console.cpp index b656d23a09..dc2c5c4f33 100644 --- a/gui/console.cpp +++ b/gui/console.cpp @@ -665,12 +665,11 @@ int ConsoleDialog::printFormat(int dummy, const char *format, ...) { } int ConsoleDialog::vprintFormat(int dummy, const char *format, va_list argptr) { - char buf[2048]; + Common::String buf = Common::String::vformat(format, argptr); - int count = vsnprintf(buf, sizeof(buf), format, argptr); - buf[sizeof(buf)-1] = 0; // ensure termination - print(buf); - return count; + print(buf.c_str()); + + return buf.size(); } void ConsoleDialog::printChar(int c) { |