[Scummvm-cvs-logs] SF.net SVN: scummvm: [33064] scummvm/trunk/engines/scumm
wjpalenstijn at users.sourceforge.net
wjpalenstijn at users.sourceforge.net
Mon Jul 14 23:04:43 CEST 2008
Revision: 33064
http://scummvm.svn.sourceforge.net/scummvm/?rev=33064&view=rev
Author: wjpalenstijn
Date: 2008-07-14 14:04:42 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
remove accidentally committed debugging code; fix shadowing warning
Modified Paths:
--------------
scummvm/trunk/engines/scumm/dialogs.cpp
scummvm/trunk/engines/scumm/dialogs.h
Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp 2008-07-14 21:00:39 UTC (rev 33063)
+++ scummvm/trunk/engines/scumm/dialogs.cpp 2008-07-14 21:04:42 UTC (rev 33064)
@@ -31,8 +31,6 @@
#include "graphics/scaler.h"
-#include "valgrind/memcheck.h"
-
#ifdef __DS__
#include "scummhelp.h"
#endif
@@ -328,10 +326,6 @@
_container->resize(thumbX - hPad, thumbY - vPad, kThumbnailWidth + hPad * 2, thumbH + vPad * 2 + kLineHeight * 4);
- VALGRIND_CHECK_VALUE_IS_DEFINED(thumbX);
- VALGRIND_CHECK_VALUE_IS_DEFINED(thumbY);
- VALGRIND_CHECK_VALUE_IS_DEFINED(thumbH);
-
// Add the thumbnail display
_gfxWidget->resize(thumbX, thumbY, kThumbnailWidth, thumbH);
@@ -368,7 +362,7 @@
Dialog::reflowLayout();
}
-void SaveLoadChooser::updateInfos(bool draw) {
+void SaveLoadChooser::updateInfos(bool redraw) {
int selItem = _list->getSelected();
Graphics::Surface *thumb;
thumb = _vm->loadThumbnailFromSlot(_saveMode ? selItem + 1 : selItem);
@@ -382,7 +376,7 @@
}
delete thumb;
- if (draw)
+ if (redraw)
_gfxWidget->draw();
InfoStuff infos;
@@ -393,13 +387,13 @@
(infos.date >> 24) & 0xFF, (infos.date >> 16) & 0xFF,
infos.date & 0xFFFF);
_date->setLabel(buffer);
- if (draw)
+ if (redraw)
_date->draw();
snprintf(buffer, 32, "Time: %.2d:%.2d",
(infos.time >> 8) & 0xFF, infos.time & 0xFF);
_time->setLabel(buffer);
- if (draw)
+ if (redraw)
_time->draw();
int minutes = infos.playtime / 60;
@@ -409,22 +403,22 @@
snprintf(buffer, 32, "Playtime: %.2d:%.2d",
hours & 0xFF, minutes & 0xFF);
_playtime->setLabel(buffer);
- if (draw)
+ if (redraw)
_playtime->draw();
} else {
snprintf(buffer, 32, "No date saved");
_date->setLabel(buffer);
- if (draw)
+ if (redraw)
_date->draw();
snprintf(buffer, 32, "No time saved");
_time->setLabel(buffer);
- if (draw)
+ if (redraw)
_time->draw();
snprintf(buffer, 32, "No playtime saved");
_playtime->setLabel(buffer);
- if (draw)
+ if (redraw)
_playtime->draw();
}
}
Modified: scummvm/trunk/engines/scumm/dialogs.h
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.h 2008-07-14 21:00:39 UTC (rev 33063)
+++ scummvm/trunk/engines/scumm/dialogs.h 2008-07-14 21:04:42 UTC (rev 33064)
@@ -69,7 +69,7 @@
uint8 _fillR, _fillG, _fillB;
- void updateInfos(bool draw);
+ void updateInfos(bool redraw);
public:
SaveLoadChooser(const String &title, const String &buttonLabel, bool saveMode, ScummEngine *engine);
~SaveLoadChooser();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list