thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged revisions 33052-33053,33056-33058,33061-33064,33068,33070,33072,33075,33078-33079,33083,33086-33087,33089,33094-33096,33098-33099,33104,33108-33109,33114-33117,33120,33135-33146,33160,33162,33165,33167-33169 via svnmerge from

Browse source 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33183
This commit is contained in:
Christopher Page 2008-07-21 22:46:39 +00:00
commit 09f4fd946e
70 changed files with 4241 additions and 930 deletions
Download patch file Download diff file Expand all files Collapse all files

27
engines/scumm/dialogs.cpp
View file

@ -297,7 +297,7 @@ void SaveLoadChooser::handleCommand(CommandSender *sender, uint32 cmd, uint32 da
break;
case GUI::kListSelectionChangedCmd: {
if (_gfxWidget) {
updateInfos();
updateInfos(true);
}
if (_saveMode) {
@ -350,7 +350,7 @@ void SaveLoadChooser::reflowLayout() {
_fillR = g_gui.evaluator()->getVar("scummsaveload_thumbnail.fillR");
_fillG = g_gui.evaluator()->getVar("scummsaveload_thumbnail.fillG");
_fillB = g_gui.evaluator()->getVar("scummsaveload_thumbnail.fillB");
updateInfos();
updateInfos(false);
} else {
_container->setFlags(GUI::WIDGET_INVISIBLE);
_gfxWidget->setFlags(GUI::WIDGET_INVISIBLE);
@ -362,7 +362,7 @@ void SaveLoadChooser::reflowLayout() {
Dialog::reflowLayout();
}
void SaveLoadChooser::updateInfos() {
void SaveLoadChooser::updateInfos(bool redraw) {
int selItem = _list->getSelected();
Graphics::Surface *thumb;
thumb = _vm->loadThumbnailFromSlot(_saveMode ? selItem + 1 : selItem);
@ -376,7 +376,8 @@ void SaveLoadChooser::updateInfos() {
}
delete thumb;
_gfxWidget->draw();
if (redraw)
_gfxWidget->draw();
InfoStuff infos;
memset(&infos, 0, sizeof(InfoStuff));
@ -386,12 +387,14 @@ void SaveLoadChooser::updateInfos() {
(infos.date >> 24) & 0xFF, (infos.date >> 16) & 0xFF,
infos.date & 0xFFFF);
_date->setLabel(buffer);
_date->draw();
if (redraw)
_date->draw();
snprintf(buffer, 32, "Time: %.2d:%.2d",
(infos.time >> 8) & 0xFF, infos.time & 0xFF);
_time->setLabel(buffer);
_time->draw();
if (redraw)
_time->draw();
int minutes = infos.playtime / 60;
int hours = minutes / 60;
@ -400,19 +403,23 @@ void SaveLoadChooser::updateInfos() {
snprintf(buffer, 32, "Playtime: %.2d:%.2d",
hours & 0xFF, minutes & 0xFF);
_playtime->setLabel(buffer);
_playtime->draw();
if (redraw)
_playtime->draw();
} else {
snprintf(buffer, 32, "No date saved");
_date->setLabel(buffer);
_date->draw();
if (redraw)
_date->draw();
snprintf(buffer, 32, "No time saved");
_time->setLabel(buffer);
_time->draw();
if (redraw)
_time->draw();
snprintf(buffer, 32, "No playtime saved");
_playtime->setLabel(buffer);
_playtime->draw();
if (redraw)
_playtime->draw();
}
}