diff options
| author | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
| commit | e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5 (patch) | |
| tree | 9d57b5fdd6737bc3449851a87e573abe7be984a6 /gui | |
| parent | deab5b28753155863062746ef1239535f562fd0b (diff) | |
| parent | 842b471e45ae8b7c1b4516b9bd5bf39d61112077 (diff) | |
| download | scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.gz scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.bz2 scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/console.cpp | 9 | ||||
| -rw-r--r-- | gui/credits.h | 6 | ||||
| -rw-r--r-- | gui/saveload.cpp | 2 | ||||
| -rw-r--r-- | gui/themes/translations.dat | bin | 254203 -> 256496 bytes |
4 files changed, 11 insertions, 6 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) { diff --git a/gui/credits.h b/gui/credits.h index 13898e03a0..47336c4900 100644 --- a/gui/credits.h +++ b/gui/credits.h @@ -72,6 +72,10 @@ static const char *credits[] = { "C0""Ludvig Strigeus", "C2""(retired)", "", +"C1""CGE", +"C0""Arnaud Boutonn\351", +"C0""Paul Gilbert", +"", "C1""Cine", "C0""Vincent Hamm", "C2""(retired)", @@ -258,6 +262,8 @@ static const char *credits[] = { "", "C1""Maemo", "C0""Frantisek Dufka", +"C2""(retired)", +"C0""Tarek Soliman", "", "C1""Nintendo 64", "C0""Fabio Battaglia", diff --git a/gui/saveload.cpp b/gui/saveload.cpp index 02ddf814dc..ae950a21fb 100644 --- a/gui/saveload.cpp +++ b/gui/saveload.cpp @@ -240,7 +240,7 @@ void SaveLoadChooser::updateSelection(bool redraw) { _time->setLabel(_("No time saved")); _playtime->setLabel(_("No playtime saved")); - if (selItem >= 0 && !_list->getSelectedString().empty() && _metaInfoSupport) { + if (selItem >= 0 && _metaInfoSupport) { SaveStateDescriptor desc = (*_plugin)->querySaveMetaInfos(_target.c_str(), _saveList[selItem].getSaveSlot()); isDeletable = desc.getDeletableFlag() && _delSupport; diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat Binary files differindex c5ae3d49bc..4420ff224d 100644 --- a/gui/themes/translations.dat +++ b/gui/themes/translations.dat |